[SCM] hdf5 branch, upstream, updated. upstream/1.8.4-patch1-79-gbfcb1ff

Francesco Paolo Lovergine frankie at debian.org
Wed Nov 16 10:34:09 UTC 2011


The following commit has been merged in the upstream branch:
commit bcebcf087e62213d3586f436f22b39ca5884fced
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Jan 21 10:00:53 2010 +0000

    Upgrade to 1.8.4

diff --git a/debian/changelog b/debian/changelog
index 661c8cb..144bc67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+hdf5 (1.8.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Policy bumped to 3.8.3, no changes.
+  * Added a workaround in debian/rules to manage correctly mpich fortran building
+    which misses header files.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 19 Nov 2009 11:37:21 +0100
+
 hdf5 (1.8.3-2) unstable; urgency=low
 
   * Uploaded to unstable.
diff --git a/debian/control.in b/debian/control.in
index 0b7e809..cb83e4a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,7 +6,7 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
 Build-Depends: libmpich1.0-dev (>= 1.2.7-1), zlib1g-dev, lam4-dev (>= 7.1.1-3.2), quilt,
  libopenmpi-dev [!arm !armel !hppa !mips !mipsel !s390], libjpeg62-dev | libjpeg-dev, debhelper (>> 7), sed (>=4.1.5), 
  gfortran, libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390]
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/hdf5/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/hdf5/trunk
diff --git a/debian/patches/autotools.diff b/debian/patches/autotools.diff
index 3be8000..986c2f9 100644
--- a/debian/patches/autotools.diff
+++ b/debian/patches/autotools.diff
@@ -1,14 +1,14 @@
-diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
---- hdf5-1.8.3-orig/aclocal.m4	2009-06-19 12:59:55.000000000 +0200
-+++ hdf5-1.8.3/aclocal.m4	2009-06-19 15:34:59.000000000 +0200
-@@ -13,4457 +13,3572 @@
+diff -urN hdf5-1.8.4.orig/aclocal.m4 hdf5-1.8.4/aclocal.m4
+--- hdf5-1.8.4.orig/aclocal.m4	2009-11-10 22:12:10.000000000 +0100
++++ hdf5-1.8.4/aclocal.m4	2009-12-21 16:07:53.000000000 +0100
+@@ -13,3016 +13,2034 @@
  
  m4_ifndef([AC_AUTOCONF_VERSION],
    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.61],,
--[m4_warning([this file was generated for autoconf 2.61.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-+[m4_warning([this file was generated for autoconf 2.63.
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
+-[m4_warning([this file was generated for autoconf 2.64.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
++[m4_warning([this file was generated for autoconf 2.65.
  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'.])])
@@ -26,10 +26,10 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -# 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.10'
+-[am__api_version='1.11'
 -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.10.2], [],
+-m4_if([$1], [1.11], [],
 -      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 -])
 -
@@ -45,7 +45,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -# 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.10.2])dnl
+-[AM_AUTOMAKE_VERSION([1.11])dnl
 -m4_ifndef([AC_AUTOCONF_VERSION],
 -  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -118,21 +118,30 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -# 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`
 +# You should have received a copy of the GNU General Public License
 +# along with GNU Libtool; see the file COPYING.  If not, a copy
 +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
 +# obtained by writing to the Free Software Foundation, Inc.,
 +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+])
+ ])
  
--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 -*-
 +# serial 56 LT_INIT
-+
-+
+ 
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+-# 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.
+ 
+-# serial 9
 +# LT_PREREQ(VERSION)
 +# ------------------
 +# Complain and exit if this libtool version is less that VERSION.
@@ -142,46 +151,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +		   [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
- ])
- 
--# AM_CONDITIONAL                                            -*- Autoconf -*-
- 
--# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
--# 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.
-+# LT_INIT([OPTIONS])
-+# ------------------
-+AC_DEFUN([LT_INIT],
-+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-+AC_BEFORE([$0], [LT_LANG])dnl
-+AC_BEFORE([$0], [LT_OUTPUT])dnl
-+AC_BEFORE([$0], [LTDL_INIT])dnl
-+m4_require([_LT_CHECK_BUILDDIR])dnl
- 
--# serial 8
-+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
  
 -# AM_CONDITIONAL(NAME, SHELL-CONDITION)
 -# -------------------------------------
@@ -194,6 +163,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -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='#'
@@ -206,61 +176,52 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  AC_MSG_ERROR([[conditional "$1" was never defined.
 -Usually this means the macro was only invoked conditionally.]])
 -fi])])
-+dnl Parse OPTIONS
-+_LT_SET_OPTIONS([$0], [$1])
  
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
 -# 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 can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ltmain"
++# _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
++])
  
--# serial 9
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+AC_SUBST(LIBTOOL)dnl
+-# serial 10
  
 -# 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...
-+_LT_SETUP
++# LT_INIT([OPTIONS])
++# ------------------
++AC_DEFUN([LT_INIT],
++[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
++AC_BEFORE([$0], [LT_LANG])dnl
++AC_BEFORE([$0], [LT_OUTPUT])dnl
++AC_BEFORE([$0], [LTDL_INIT])dnl
++m4_require([_LT_CHECK_BUILDDIR])dnl
  
-+# Only expand once:
-+m4_define([LT_INIT])
-+])# LT_INIT
++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
  
 -# _AM_DEPENDENCIES(NAME)
-+# 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_CC_BASENAME(CC)
-+# -------------------
-+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-+m4_defun([_LT_CC_BASENAME],
-+[for cc_temp in $1""; do
-+  case $cc_temp in
-+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+])
-+
-+
-+# _LT_FILEUTILS_DEFAULTS
- # ----------------------
+-# ----------------------
 -# See how the compiler implements dependency checking.
 -# NAME is "CC", "CXX", "GCJ", or "OBJC".
 -# We try a few techniques and use that to set a single cache variable.
@@ -274,13 +235,8 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 -AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 -AC_REQUIRE([AM_DEP_TRACK])dnl
-+# 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
++dnl Parse OPTIONS
++_LT_SET_OPTIONS([$0], [$1])
  
 -ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
 -       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
@@ -288,6 +244,8 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
 -       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
 -                   [depcc="$$1"   am_compiler_list=])
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ltmain"
  
 -AC_CACHE_CHECK([dependency style of $depcc],
 -               [am_cv_$1_dependencies_compiler_type],
@@ -309,11 +267,25 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  # the current directory while Tru64 will put them in the object
 -  # directory.
 -  mkdir sub
--
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++AC_SUBST(LIBTOOL)dnl
+ 
 -  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])
++_LT_SETUP
+ 
 -  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
@@ -330,8 +302,21 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -      touch sub/conftst$i.h
 -    done
 -    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
--
++# Only expand once:
++m4_define([LT_INIT])
++])# LT_INIT
+ 
+-    # 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
@@ -341,19 +326,23 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	break
 -      fi
 -      ;;
+-    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
--    # 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.
 -    if depmode=$depmode \
--       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+-       source=sub/conftest.c object=$am__obj \
 -       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
--       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+-       $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 sub/conftest.${OBJEXT-o} 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
@@ -369,6 +358,68 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -      fi
 -    fi
 -  done
++# 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], [])
+ 
+-  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])
++
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++m4_defun([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++  case $cc_temp in
++    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+ ])
+ 
+ 
+-# 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
+-])
++# _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
+ 
+ 
+-# AM_DEP_TRACK
+-# ------------
+-AC_DEFUN([AM_DEP_TRACK],
+-[AC_ARG_ENABLE(dependency-tracking,
+-[  --disable-dependency-tracking  speeds up one-time build
+-  --enable-dependency-tracking   do not reject slow dependency extractors])
+-if test "x$enable_dependency_tracking" != xno; then
+-  am_depcomp="$ac_aux_dir/depcomp"
+-  AMDEPBACKSLASH='\'
 +# _LT_SETUP
 +# ---------
 +m4_defun([_LT_SETUP],
@@ -400,53 +451,23 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +m4_require([_LT_CHECK_MAGIC_METHOD])dnl
 +m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
- 
--  cd ..
--  rm -rf conftest.dir
--else
--  am_cv_$1_dependencies_compiler_type=none
++
 +_LT_CONFIG_LIBTOOL_INIT([
 +# See if we are running on zsh, and set the options which allow our
 +# commands through without removal of \ escapes INIT.
 +if test -n "\${ZSH_VERSION+set}" ; then
 +   setopt NO_GLOB_SUBST
  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,
--[  --disable-dependency-tracking  speeds up one-time build
--  --enable-dependency-tracking   do not reject slow dependency extractors])
--if test "x$enable_dependency_tracking" != xno; then
--  am_depcomp="$ac_aux_dir/depcomp"
--  AMDEPBACKSLASH='\'
-+if test -n "${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
- fi
 -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 -AC_SUBST([AMDEPBACKSLASH])dnl
 -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
--])
--
+ ])
++if test -n "${ZSH_VERSION+set}" ; then
++   setopt NO_GLOB_SUBST
++fi
+ 
 -# Generate code to set up dependency tracking.              -*- Autoconf -*-
++_LT_CHECK_OBJDIR
  
 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
 -# Free Software Foundation, Inc.
@@ -454,38 +475,10 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -# 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.
-+_LT_CHECK_OBJDIR
- 
--#serial 4
 +m4_require([_LT_TAG_COMPILER])dnl
 +_LT_PROG_ECHO_BACKSLASH
  
--# _AM_OUTPUT_DEPENDENCY_COMMANDS
--# ------------------------------
--AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
--[# Autoconf 2.62 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
+-#serial 5
 +case $host_os in
 +aix3*)
 +  # AIX sometimes has problems with the GCC collect2 program.  For some
@@ -494,39 +487,71 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  if test "X${COLLECT_NAMES+set}" != Xset; then
 +    COLLECT_NAMES=
 +    export COLLECT_NAMES
-   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"`
--  # When using ansi2knr, U may be empty or an underscore; expand it
--  U=`sed -n 's/^U = //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' -e 's/\$U/'"$U"'/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
++  fi
 +  ;;
 +esac
  
+-# _AM_OUTPUT_DEPENDENCY_COMMANDS
+-# ------------------------------
+-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[{
+-  # Autoconf 2.62 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"`
+-    # When using ansi2knr, U may be empty or an underscore; expand it
+-    U=`sed -n 's/^U = //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' -e 's/\$U/'"$U"'/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
 +# 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.
++double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+ 
 -# AM_OUTPUT_DEPENDENCY_COMMANDS
 -# -----------------------------
 -# This macro should only be invoked once -- use via AC_REQUIRE.
@@ -539,8 +564,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
 -     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 -])
-+# 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'
  
 -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
 -# Free Software Foundation, Inc.
@@ -548,42 +574,45 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -# 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.
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
- 
--# serial 8
 +# Sed substitution to delay expansion of an escaped single quote.
 +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
  
--# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
--AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+-# serial 8
 +# Sed substitution to avoid accidental globbing in evaled expressions
 +no_glob_subst='s/\*/\\\*/g'
  
--# Do all the work for Automake.                             -*- Autoconf -*-
+-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
+-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 +# Global variables:
 +ofile=libtool
 +can_build_shared=yes
  
+-# Do all the work for Automake.                             -*- Autoconf -*-
++# All known linkers require a `.a' archive for static linking (except MSVC,
++# which needs '.lib').
++libext=a
+ 
 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006, 2008 Free Software Foundation, Inc.
+-# 2005, 2006, 2008, 2009 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.
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
- 
--# serial 13
 +with_gnu_ld="$lt_cv_prog_gnu_ld"
  
--# 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.
+-# serial 16
 +old_CC="$CC"
 +old_CFLAGS="$CFLAGS"
  
+-# 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.
++# 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
+ 
 -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 -# AM_INIT_AUTOMAKE([OPTIONS])
 -# -----------------------------------------------
@@ -596,7 +625,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -# 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.60])dnl
+-[AC_PREREQ([2.62])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
@@ -611,12 +640,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 -  fi
 -fi
-+# 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])
  
 -# test whether we have cygpath
 -if test -z "$CYGPATH_W"; then
@@ -624,8 +648,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -    CYGPATH_W='cygpath -w'
 -  else
 -    CYGPATH_W=echo
-+_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
@@ -635,9 +657,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
    fi
 -fi
 -AC_SUBST([CYGPATH_W])
-+  ;;
-+esac
- 
+-
 -# Define the identity of the package.
 -dnl Distinguish between old-style and new-style calls.
 -m4_ifval([$2],
@@ -650,16 +670,12 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  [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
-+# 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
- 
+-
 -_AM_IF_OPTION([no-define],,
 -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
 - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
++  ;;
++esac
  
 -# Some tools Automake needs.
 -AC_REQUIRE([AM_SANITY_CHECK])dnl
@@ -669,8 +685,8 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
 -AM_MISSING_PROG(AUTOHEADER, autoheader)
 -AM_MISSING_PROG(MAKEINFO, makeinfo)
--AM_PROG_INSTALL_SH
--AM_PROG_INSTALL_STRIP
+-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 -AC_REQUIRE([AM_PROG_MKDIR_P])dnl
 -# We need awk for the "check" target.  The system "awk" is bad on
 -# some platforms.
@@ -678,23 +694,43 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -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([tar-pax], [_AM_PROG_TAR([pax])],
+-			     [_AM_PROG_TAR([v7])])])
 -_AM_IF_OPTION([no-dependencies],,
 -[AC_PROVIDE_IFELSE([AC_PROG_CC],
--                  [_AM_DEPENDENCIES(CC)],
--                  [define([AC_PROG_CC],
--                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+-		  [_AM_DEPENDENCIES(CC)],
+-		  [define([AC_PROG_CC],
+-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
 -AC_PROVIDE_IFELSE([AC_PROG_CXX],
--                  [_AM_DEPENDENCIES(CXX)],
--                  [define([AC_PROG_CXX],
--                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+-		  [_AM_DEPENDENCIES(CXX)],
+-		  [define([AC_PROG_CXX],
+-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 -AC_PROVIDE_IFELSE([AC_PROG_OBJC],
--                  [_AM_DEPENDENCIES(OBJC)],
--                  [define([AC_PROG_OBJC],
--                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+-		  [_AM_DEPENDENCIES(OBJC)],
+-		  [define([AC_PROG_OBJC],
+-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 -])
+-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+-dnl 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
 -])
++# 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
+ 
+-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])])
+ 
 +# _LT_PROG_LTMAIN
 +# ---------------
 +# Note that this code is called both from `configure', and `config.status'
@@ -707,7 +743,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +ltmain="$ac_aux_dir/ltmain.sh"
 +])# _LT_PROG_LTMAIN
  
- 
 -# 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.
@@ -728,24 +763,37 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  esac
 -done
 -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-+# 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.
  
--# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+-# Copyright (C) 2001, 2003, 2005, 2008  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.
++# 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.
  
 -# AM_PROG_INSTALL_SH
 -# ------------------
 -# Define $install_sh.
 -AC_DEFUN([AM_PROG_INSTALL_SH],
 -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+-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, 2005  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.
 +# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
 +# ----------------------------------------
 +# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
@@ -755,16 +803,10 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +                     [$1
 +])])])
  
--# Copyright (C) 2003, 2005  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.
+-# serial 2
 +# Initialize.
 +m4_define([_LT_OUTPUT_LIBTOOL_INIT])
  
--# serial 2
- 
 -# Check whether the underlying file-system supports filenames
 -# with a leading dot.  For instance MS-DOS doesn't.
 -AC_DEFUN([AM_SET_LEADING_DOT],
@@ -777,6 +819,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -fi
 -rmdir .tst 2>/dev/null
 -AC_SUBST([am__leading_dot])])
+ 
+-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+-# From Jim Meyering
 +# _LT_CONFIG_LIBTOOL([COMMANDS])
 +# ------------------------------
 +# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
@@ -786,42 +831,52 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +                     [$1
 +])])])
  
--# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
--# From Jim Meyering
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
- 
--# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
 -# 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.
++# Initialize.
++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
  
--# serial 4
-+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-+# -----------------------------------------------------
-+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-+[_LT_CONFIG_LIBTOOL([$1])
-+_LT_CONFIG_LIBTOOL_INIT([$2])
-+])
+-# serial 5
  
+-# AM_MAINTAINER_MODE([DEFAULT-MODE])
+-# ----------------------------------
+-# Control maintainer-specific portions of Makefiles.
+-# Default is to disable them, unless `enable' is passed literally.
+-# For symmetry, `disable' may be passed as well.  Anyway, the user
+-# can override the default with the --enable/--disable switch.
 -AC_DEFUN([AM_MAINTAINER_MODE],
--[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
--  dnl maintainer-mode is disabled by default
--  AC_ARG_ENABLE(maintainer-mode,
--[  --enable-maintainer-mode  enable make rules and dependencies not useful
+-[m4_case(m4_default([$1], [disable]),
+-       [enable], [m4_define([am_maintainer_other], [disable])],
+-       [disable], [m4_define([am_maintainer_other], [enable])],
+-       [m4_define([am_maintainer_other], [enable])
+-        m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
+-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+-  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+-  AC_ARG_ENABLE([maintainer-mode],
+-[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
 -			  (and sometimes confusing) to the casual installer],
--      USE_MAINTAINER_MODE=$enableval,
--      USE_MAINTAINER_MODE=no)
+-      [USE_MAINTAINER_MODE=$enableval],
+-      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
 -  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
--  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+-  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
 -  MAINT=$MAINTAINER_MODE_TRUE
--  AC_SUBST(MAINT)dnl
+-  AC_SUBST([MAINT])dnl
 -]
 -)
++# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
++# -----------------------------------------------------
++m4_defun([_LT_CONFIG_SAVE_COMMANDS],
++[_LT_CONFIG_LIBTOOL([$1])
++_LT_CONFIG_LIBTOOL_INIT([$2])
++])
  
 -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+ 
+-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
 +# _LT_FORMAT_COMMENT([COMMENT])
 +# -----------------------------
 +# Add leading comment marks to the start of each line, and a trailing
@@ -832,15 +887,13 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
 +)])
  
--# Check to see how 'make' treats includes.	            -*- Autoconf -*-
- 
--# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+-# Copyright (C) 2001, 2002, 2003, 2005, 2009  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.
  
--# serial 3
+-# serial 4
  
 -# AM_MAKE_INCLUDE()
 -# -----------------
@@ -849,7 +902,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -[am_make=${MAKE-make}
 -cat > confinc << 'END'
 -am__doit:
--	@echo done
+-	@echo this is the am__doit target
 -.PHONY: am__doit
 -END
 -# If we don't find an include directive, just comment out the code.
@@ -859,30 +912,39 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -_am_result=none
 -# First try GNU make style include.
 -echo "include confinc" > confmf
--# We grep out `Entering directory' and `Leaving directory'
--# messages which can occur if `w' ends up in MAKEFLAGS.
--# In particular we don't look at `^make:' because GNU make might
--# be invoked under some other name (usually "gmake"), in which
--# case it prints its new name instead of `make'.
--if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
--   am__include=include
--   am__quote=
--   _am_result=GNU
--fi
+-# 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
--   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
--      am__include=.include
--      am__quote="\""
--      _am_result=BSD
--   fi
+-   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, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+-# 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.
 +# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
 +# -------------------------------------------------------------------
 +# CONFIGNAME is the name given to the value in the libtool script.
@@ -898,21 +960,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
 +    lt_dict_add_subkey([lt_decl_dict], [$2],
 +	[tagged?], [m4_ifval([$5], [yes], [no])])])
- ])
- 
--# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
- 
--# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
--# 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.
-+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-+# --------------------------------------------------------
-+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
++])
  
--# serial 5
+-# serial 6
  
 -# AM_MISSING_PROG(NAME, PROGRAM)
 -# ------------------------------
@@ -920,10 +970,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -[AC_REQUIRE([AM_MISSING_HAS_RUN])
 -$1=${$1-"${am_missing_run}$2"}
 -AC_SUBST($1)])
-+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-+# ------------------------------------------------
-+m4_define([lt_decl_tag_varnames],
-+[_lt_decl_filter([tagged?], [yes], $@)])
++# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
++# --------------------------------------------------------
++m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
  
  
 -# AM_MISSING_HAS_RUN
@@ -933,7 +982,14 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -AC_DEFUN([AM_MISSING_HAS_RUN],
 -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 -AC_REQUIRE_AUX_FILE([missing])dnl
--test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+-if test x"${MISSING+set}" != xset; then
+-  case $am_aux_dir in
+-  *\ * | *\	*)
+-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+-  *)
+-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+-  esac
+-fi
 -# Use eval to expand $SHELL
 -if eval "$MISSING --run true"; then
 -  am_missing_run="$MISSING --run "
@@ -941,16 +997,11 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  am_missing_run=
 -  AC_MSG_WARN([`missing' script is too old or missing])
 -fi
-+# _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_tag_varnames([SEPARATOR], [VARNAME1...])
++# ------------------------------------------------
++m4_define([lt_decl_tag_varnames],
++[_lt_decl_filter([tagged?], [yes], $@)])
  
 -# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 -#
@@ -976,11 +1027,16 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  [[\\/$]]* | ?:[[\\/]]*) ;;
 -  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
 -esac
--])
-+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-+# --------------------------------------------------
-+m4_define([lt_decl_quote_varnames],
-+[_lt_decl_filter([value], [1], $@)])
++# _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
+ ])
  
 -# Helper functions for option handling.                     -*- Autoconf -*-
  
@@ -989,10 +1045,10 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -# 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.
-+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-+# ---------------------------------------------------
-+m4_define([lt_decl_dquote_varnames],
-+[_lt_decl_filter([value], [2], $@)])
++# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
++# --------------------------------------------------
++m4_define([lt_decl_quote_varnames],
++[_lt_decl_filter([value], [1], $@)])
  
 -# serial 4
  
@@ -1000,15 +1056,10 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -# -----------------------
 -AC_DEFUN([_AM_MANGLE_OPTION],
 -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
++# lt_decl_dquote_varnames([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)])])
++m4_define([lt_decl_dquote_varnames],
++[_lt_decl_filter([value], [2], $@)])
  
 -# _AM_SET_OPTION(NAME)
 -# ------------------------------
@@ -1021,18 +1072,15 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -# 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)])])
-+# 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_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)])])
  
 -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
 -# -------------------------------------------
@@ -1041,33 +1089,34 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
  
 -# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-+# _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 "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
++# 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
++])
  
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
 -# 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.
  
--# serial 4
-+# _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 "X$<var>" | $Xsed -e "$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)])])])
+-# serial 5
++# _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 "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
  
 -# AM_SANITY_CHECK
 -# ---------------
@@ -1076,16 +1125,29 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -# Just in case
 -sleep 1
 -echo timestamp > conftest.file
+-# Reject unsafe characters in $srcdir or the absolute working directory
+-# name.  Accept space and tab only in the latter.
+-am_lf='
+-'
+-case `pwd` in
+-  *[[\\\"\#\$\&\'\`$am_lf]]*)
+-    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 (
--   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+-   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`
+-      set X `ls -t "$srcdir/configure" conftest.file`
 -   fi
 -   rm -f conftest.file
 -   if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -1098,13 +1160,17 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
 -alias in your environment])
 -   fi
-+# _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_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 "X$<var>" | $Xsed -e "$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)])])])
  
 -   test "$[2]" = conftest.file
 -   )
@@ -1118,27 +1184,16 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -AC_MSG_RESULT(yes)])
  
 -# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-+# -----------------------------------
-+# Extract the dictionary values for VARNAME (optionally with TAG) and
-+# expand to a commented shell variable setting:
- #
+-#
 -# 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.
-+#    # 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_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
 +])
  
 -# AM_PROG_INSTALL_STRIP
@@ -1163,11 +1218,37 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 -AC_SUBST([INSTALL_STRIP_PROGRAM])])
  
--# Copyright (C) 2006  Free Software Foundation, Inc.
--#
+-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
++# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
++# -----------------------------------
++# Extract the dictionary values for VARNAME (optionally with TAG) and
++# expand to a commented shell variable setting:
+ #
 -# 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.
++#    # 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
++])
+ 
+-# serial 2
+ 
+-# _AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
+-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+-# This macro is traced by Automake.
+-AC_DEFUN([_AM_SUBST_NOTMAKE])
 +# _LT_LIBTOOL_CONFIG_VARS
 +# -----------------------
 +# Produce commented declarations of non-tagged libtool config variables
@@ -1179,11 +1260,10 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
 +    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
  
--# _AM_SUBST_NOTMAKE(VARIABLE)
+-# AM_SUBST_NOTMAKE(VARIABLE)
 -# ---------------------------
--# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
--# This macro is traced by Automake.
--AC_DEFUN([_AM_SUBST_NOTMAKE])
+-# Public sister of _AM_SUBST_NOTMAKE.
+-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
  
 -# Check how to create a tarball.                            -*- Autoconf -*-
 +# _LT_LIBTOOL_TAG_VARS(TAG)
@@ -1322,10 +1402,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -# 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 HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
+-
 -m4_define([_LT_COPYING], [dnl
 -#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
 -#                 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -1354,6 +1431,12 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -# obtained by writing to the Free Software Foundation, Inc.,
 -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 -])
+-
+-# serial 56 LT_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'
@@ -1362,7 +1445,15 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +LTCFLAGS='$LTCFLAGS'
 +compiler='$compiler_DEFAULT'
  
--# serial 56 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])])
 +# Quote evaled strings.
 +for var in lt_decl_all_varnames([[ \
 +]], lt_decl_quote_varnames); do
@@ -1389,17 +1480,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    esac
 +done
  
--# 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
@@ -1413,10 +1493,10 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
 +  ;;
  esac
-+
-+_LT_OUTPUT_LIBTOOL_INIT
- ])
+-])
  
++_LT_OUTPUT_LIBTOOL_INIT
++])
  
 -# LT_INIT([OPTIONS])
 -# ------------------
@@ -1426,6 +1506,17 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -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_OUTPUT
 +# ---------
 +# This macro allows early generation of the libtool script (before
@@ -1439,28 +1530,21 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +# Generated by $as_me.
 +# Run this file to recreate a libtool stub with the current configuration.
  
--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
+-dnl Parse OPTIONS
+-_LT_SET_OPTIONS([$0], [$1])
 +lt_cl_silent=false
 +SHELL=\${CONFIG_SHELL-$SHELL}
 +_LTEOF
  
--dnl Parse OPTIONS
--_LT_SET_OPTIONS([$0], [$1])
+-# This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ltmain"
 +cat >>"$CONFIG_LT" <<\_LTEOF
 +AS_SHELL_SANITIZE
 +_AS_PREPARE
  
--# 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
 +exec AS_MESSAGE_FD>&1
 +exec AS_MESSAGE_LOG_FD>>config.log
 +{
@@ -1468,24 +1552,16 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  AS_BOX([Running $as_me.])
 +} >&AS_MESSAGE_LOG_FD
  
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--AC_SUBST(LIBTOOL)dnl
+-_LT_SETUP
 +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.
  
--_LT_SETUP
-+Usage: $[0] [[OPTIONS]]
- 
 -# Only expand once:
 -m4_define([LT_INIT])
 -])# LT_INIT
-+  -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
++Usage: $[0] [[OPTIONS]]
  
 -# Old names:
 -AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
@@ -1493,12 +1569,12 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -dnl aclocal-1.4 backwards compatibility:
 -dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
 -dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-+Report bugs to <bug-libtool at gnu.org>."
++  -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
  
-+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.
++Report bugs to <bug-libtool at gnu.org>."
  
 -# _LT_CC_BASENAME(CC)
 -# -------------------
@@ -1510,10 +1586,28 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
 -    \-*) ;;
 -    *) break;;
+-  esac
+-done
+-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+-])
++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) 2008 Free Software Foundation, Inc.
 +This config.lt script is free software; the Free Software Foundation
 +gives unlimited permision to copy, distribute and modify it."
-+
+ 
+-# _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
 +while test $[#] != 0
 +do
 +  case $[1] in
@@ -1525,36 +1619,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +      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
--cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
--])
- 
-+if $lt_cl_silent; then
-+  exec AS_MESSAGE_FD>/dev/null
-+fi
-+_LTEOF
- 
--# _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
--
-+cat >>"$CONFIG_LT" <<_LTEOF
-+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-+_LTEOF
  
 -# _LT_SETUP
 -# ---------
@@ -1587,12 +1654,11 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -m4_require([_LT_CHECK_MAGIC_METHOD])dnl
 -m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-+cat >>"$CONFIG_LT" <<\_LTEOF
-+AC_MSG_NOTICE([creating $ofile])
-+_LT_OUTPUT_LIBTOOL_COMMANDS
-+AS_EXIT(0)
-+_LTEOF
-+chmod +x "$CONFIG_LT"
++    *) AC_MSG_ERROR([unrecognized argument: $[1]
++Try \`$[0] --help' for more information.]) ;;
++  esac
++  shift
++done
  
 -_LT_CONFIG_LIBTOOL_INIT([
 -# See if we are running on zsh, and set the options which allow our
@@ -1603,6 +1669,50 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -])
 -if test -n "${ZSH_VERSION+set}" ; then
 -   setopt NO_GLOB_SUBST
++if $lt_cl_silent; then
++  exec AS_MESSAGE_FD>/dev/null
+ fi
++_LTEOF
+ 
+-_LT_CHECK_OBJDIR
+-
+-m4_require([_LT_TAG_COMPILER])dnl
+-_LT_PROG_ECHO_BACKSLASH
+-
+-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 "X${COLLECT_NAMES+set}" != Xset; then
+-    COLLECT_NAMES=
+-    export COLLECT_NAMES
+-  fi
+-  ;;
+-esac
+-
+-# 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.
+-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
++cat >>"$CONFIG_LT" <<_LTEOF
++_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
++_LTEOF
+ 
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++cat >>"$CONFIG_LT" <<\_LTEOF
++AC_MSG_NOTICE([creating $ofile])
++_LT_OUTPUT_LIBTOOL_COMMANDS
++AS_EXIT(0)
++_LTEOF
++chmod +x "$CONFIG_LT"
+ 
+-# Sed substitution to delay expansion of an escaped single quote.
+-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
 +# 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
@@ -1615,13 +1725,15 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
 +  exec AS_MESSAGE_LOG_FD>>config.log
 +  $lt_cl_success || AS_EXIT(1)
- fi
++fi
 +])# LT_OUTPUT
  
--_LT_CHECK_OBJDIR
+-# Sed substitution to avoid accidental globbing in evaled expressions
+-no_glob_subst='s/\*/\\\*/g'
  
--m4_require([_LT_TAG_COMPILER])dnl
--_LT_PROG_ECHO_BACKSLASH
+-# Global variables:
+-ofile=libtool
+-can_build_shared=yes
 +# _LT_CONFIG(TAG)
 +# ---------------
 +# If TAG is the built-in tag, create an initial libtool script with a
@@ -1639,29 +1751,19 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +      setopt NO_GLOB_SUBST
 +    fi
  
--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 "X${COLLECT_NAMES+set}" != Xset; then
--    COLLECT_NAMES=
--    export COLLECT_NAMES
--  fi
--  ;;
--esac
+-# All known linkers require a `.a' archive for static linking (except MSVC,
+-# which needs '.lib').
+-libext=a
 +    cfgfile="${ofile}T"
 +    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
 +    $RM "$cfgfile"
  
--# 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'
+-with_gnu_ld="$lt_cv_prog_gnu_ld"
 +    cat <<_LT_EOF >> "$cfgfile"
 +#! $SHELL
  
--# Same as above, but do not quote variable references.
--double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+-old_CC="$CC"
+-old_CFLAGS="$CFLAGS"
 +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
 +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
 +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
@@ -1670,28 +1772,29 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +_LT_COPYING
 +_LT_LIBTOOL_TAGS
  
--# Sed substitution to delay expansion of an escaped shell variable in a
--# double_quote_subst'ed string.
--delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+-# 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
 +# ### BEGIN LIBTOOL CONFIG
 +_LT_LIBTOOL_CONFIG_VARS
 +_LT_LIBTOOL_TAG_VARS
 +# ### END LIBTOOL CONFIG
  
--# 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'
--
--# Global variables:
--ofile=libtool
--can_build_shared=yes
+-_LT_CC_BASENAME([$compiler])
 +_LT_EOF
  
--# All known linkers require a `.a' archive for static linking (except MSVC,
--# which needs '.lib').
--libext=a
+-# 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
 +  case $host_os in
 +  aix3*)
 +    cat <<\_LT_EOF >> "$cfgfile"
@@ -1706,11 +1809,14 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    ;;
 +  esac
  
--with_gnu_ld="$lt_cv_prog_gnu_ld"
+-# 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_PROG_LTMAIN
  
--old_CC="$CC"
--old_CFLAGS="$CFLAGS"
 +  # 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
@@ -1718,39 +1824,32 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
 +    || (rm -f "$cfgfile"; exit 1)
  
--# 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_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
 +  _LT_PROG_XSI_SHELLFNS
  
--_LT_CC_BASENAME([$compiler])
 +  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
 +    || (rm -f "$cfgfile"; exit 1)
  
--# 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
 +  mv -f "$cfgfile" "$ofile" ||
 +    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
 +  chmod +x "$ofile"
 +],
 +[cat <<_LT_EOF >> "$ofile"
  
--# 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
+-# 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.
 +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
@@ -1769,17 +1868,14 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +])# _LT_CONFIG
  
  
--# _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
+-# _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
+-])])])
 +# LT_SUPPORTED_TAG(TAG)
 +# ---------------------
 +# Trace this macro to discover what tags are supported by the libtool
@@ -1787,16 +1883,24 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
 +AC_DEFUN([LT_SUPPORTED_TAG], [])
  
+-# Initialize.
+-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
  
 +# C support is built-in for now
 +m4_define([_LT_LANG_C_enabled], [])
 +m4_define([_LT_TAGS], [])
  
--# 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([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_LANG(LANG)
 +# -------------
 +# Enable libtool support for the given language if not already enabled.
@@ -1814,17 +1918,13 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    [m4_fatal([$0: unsupported language: "$1"])])])dnl
 +])# LT_LANG
  
--# _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_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+-# -----------------------------------------------------
+-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+-[_LT_CONFIG_LIBTOOL([$1])
+-_LT_CONFIG_LIBTOOL_INIT([$2])
+-])
 +# _LT_LANG(LANGNAME)
 +# ------------------
 +m4_defun([_LT_LANG],
@@ -1836,14 +1936,15 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +])# _LT_LANG
  
  
--# _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
--])])])
+-# _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], [[!?.]$], [], [.])
+-)])
 +# _LT_LANG_DEFAULT_CONFIG
 +# -----------------------
 +m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -1851,8 +1952,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  [LT_LANG(CXX)],
 +  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
  
--# Initialize.
--m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
 +AC_PROVIDE_IFELSE([AC_PROG_F77],
 +  [LT_LANG(F77)],
 +  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
@@ -1861,12 +1960,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  [LT_LANG(FC)],
 +  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
  
--# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
--# -----------------------------------------------------
--m4_defun([_LT_CONFIG_SAVE_COMMANDS],
--[_LT_CONFIG_LIBTOOL([$1])
--_LT_CONFIG_LIBTOOL_INIT([$2])
--])
 +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],
@@ -1887,15 +1980,22 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
 +])# _LT_LANG_DEFAULT_CONFIG
  
--# _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], [[!?.]$], [], [.])
--)])
+-# _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])])])
+-])
 +# Obsolete macros:
 +AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
 +AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
@@ -1908,6 +2008,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
  
  
+-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+-# --------------------------------------------------------
+-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
 +# _LT_TAG_COMPILER
 +# ----------------
 +m4_defun([_LT_TAG_COMPILER],
@@ -1918,36 +2021,35 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
 +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
  
+-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+-# ------------------------------------------------
+-m4_define([lt_decl_tag_varnames],
+-[_lt_decl_filter([tagged?], [yes], $@)])
 +# If no C compiler was specified, use CC.
 +LTCC=${LTCC-"$CC"}
  
--# _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])])])
--])
 +# If no C compiler flags were specified, use CFLAGS.
 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
  
+-# _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
+-])
 +# Allow CC to be a program name with arguments.
 +compiler=$CC
 +])# _LT_TAG_COMPILER
  
--# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
--# --------------------------------------------------------
--m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
  
+-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+-# --------------------------------------------------
+-m4_define([lt_decl_quote_varnames],
+-[_lt_decl_filter([value], [1], $@)])
 +# _LT_COMPILER_BOILERPLATE
 +# ------------------------
 +# Check for compiler boilerplate output or warnings with
@@ -1961,11 +2063,11 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +$RM conftest*
 +])# _LT_COMPILER_BOILERPLATE
  
--# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
--# ------------------------------------------------
--m4_define([lt_decl_tag_varnames],
--[_lt_decl_filter([tagged?], [yes], $@)])
  
+-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+-# ---------------------------------------------------
+-m4_define([lt_decl_dquote_varnames],
+-[_lt_decl_filter([value], [2], $@)])
 +# _LT_LINKER_BOILERPLATE
 +# ----------------------
 +# Check for linker boilerplate output or warnings with
@@ -1979,15 +2081,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +$RM -r conftest*
 +])# _LT_LINKER_BOILERPLATE
  
--# _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_REQUIRED_DARWIN_CHECKS
 +# -------------------------
 +m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
@@ -2008,7 +2101,16 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +      [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])
-+
+ 
+-# 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)])])
 +    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
@@ -2076,13 +2178,20 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    fi
 +    ;;
 +  esac
- ])
++])
  
  
--# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
--# --------------------------------------------------
--m4_define([lt_decl_quote_varnames],
--[_lt_decl_filter([value], [1], $@)])
+-# 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_DARWIN_LINKER_FEATURES
 +# --------------------------
 +# Checks for linker and compiler features on darwin
@@ -2115,10 +2224,73 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  else
 +  _LT_TAGVAR(ld_shlibs, $1)=no
 +  fi
-+])
+ ])
  
+-
+-# _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 "X$][$1" | $Xsed -e "$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 "X$<var>" | $Xsed -e "$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
 +# _LT_SYS_MODULE_PATH_AIX
-+# -----------------------
+ # -----------------------
+-# 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)])])])
+-
 +# 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
@@ -2143,10 +2315,11 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 +])# _LT_SYS_MODULE_PATH_AIX
  
--# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
--# ---------------------------------------------------
--m4_define([lt_decl_dquote_varnames],
--[_lt_decl_filter([value], [2], $@)])
+-# _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_SHELL_INIT(ARG)
 +# -------------------
@@ -2158,15 +2331,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +AC_DIVERT_POP
 +])# _LT_SHELL_INIT
  
--# 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_TAGVAR(VARNAME, [TAGNAME])
+-# ------------------------------
+-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
  
 +# _LT_PROG_ECHO_BACKSLASH
 +# -----------------------
@@ -2177,18 +2344,27 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +# Check that we are running under the correct shell.
 +SHELL=${CONFIG_SHELL-/bin/sh}
  
--# 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_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
 +case X$lt_ECHO in
 +X*--fallback-echo)
 +  # Remove one level of quotation (which was required for Make).
@@ -2211,13 +2387,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
 +fi
  
--# _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 "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+-# Initialize.
+-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+-[
 +if test "X[$]1" = X--fallback-echo; then
 +  # used as fallback echo
 +  shift
@@ -2227,70 +2399,67 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  exit 0
 +fi
  
-+# 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
+ # 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
  
--# _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 "X$<var>" | $Xsed -e "$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)])])])
+-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'
 -
+-# Quote evaled strings.
+-for var in lt_decl_all_varnames([[ \
+-]], lt_decl_quote_varnames); do
+-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+-    *[[\\\\\\\`\\"\\\$]]*)
+-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+-      ;;
+-    *)
+-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+-      ;;
+-    esac
+-done
 -
--# _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
--])
+-# Double-quote double-evaled strings.
+-for var in lt_decl_all_varnames([[ \
+-]], lt_decl_dquote_varnames); do
+-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+-    *[[\\\\\\\`\\"\\\$]]*)
+-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+-      ;;
+-    *)
+-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+-      ;;
+-    esac
+-done
 -
+-# Fix-up fallback echo if it was mangled by the above quoting rules.
+-case \$lt_ECHO in
+-*'\\\[$]0 --fallback-echo"')dnl "
+-  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
+-  ;;
+-esac
 -
--# _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_OUTPUT_LIBTOOL_INIT
 -])
 -
 -
--# _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_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])
+-cat >"$CONFIG_LT" <<_LTEOF
+-#! $SHELL
+-# Generated by $as_me.
+-# Run this file to recreate a libtool stub with the current configuration.
 +if test -z "$lt_ECHO"; then
 +  if test "X${echo_test_string+set}" != Xset; then
 +    # find a string as large as possible, as long as the shell can cope with it
@@ -2304,6 +2473,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    done
 +  fi
  
+-lt_cl_silent=false
+-SHELL=\${CONFIG_SHELL-$SHELL}
+-_LTEOF
 +  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
 +     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
 +     test "X$echo_testing_string" = "X$echo_test_string"; then
@@ -2315,9 +2487,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    #
 +    # So, first we look for a working echo in the user's PATH.
  
--# _LT_TAGVAR(VARNAME, [TAGNAME])
--# ------------------------------
--m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+-cat >>"$CONFIG_LT" <<\_LTEOF
+-AS_SHELL_SANITIZE
+-_AS_PREPARE
 +    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 +    for dir in $PATH /usr/ucb; do
 +      IFS="$lt_save_ifs"
@@ -2331,6 +2503,12 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    done
 +    IFS="$lt_save_ifs"
  
+-exec AS_MESSAGE_FD>&1
+-exec AS_MESSAGE_LOG_FD>>config.log
+-{
+-  echo
+-  AS_BOX([Running $as_me.])
+-} >&AS_MESSAGE_LOG_FD
 +    if test "X$ECHO" = Xecho; then
 +      # We didn't find a better echo, so look for alternatives.
 +      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
@@ -2372,27 +2550,10 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	  # maybe with a smaller string...
 +	  prev=:
  
--# _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
+-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.
 +	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
 +	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
 +	    then
@@ -2401,6 +2562,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	    prev="$cmd"
 +	  done
  
+-Usage: $[0] [[OPTIONS]]
 +	  if test "$prev" != 'sed 50q "[$]0"'; then
 +	    echo_test_string=`eval $prev`
 +	    export echo_test_string
@@ -2415,9 +2577,10 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  fi
 +fi
  
--# Initialize.
--m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
--[
+-  -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
 +# Copy echo and quote the copy suitably for passing to libtool from
 +# the Makefile, instead of quoting the original, which is used later.
 +lt_ECHO=$ECHO
@@ -2425,9 +2588,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
 +fi
  
--# 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
+-Report bugs to <bug-libtool at gnu.org>."
 +AC_SUBST(lt_ECHO)
 +])
 +_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
@@ -2435,26 +2596,14 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    [An echo program that does not interpret backslashes])
 +])# _LT_PROG_ECHO_BACKSLASH
  
--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'
+-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.
  
--# Quote evaled strings.
--for var in lt_decl_all_varnames([[ \
--]], lt_decl_quote_varnames); do
--    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
--    *[[\\\\\\\`\\"\\\$]]*)
--      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
--      ;;
--    *)
--      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
--      ;;
--    esac
--done
+-Copyright (C) 2008 Free Software Foundation, Inc.
+-This config.lt script is free software; the Free Software Foundation
+-gives unlimited permision to copy, distribute and modify it."
 +# _LT_ENABLE_LOCK
 +# ---------------
 +m4_defun([_LT_ENABLE_LOCK],
@@ -2463,16 +2612,17 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    [avoid locking (might break parallel builds)])])
 +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
  
--# Double-quote double-evaled strings.
--for var in lt_decl_all_varnames([[ \
--]], lt_decl_dquote_varnames); do
--    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
--    *[[\\\\\\\`\\"\\\$]]*)
--      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
--      ;;
--    *)
--      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
--      ;;
+-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=: ;;
 +# Some flags need to be propagated to the compiler or linker for good
 +# libtool support.
 +case $host in
@@ -2487,13 +2637,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +      *ELF-64*)
 +	HPUX_IA64_MODE="64"
 +	;;
-     esac
--done
--
--# Fix-up fallback echo if it was mangled by the above quoting rules.
--case \$lt_ECHO in
--*'\\\[$]0 --fallback-echo"')dnl "
--  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
++    esac
 +  fi
 +  rm -rf conftest*
 +  ;;
@@ -2528,45 +2672,10 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    fi
 +  fi
 +  rm -rf conftest*
-   ;;
--esac
--
--_LT_OUTPUT_LIBTOOL_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])
--cat >"$CONFIG_LT" <<_LTEOF
--#! $SHELL
--# Generated by $as_me.
--# Run this file to recreate a libtool stub with the current configuration.
--
--lt_cl_silent=false
--SHELL=\${CONFIG_SHELL-$SHELL}
--_LTEOF
--
--cat >>"$CONFIG_LT" <<\_LTEOF
--AS_SHELL_SANITIZE
--_AS_PREPARE
--
--exec AS_MESSAGE_FD>&1
--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.
+-    -*) AC_MSG_ERROR([unrecognized option: $[1]
+-Try \`$[0] --help' for more information.]) ;;
 +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 +s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 +  # Find out which ABI we are using.
@@ -2616,7 +2725,11 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  rm -rf conftest*
 +  ;;
  
--Usage: $[0] [[OPTIONS]]
+-    *) AC_MSG_ERROR([unrecognized argument: $[1]
+-Try \`$[0] --help' for more information.]) ;;
+-  esac
+-  shift
+-done
 +*-*-sco3.2v5*)
 +  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
 +  SAVE_CFLAGS="$CFLAGS"
@@ -2651,77 +2764,13 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  ;;
 +esac
  
--  -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
+-if $lt_cl_silent; then
+-  exec AS_MESSAGE_FD>/dev/null
+-fi
+-_LTEOF
 +need_locks="$enable_libtool_lock"
 +])# _LT_ENABLE_LOCK
  
--Report bugs to <bug-libtool at 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.
-+# _LT_CMD_OLD_ARCHIVE
-+# -------------------
-+m4_defun([_LT_CMD_OLD_ARCHIVE],
-+[AC_CHECK_TOOL(AR, ar, false)
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+_LT_DECL([], [AR], [1], [The archiver])
-+_LT_DECL([], [AR_FLAGS], [1])
- 
--Copyright (C) 2008 Free Software Foundation, Inc.
--This config.lt script is free software; the Free Software Foundation
--gives unlimited permision to copy, distribute and modify it."
-+AC_CHECK_TOOL(STRIP, strip, :)
-+test -z "$STRIP" && STRIP=:
-+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
- 
--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_CHECK_TOOL(RANLIB, ranlib, :)
-+test -z "$RANLIB" && RANLIB=:
-+_LT_DECL([], [RANLIB], [1],
-+    [Commands used to install an old-style archive])
- 
--    -*) AC_MSG_ERROR([unrecognized option: $[1]
--Try \`$[0] --help' for more information.]) ;;
-+# 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=
- 
--    *) AC_MSG_ERROR([unrecognized argument: $[1]
--Try \`$[0] --help' for more information.]) ;;
-+if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-+    ;;
-+  *)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-+    ;;
-   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
@@ -2745,16 +2794,10 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
 -  exec AS_MESSAGE_LOG_FD>>config.log
 -  $lt_cl_success || AS_EXIT(1)
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
+-fi
 -])# LT_OUTPUT
-+_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_CMD_OLD_ARCHIVE
- 
- 
+-
+-
 -# _LT_CONFIG(TAG)
 -# ---------------
 -# If TAG is the built-in tag, create an initial libtool script with a
@@ -2762,12 +2805,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -# to config.status for appending the configuration named by TAG from the
 -# matching tagged config vars.
 -m4_defun([_LT_CONFIG],
-+# _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_FILEUTILS_DEFAULTS])dnl
 -_LT_CONFIG_SAVE_COMMANDS([
 -  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
 -  m4_if(_LT_TAG, [C], [
@@ -2780,10 +2818,18 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -    cfgfile="${ofile}T"
 -    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
 -    $RM "$cfgfile"
--
+ 
 -    cat <<_LT_EOF >> "$cfgfile"
 -#! $SHELL
--
++# _LT_CMD_OLD_ARCHIVE
++# -------------------
++m4_defun([_LT_CMD_OLD_ARCHIVE],
++[AC_CHECK_TOOL(AR, ar, false)
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++_LT_DECL([], [AR], [1], [The archiver])
++_LT_DECL([], [AR_FLAGS], [1])
+ 
 -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
 -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
 -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
@@ -2791,13 +2837,66 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -#
 -_LT_COPYING
 -_LT_LIBTOOL_TAGS
--
++AC_CHECK_TOOL(STRIP, strip, :)
++test -z "$STRIP" && STRIP=:
++_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+ 
 -# ### BEGIN LIBTOOL CONFIG
 -_LT_LIBTOOL_CONFIG_VARS
 -_LT_LIBTOOL_TAG_VARS
 -# ### END LIBTOOL CONFIG
--
++AC_CHECK_TOOL(RANLIB, ranlib, :)
++test -z "$RANLIB" && RANLIB=:
++_LT_DECL([], [RANLIB], [1],
++    [Commands used to install an old-style archive])
+ 
+-_LT_EOF
++# 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
+-  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 "X${COLLECT_NAMES+set}" != Xset; then
+-  COLLECT_NAMES=
+-  export COLLECT_NAMES
+-fi
 -_LT_EOF
++  openbsd*)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++    ;;
++  *)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+     ;;
+   esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
++_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_CMD_OLD_ARCHIVE
+ 
+-  _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 '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+-    || (rm -f "$cfgfile"; exit 1)
++# _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
@@ -2830,44 +2929,26 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +   $RM conftest*
 +])
  
--  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 "X${COLLECT_NAMES+set}" != Xset; then
--  COLLECT_NAMES=
--  export COLLECT_NAMES
+-  _LT_PROG_XSI_SHELLFNS
 +if test x"[$]$2" = xyes; then
 +    m4_if([$5], , :, [$5])
 +else
 +    m4_if([$6], , :, [$6])
- 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 '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
--    || (rm -f "$cfgfile"; exit 1)
--
--  _LT_PROG_XSI_SHELLFNS
--
++fi
++])# _LT_COMPILER_OPTION
+ 
 -  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
 -    || (rm -f "$cfgfile"; exit 1)
--
++# Old name:
++AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+ 
 -  mv -f "$cfgfile" "$ofile" ||
 -    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
 -  chmod +x "$ofile"
 -],
 -[cat <<_LT_EOF >> "$ofile"
-+])# _LT_COMPILER_OPTION
  
 -dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
 -dnl in a comment (ie after a #).
@@ -2885,18 +2966,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -    ofile='$ofile'], [])
 -])dnl /_LT_CONFIG_SAVE_COMMANDS
 -])# _LT_CONFIG
-+# 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_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], [])
 +# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
 +#                  [ACTION-SUCCESS], [ACTION-FAILURE])
 +# ----------------------------------------------------
@@ -2935,31 +3004,21 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +fi
 +])# _LT_LINKER_OPTION
  
--# C support is built-in for now
--m4_define([_LT_LANG_C_enabled], [])
--m4_define([_LT_TAGS], [])
+-# 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], [])
 +# 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_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)],
--  [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
+-# C support is built-in for now
+-m4_define([_LT_LANG_C_enabled], [])
+-m4_define([_LT_TAGS], [])
 +# LT_CMD_MAX_LEN
 +#---------------
 +AC_DEFUN([LT_CMD_MAX_LEN],
@@ -2979,6 +3038,24 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
 +    ;;
  
+-# 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)],
+-  [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],
@@ -2988,6 +3065,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  m4_define([_LT_LANG_]$1[_enabled], [])dnl
 -  _LT_LANG_$1_CONFIG($1)])dnl
 -])# _LT_LANG
+-
 +  gnu*)
 +    # Under GNU Hurd, this test is not required because there is
 +    # no limit to the length of command line arguments.
@@ -2995,6 +3073,12 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    lt_cv_sys_max_cmd_len=-1;
 +    ;;
  
+-# _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)])])
 +  cygwin* | mingw* | cegcc*)
 +    # On Win9x/ME, this test blows up -- it succeeds, but takes
 +    # about 5 minutes as the teststring grows exponentially.
@@ -3006,21 +3090,18 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    lt_cv_sys_max_cmd_len=8192;
 +    ;;
  
--# _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)])])
 +  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;
 +    ;;
  
--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)])])
 +  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
 +    # This has been around since 386BSD, at least.  Likely further.
 +    if test -x /sbin/sysctl; then
@@ -3035,14 +3116,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
 +    ;;
  
--AC_PROVIDE_IFELSE([AC_PROG_FC],
--  [LT_LANG(FC)],
--  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-+  interix*)
-+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-+    lt_cv_sys_max_cmd_len=196608
-+    ;;
- 
 -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],
@@ -3057,7 +3130,11 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	[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)])])])])])
--
++  interix*)
++    # We know the value 262144 and hardcode it with a safety zone (like BSD)
++    lt_cv_sys_max_cmd_len=196608
++    ;;
+ 
 -AC_PROVIDE_IFELSE([LT_PROG_RC],
 -  [LT_LANG(RC)],
 -  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -3770,35 +3847,15 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
 -   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
 -fi
- 
+-
 -AC_SUBST(lt_ECHO)
 -])
 -_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
 -_LT_DECL([], [ECHO], [1],
 -    [An echo program that does not interpret backslashes])
 -])# _LT_PROG_ECHO_BACKSLASH
-+# _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 in which libtool stores uninstalled libraries.])
-+])# _LT_CHECK_OBJDIR
- 
- 
+-
+-
 -# _LT_ENABLE_LOCK
 -# ---------------
 -m4_defun([_LT_ENABLE_LOCK],
@@ -3806,15 +3863,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  [AS_HELP_STRING([--disable-libtool-lock],
 -    [avoid locking (might break parallel builds)])])
 -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+# _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 "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
  
 -# Some flags need to be propagated to the compiler or linker for good
 -# libtool support.
@@ -3831,19 +3879,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	HPUX_IA64_MODE="64"
 -	;;
 -    esac
-+  # We can hardcode non-existent directories.
-+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-+     # 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 "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; 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
+-  fi
 -  rm -rf conftest*
 -  ;;
 -*-*-irix6*)
@@ -3964,8 +4000,28 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -
 -need_locks="$enable_libtool_lock"
 -])# _LT_ENABLE_LOCK
--
--
++# _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 in which libtool stores uninstalled libraries.])
++])# _LT_CHECK_OBJDIR
+ 
+ 
 -# _LT_CMD_OLD_ARCHIVE
 -# -------------------
 -m4_defun([_LT_CMD_OLD_ARCHIVE],
@@ -3974,10 +4030,32 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -test -z "$AR_FLAGS" && AR_FLAGS=cru
 -_LT_DECL([], [AR], [1], [The archiver])
 -_LT_DECL([], [AR_FLAGS], [1])
--
++# _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 "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+ 
 -AC_CHECK_TOOL(STRIP, strip, :)
 -test -z "$STRIP" && STRIP=:
 -_LT_DECL([], [STRIP], [1], [A symbol stripping program])
++  # We can hardcode non-existent directories.
++  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
++     # 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 "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
++     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; 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.
@@ -4039,7 +4117,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
      ;;
    esac
 -  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
--fi
+ fi
 -_LT_DECL([], [old_postinstall_cmds], [2])
 -_LT_DECL([], [old_postuninstall_cmds], [2])
 -_LT_TAGDECL([], [old_archive_cmds], [2],
@@ -4089,33 +4167,22 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -    m4_if([$5], , :, [$5])
 -else
 -    m4_if([$6], , :, [$6])
- fi
+-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_DECL([], [old_striplib], [1], [Commands to strip libraries])
-+_LT_DECL([], [striplib], [1])
-+])# _LT_CMD_STRIPLIB
- 
- 
+-
+-
 -# _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
-+# _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_DECL_SED])dnl
 -AC_CACHE_CHECK([$1], [$2],
 -  [$2=no
 -   save_LDFLAGS="$LDFLAGS"
@@ -4142,93 +4209,17 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -
 -if test x"[$]$2" = xyes; then
 -    m4_if([$4], , :, [$4])
-+AC_MSG_CHECKING([dynamic linker characteristics])
-+m4_if([$1],
-+	[], [
-+if test "$GCC" = yes; then
-+  case $host_os in
-+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+    *) lt_awk_arg="/^libraries:/" ;;
-+  esac
-+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
-+    # 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 -e 's/;/ /g'`
-+  else
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+  fi
-+  # 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`
-+  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"
-+    else
-+      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; }
-+}'`
-+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
- else
+-else
 -    m4_if([$5], , :, [$5])
 -fi
 -])# _LT_LINKER_OPTION
-+  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
- 
+-
 -# Old name:
 -AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
 -dnl aclocal-1.4 backwards compatibility:
 -dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-+# 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
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
- 
+-
+-
 -# LT_CMD_MAX_LEN
 -#---------------
 -AC_DEFUN([LT_CMD_MAX_LEN],
@@ -4238,10 +4229,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
 -  i=0
 -  teststring="ABCD"
-+  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  ;;
- 
+-
 -  case $build_os in
 -  msdosdjgpp*)
 -    # On DJGPP, this test can blow up pretty badly due to problems in libc
@@ -4250,62 +4238,13 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -    # check would be larger than it should be.
 -    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
 -    ;;
-+aix[[4-9]]*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; 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
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+    # soname into executable. Probably we can add versioning support to
-+    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # 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}'
-+    else
-+      # 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'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  ;;
- 
+-
 -  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;
-+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}'
-     ;;
+-    ;;
 -
 -  cygwin* | mingw* | cegcc*)
 -    # On Win9x/ME, this test blows up -- it succeeds, but takes
@@ -4316,25 +4255,14 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -    # 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;
-+  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=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $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
-+  ;;
- 
+-    ;;
+-
 -  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;
 -    ;;
-+beos*)
-+  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
- 
+-
 -  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
 -    # This has been around since 386BSD, at least.  Likely further.
 -    if test -x /sbin/sysctl; then
@@ -4348,30 +4276,12 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -    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`
 -    ;;
-+bsdi[[45]]*)
-+  version_type=linux
-+  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
-+  ;;
- 
+-
 -  interix*)
 -    # We know the value 262144 and hardcode it with a safety zone (like BSD)
 -    lt_cv_sys_max_cmd_len=196608
 -    ;;
-+cygwin* | mingw* | pw32* | cegcc*)
-+  version_type=windows
-+  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
- 
+-
 -  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
@@ -4465,66 +4375,13 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  cat > conftest.$ac_ext <<_LT_EOF
 -[#line __oline__ "configure"
 -#include "confdefs.h"
-+  case $GCC,$host_os in
-+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-+    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
- 
+-
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+    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="/usr/lib /lib/w32api /lib /usr/local/lib"
-+      ;;
-+    mingw* | cegcc*)
-+      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-+        # It is most probably a Windows format PATH printed by
-+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+        # path with ; separators, and with drive letters. We can handle the
-+        # drive letters (cygwin fileutils understands them), so leave them,
-+        # especially as we might pass files found there to a mingw objdump,
-+        # which wouldn't understand a cygwinified path. Ahh.
-+        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
-+      ;;
-+    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
-+    ;;
- 
+-
 -#include <stdio.h>
-+  *)
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
- 
+-
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
 -#else
@@ -4534,21 +4391,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
-+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'
-+  ;;
- 
+-
 -/* 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
@@ -4570,36 +4413,20 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -#    endif
 -#  endif
 -#endif
-+dgux*)
-+  version_type=linux
-+  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
-+  ;;
- 
+-
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
- 
+-
 -  if (self)
 -    {
 -      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
-+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
+-  else
 -    puts (dlerror ());
 -
 -  return status;
@@ -4612,14 +4439,11 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -      x$lt_dlno_uscore) $1 ;;
 -      x$lt_dlneed_uscore) $2 ;;
 -      x$lt_dlunknown|x*) $3 ;;
-+    case $host_os in
-+    freebsd[[123]]*) objformat=aout ;;
-+    *) objformat=elf ;;
-     esac
+-    esac
 -  else :
 -    # compilation failed
 -    $3
-   fi
+-  fi
 -fi
 -rm -fr conftest*
 -])# _LT_TRY_DLOPEN_SELF
@@ -4637,20 +4461,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  lt_cv_dlopen=no
 -  lt_cv_dlopen_libs=
 -
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      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
+-  case $host_os in
 -  beos*)
 -    lt_cv_dlopen="load_add_on"
 -    lt_cv_dlopen_libs=
@@ -4660,17 +4471,12 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  mingw* | pw32* | cegcc*)
 -    lt_cv_dlopen="LoadLibrary"
 -    lt_cv_dlopen_libs=
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-     ;;
+-    ;;
 -
 -  cygwin*)
 -    lt_cv_dlopen="dlopen"
 -    lt_cv_dlopen_libs=
-+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-     ;;
+-    ;;
 -
 -  darwin*)
 -  # if libdl is installed we need to link against it
@@ -4680,11 +4486,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=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
-     ;;
+-    ;;
 -
 -  *)
 -    AC_CHECK_FUNC([shl_load],
@@ -4704,13 +4506,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	  ])
 -	])
 -      ])
-+  *) # from 4.6 on, and DragonFly
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-     ;;
-   esac
-+  ;;
- 
+-    ;;
+-  esac
+-
 -  if test "x$lt_cv_dlopen" != xno; then
 -    enable_dlopen=yes
 -  else
@@ -4734,16 +4532,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
 -	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
 -    ])
-+gnu*)
-+  version_type=linux
-+  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
-+  hardcode_into_libs=yes
-+  ;;
- 
+-
 -    if test "x$lt_cv_dlopen_self" = xyes; then
 -      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
 -      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
@@ -4752,85 +4541,23 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
 -	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
 -      ])
-+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 "X$HPUX_IA64_MODE" = X32; then
-+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+    else
-+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-     fi
+-    fi
 -
 -    CPPFLAGS="$save_CPPFLAGS"
 -    LDFLAGS="$save_LDFLAGS"
 -    LIBS="$save_LIBS"
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+  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'
-+  ;;
- 
+-    ;;
+-  esac
+-
 -  case $lt_cv_dlopen_self in
 -  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 -  *) enable_dlopen_self=unknown ;;
 -  esac
-+interix[[3-9]]*)
-+  version_type=linux
-+  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
-+  ;;
- 
+-
 -  case $lt_cv_dlopen_self_static in
 -  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
 -  *) enable_dlopen_self_static=unknown ;;
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
-+    *)
-+	if test "$lt_cv_prog_gnu_ld" = yes; then
-+		version_type=linux
-+	else
-+		version_type=irix
-+	fi ;;
-   esac
+-  esac
 -fi
 -_LT_DECL([dlopen_support], [enable_dlopen], [0],
 -	 [Whether dlopen is supported])
@@ -4839,63 +4566,13 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
 -	 [Whether dlopen of statically linked programs is supported])
 -])# LT_SYS_DLOPEN_SELF
-+  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
-+  ;;
- 
+-
 -# 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], [])
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+  dynamic_linker=no
-+  ;;
- 
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
-+  version_type=linux
-+  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
-+  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],
-+       [shlibpath_overrides_runpath=yes])])
-+  LDFLAGS=$save_LDFLAGS
-+  libdir=$save_libdir
- 
+-
+-
 -# _LT_COMPILER_C_O([TAGNAME])
 -# ---------------------------
 -# Check to see if options -c and -o are simultaneously supported by compiler.
@@ -4912,11 +4589,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -   cd conftest
 -   mkdir out
 -   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+  # 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
- 
+-
 -   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.
@@ -4954,21 +4627,8 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
 -	[Does compiler simultaneously support -c and -o options?])
 -])# _LT_COMPILER_C_O
-+  # Append ld.so.conf contents to the search path
-+  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+  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'
-+  ;;
- 
+-
+-
 -# _LT_COMPILER_FILE_LOCKS([TAGNAME])
 -# ----------------------------------
 -# Check to see if we can do hard links to lock some files if needed
@@ -4976,18 +4636,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -[m4_require([_LT_ENABLE_LOCK])dnl
 -m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 -_LT_COMPILER_C_O([$1])
-+netbsdelf*-gnu)
-+  version_type=linux
-+  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='NetBSD ld.elf_so'
-+  ;;
- 
+-
 -hard_links="nottested"
 -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
 -  # do not overwrite the value of need_locks provided by the user
@@ -5002,19 +4651,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  if test "$hard_links" = no; then
 -    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
 -    need_locks=warn
-+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
+-  fi
 -else
 -  need_locks=no
 -fi
@@ -5042,18 +4679,8 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
 -  [Define to the sub-directory in which libtool stores uninstalled libraries.])
 -])# _LT_CHECK_OBJDIR
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
- 
-+newsos6)
-+  version_type=linux
-+  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
-+  ;;
- 
+-
+-
 -# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
 -# --------------------------------------
 -# Check hardcoding attributes.
@@ -5063,18 +4690,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
 -   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
 -   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-+*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'
-+  ;;
- 
+-
 -  # We can hardcode non-existent directories.
 -  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
 -     # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -5084,40 +4700,17 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
 -    # Linking always hardcodes the temporary library directory.
 -    _LT_TAGVAR(hardcode_action, $1)=relink
-+openbsd*)
-+  version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
-+  need_lib_prefix=no
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-+    *)				need_version=no  ;;
-+  esac
-+  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
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case $host_os in
-+      openbsd2.[[89]] | openbsd2.[[89]].*)
-+	shlibpath_overrides_runpath=no
-+	;;
-+      *)
-+	shlibpath_overrides_runpath=yes
-+	;;
-+      esac
-   else
+-  else
 -    # We can link without hardcoding, and we can hardcode nonexisting dirs.
 -    _LT_TAGVAR(hardcode_action, $1)=immediate
-+    shlibpath_overrides_runpath=yes
-   fi
+-  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 "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
 -   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
 -  # Fast installation is not supported
@@ -5130,26 +4723,8 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -_LT_TAGDECL([], [hardcode_action], [0],
 -    [How to hardcode a shared library path into an executable])
 -])# _LT_LINKER_HARDCODE_LIBPATH
-+os2*)
-+  libname_spec='$name'
-+  shrext_cmds=".dll"
-+  need_lib_prefix=no
-+  library_names_spec='$libname${shared_ext} $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
- 
-+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"
-+  ;;
- 
+-
+-
 -# _LT_CMD_STRIPLIB
 -# ----------------
 -m4_defun([_LT_CMD_STRIPLIB],
@@ -5181,2426 +4756,1156 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
 -_LT_DECL([], [striplib], [1])
 -])# _LT_CMD_STRIPLIB
-+rdos*)
-+  dynamic_linker=no
-+  ;;
- 
-+solaris*)
-+  version_type=linux
-+  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'
-+  ;;
++_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
++_LT_DECL([], [striplib], [1])
++])# _LT_CMD_STRIPLIB
  
--# _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
--AC_MSG_CHECKING([dynamic linker characteristics])
--m4_if([$1],
--	[], [
--if test "$GCC" = yes; then
--  case $host_os in
--    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
--    *) lt_awk_arg="/^libraries:/" ;;
--  esac
--  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
--  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
--    # 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 -e 's/;/ /g'`
--  else
--    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+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 "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-   fi
--  # 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`
--  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"
--    else
--      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; }
--}'`
--  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
--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
-+  need_version=yes
-+  ;;
  
--case $host_os in
--aix3*)
-+sysv4 | sysv4.3*)
-   version_type=linux
--  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.
-+  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
+ # _LT_SYS_DYNAMIC_LINKER([TAG])
+@@ -3442,7 +2460,7 @@
    ;;
  
--aix[[4-9]]*)
--  version_type=linux
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    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=freebsd-elf
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   version_type=linux
    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 "$host_cpu" = ia64; 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
-+  if test "$with_gnu_ld" = yes; then
-+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-   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.
-+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-     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
--      ;;
-+      sco3.2v5*)
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+	;;
-     esac
--    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
--    # soname into executable. Probably we can add versioning support to
--    # collect2, so additional links can be useful in future.
--    if test "$aix_use_runtimelinking" = yes; then
--      # 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}'
--    else
--      # 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'
--    fi
--    shlibpath_var=LIBPATH
-   fi
-+  sys_lib_dlsearch_path_spec='/usr/lib'
+@@ -3482,6 +2500,18 @@
+   dynamic_linker='GNU/Linux ld.so'
    ;;
  
--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=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $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
-+tpf*)
-+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
++netbsdelf*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  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='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -4069,11 +3099,11 @@
    ;;
  
--bsdi[[45]]*)
-+uts4*)
-   version_type=linux
--  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
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   lt_cv_deplibs_check_method=pass_all
    ;;
  
--cygwin* | mingw* | pw32* | cegcc*)
--  version_type=windows
--  shrext_cmds=".dll"
--  need_version=no
--  need_lib_prefix=no
-+*)
-+  dynamic_linker=no
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+   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
+@@ -4690,7 +3720,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      linux* | k*bsd*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ 	case $cc_basename in
+ 	  KCC*)
+ 	    # KAI C++ Compiler
+@@ -4754,7 +3784,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu)
+ 	;;
+       *qnx* | *nto*)
+         # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -4974,7 +4004,7 @@
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+       ;;
+ 
+-    linux* | k*bsd*-gnu)
++    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+       case $cc_basename in
+       # old Intel for x86_64 which still supported -KPIC.
+       ecc*)
+@@ -5179,6 +4209,9 @@
+   cygwin* | mingw* | cegcc*)
+     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
++  linux* | k*bsd*-gnu)
++    _LT_TAGVAR(link_all_deplibs, $1)=no
 +  ;;
-+esac
-+AC_MSG_RESULT([$dynamic_linker])
-+test "$dynamic_linker" = no && can_build_shared=no
- 
--  case $GCC,$host_os in
--  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
--    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
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
+   *)
+     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+@@ -5243,6 +4276,9 @@
+   openbsd*)
+     with_gnu_ld=no
+     ;;
++  linux* | k*bsd*-gnu)
++    _LT_TAGVAR(link_all_deplibs, $1)=no
++    ;;
+   esac
  
--    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="/usr/lib /lib/w32api /lib /usr/local/lib"
--      ;;
--    mingw* | cegcc*)
--      # MinGW DLLs use traditional 'lib' prefix
--      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
--      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
--      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
--        # It is most probably a Windows format PATH printed by
--        # mingw gcc, but we are running on Cygwin. Gcc prints its search
--        # path with ; separators, and with drive letters. We can handle the
--        # drive letters (cygwin fileutils understands them), so leave them,
--        # especially as we might pass files found there to a mingw objdump,
--        # which wouldn't understand a cygwinified path. Ahh.
--        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
--      ;;
--    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
--    ;;
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+fi
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+fi
+   _LT_TAGVAR(ld_shlibs, $1)=yes
+@@ -5264,6 +4300,7 @@
+     fi
+     supports_anon_versioning=no
+     case `$LD -v 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 ...
+@@ -5355,7 +4392,7 @@
+       _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'
+       ;;
  
--  *)
--    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
--    ;;
--  esac
--  dynamic_linker='Win32 ld.exe'
--  # FIXME: first we should search . and the directory the executable is in
--  shlibpath_var=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([], [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], [2],
-+    [Run-time system search path for libraries])
-+])# _LT_SYS_DYNAMIC_LINKER
- 
--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'
--  ;;
+-    gnu* | linux* | tpf* | k*bsd*-gnu)
++    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+       tmp_diet=no
+       if test "$host_os" = linux-dietlibc; then
+ 	case $cc_basename in
+@@ -5425,7 +4462,7 @@
+       fi
+       ;;
  
--dgux*)
--  version_type=linux
--  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
-+# _LT_PATH_TOOL_PREFIX(TOOL)
-+# --------------------------
-+# find a file program which 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
- 
--freebsd1*)
--  dynamic_linker=no
-+*** 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 at gnu.org
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -5600,6 +4637,7 @@
+ 	if test "$aix_use_runtimelinking" = yes; then
+ 	  shared_flag="$shared_flag "'${wl}-G'
+ 	fi
++	_LT_TAGVAR(link_all_deplibs, $1)=no
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -5831,824 +4869,1447 @@
+ 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -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
++      _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
++      ;;
 +
-+_LT_EOF
-+	  fi ;;
-+	esac
++    netbsd* | netbsdelf*-gnu)
++      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
-+      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
- 
--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`
-+# 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_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_TAGVAR(hardcode_direct, $1)=yes
++      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
 +
-+# _LT_PATH_MAGIC
-+# --------------
-+# find a file program which 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
--    case $host_os in
--    freebsd[[123]]*) objformat=aout ;;
--    *) objformat=elf ;;
--    esac
-+    MAGIC_CMD=:
-   fi
--  version_type=freebsd-$objformat
--  case $version_type in
--    freebsd-elf*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
--      need_version=no
--      need_lib_prefix=no
--      ;;
--    freebsd-*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
--      need_version=yes
--      ;;
-+fi
-+])# _LT_PATH_MAGIC
++    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*)
++      ;;
 +
-+# 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
++    openbsd*)
++      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__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; 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
++	  case $host_os in
++	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	     ;;
++	   *)
++	     _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'
++	     ;;
++	  esac
++	fi
++      else
++	_LT_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
 +
-+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
-+
-+ac_prog=ld
-+if test "$GCC" = yes; 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
--  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
-+  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"
++    os2*)
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
 +      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-     ;;
--  *) # from 4.6 on, and DragonFly
--    shlibpath_overrides_runpath=yes
--    hardcode_into_libs=yes
-+  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-     ;;
-   esac
--  ;;
--
--gnu*)
--  version_type=linux
--  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
--  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 "X$HPUX_IA64_MODE" = X32; then
--      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+elif test "$with_gnu_ld" = yes; 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 "$with_gnu_ld" != no && break
-+	;;
-+      *)
-+	test "$with_gnu_ld" != yes && 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
++    osf3*)
++      if test "$GCC" = yes; 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" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${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" && $ECHO "X-set_version $verstring" | $Xsed` -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)=:
++      ;;
 +
-+# 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
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; 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}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${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" && $ECHO "X-set_version $verstring" | $Xsed` -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 "X-set_version $verstring" | $Xsed` -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)=:
++      ;;
 +
-+# _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
-+  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-     else
--      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-     fi
--    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+esac
-+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-+_LT_DECL([], [reload_cmds], [2])dnl
-+])# _LT_CMD_RELOAD
++    solaris*)
++      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
++      if test "$GCC" = yes; then
++	wlarc='${wl}'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${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 ${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 "$GCC" = yes; 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 "x$host_vendor" = xsequent; 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
++      ;;
 +
-+# _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
-+# which 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.
++    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
++      ;;
 +
-+case $host_os in
-+aix[[4-9]]*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
++    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'
++      ;;
 +
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
++    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
++      ;;
 +
-+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
-+  ;;
++    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'
 +
-+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'
-+  ;;
++      if test "$GCC" = yes; 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
+       ;;
+ 
+-    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
++    sysv5* | sco3.2v5* | sco5v6*)
++      # Note: We can NOT 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'
 +
-+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
-+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+    lt_cv_file_magic_cmd='$OBJDUMP -f'
++      if test "$GCC" = yes; 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)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++	_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
+-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    newsos6)
++    uts4*)
+       _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_libdir_flag_spec, $1)='-L$libdir'
+       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    *nto* | *qnx*)
++    *)
++      _LT_TAGVAR(ld_shlibs, $1)=no
+       ;;
++    esac
+ 
+-    openbsd*)
+-      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__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; 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
+-	  case $host_os in
+-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+-	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-	     ;;
+-	   *)
+-	     _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'
+-	     ;;
+-	  esac
+-	fi
++    if test x$host_vendor = xsni; 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 "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
 +
-+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'
-+  ;;
++_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
 +
-+darwin* | rhapsody*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
++_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])
 +
-+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.*`
++#
++# 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 "$enable_shared" = yes && test "$GCC" = yes; 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_MSG_CHECKING([whether -lc should be explicitly linked in])
++      $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_TAGVAR(archive_cmds_need_lc, $1)=no
++        else
++	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
++        fi
++        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+       else
+-	_LT_TAGVAR(ld_shlibs, $1)=no
++        cat conftest.err 1>&5
+       fi
++      $RM conftest*
++      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
+       ;;
 +    esac
-+  else
-+    lt_cv_deplibs_check_method=pass_all
 +  fi
 +  ;;
++esac
 +
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
++_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_flag_spec_ld], [1],
++    [[If ld is used when linking, 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([], [fix_srcfile_path], [1],
++    [Fix the shell variable $srcfile for the compiler])
++_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([], [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
 +
-+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*)
--    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
-+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-     ;;
-   *)
--    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'
-+    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
--  # HP-UX runs *really* slowly unless shared libraries are mode 555.
--  postinstall_cmds='chmod 555 $lib'
-   ;;
++
++# _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
++
++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
  
- interix[[3-9]]*)
--  version_type=linux
--  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
-+  # 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 $host_os in
--    nonstopux*) version_type=nonstopux ;;
--    *)
--	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
--	else
--		version_type=irix
--	fi ;;
-+  case $LD in
-+  *-32|*"-32 ") libmagic=32-bit;;
-+  *-n32|*"-n32 ") libmagic=N32;;
-+  *-64|*"-64 ") libmagic=64-bit;;
-+  *) libmagic=never-match;;
-   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
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
- # This must be Linux ELF.
- linux* | k*bsd*-gnu)
--  version_type=linux
--  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
--  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],
--       [shlibpath_overrides_runpath=yes])])
--  LDFLAGS=$save_LDFLAGS
--  libdir=$save_libdir
--
--  # 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
--
--  # Append ld.so.conf contents to the search path
--  if test -f /etc/ld.so.conf; then
--    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
--  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'
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
+-    os2*)
+-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+-      ;;
++  # Report which library types will actually be built
++  AC_MSG_CHECKING([if libtool supports shared libraries])
++  AC_MSG_RESULT([$can_build_shared])
  
--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'
-+netbsd* | netbsdelf*-gnu)
-+  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
--    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'
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-   fi
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  hardcode_into_libs=yes
-   ;;
+-    osf3*)
+-      if test "$GCC" = yes; 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" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${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" && $ECHO "X-set_version $verstring" | $Xsed` -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)=:
+-      ;;
++  AC_MSG_CHECKING([whether to build shared libraries])
++  test "$can_build_shared" = "no" && enable_shared=no
  
--newsos6)
--  version_type=linux
--  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
-+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
-   ;;
+-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+-      if test "$GCC" = yes; 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}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${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" && $ECHO "X-set_version $verstring" | $Xsed` -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 "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
++  # On AIX, shared libraries and static libraries use the same namespace, and
++  # are all built from PIC.
++  case $host_os in
++  aix3*)
++    test "$enable_shared" = yes && enable_static=no
++    if test -n "$RANLIB"; then
++      archive_cmds="$archive_cmds~\$RANLIB \$lib"
++      postinstall_cmds='$RANLIB $lib'
++    fi
++    ;;
  
- *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'
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
+-	# 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)=:
+-      ;;
++  aix[[4-9]]*)
++    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++      test "$enable_shared" = yes && enable_static=no
++    fi
++    ;;
++  esac
++  AC_MSG_RESULT([$enable_shared])
  
- openbsd*)
--  version_type=sunos
--  sys_lib_dlsearch_path_spec="/usr/lib"
--  need_lib_prefix=no
--  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
--  case $host_os in
--    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
--    *)				need_version=no  ;;
--  esac
--  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
-   if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    case $host_os in
--      openbsd2.[[89]] | openbsd2.[[89]].*)
--	shlibpath_overrides_runpath=no
--	;;
+-    solaris*)
+-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+-      if test "$GCC" = yes; then
+-	wlarc='${wl}'
+-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${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 ${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]].*) ;;
 -      *)
--	shlibpath_overrides_runpath=yes
+-	# 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 "$GCC" = yes; 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_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-   else
--    shlibpath_overrides_runpath=yes
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-   fi
-   ;;
- 
--os2*)
--  libname_spec='$name'
--  shrext_cmds=".dll"
--  need_lib_prefix=no
--  library_names_spec='$libname${shared_ext} $libname.a'
--  dynamic_linker='OS/2 ld.exe'
--  shlibpath_var=LIBPATH
--  ;;
--
- 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"
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
- rdos*)
--  dynamic_linker=no
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
- solaris*)
--  version_type=linux
--  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'
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--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 "$with_gnu_ld" = yes; then
--    need_lib_prefix=no
--  fi
--  need_version=yes
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
- sysv4 | sysv4.3*)
--  version_type=linux
--  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
+-      _LT_TAGVAR(link_all_deplibs, $1)=yes
 -      ;;
--    motorola)
--      need_lib_prefix=no
--      need_version=no
--      shlibpath_overrides_runpath=no
--      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++  AC_MSG_CHECKING([whether to build static libraries])
++  # Make sure either enable_shared or enable_static is yes.
++  test "$enable_shared" = yes || enable_static=yes
++  AC_MSG_RESULT([$enable_static])
+ 
+-    sunos4*)
+-      if test "x$host_vendor" = xsequent; 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
 -      ;;
-+  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
-   ;;
++  _LT_CONFIG($1)
++fi
++AC_LANG_POP
++CC="$lt_save_CC"
++])# _LT_LANG_C_CONFIG
  
--sysv4*MP*)
--  if test -d /usr/nec ;then
--    version_type=linux
--    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=freebsd-elf
--  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 "$with_gnu_ld" = yes; 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"
+-    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???
 -	;;
--    esac
--  fi
--  sys_lib_dlsearch_path_spec='/usr/lib'
--  ;;
--
- tpf*)
--  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
--  version_type=linux
--  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
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
-+esac
-+])
-+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
- 
--uts4*)
--  version_type=linux
--  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
--  ;;
-+_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_CHECK_MAGIC_METHOD
- 
--*)
--  dynamic_linker=no
--  ;;
--esac
--AC_MSG_RESULT([$dynamic_linker])
--test "$dynamic_linker" = no && can_build_shared=no
+-	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
+-      ;;
  
--variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
--if test "$GCC" = yes; then
--  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+# 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
-+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-+	*/dev/null* | *'Invalid file or object type'*)
-+	  lt_cv_path_NM="$tmp_nm -B"
-+	  break
-+	  ;;
-+	*)
-+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-+	  */dev/null*)
-+	    lt_cv_path_NM="$tmp_nm -p"
-+	    break
-+	    ;;
-+	  *)
-+	    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 "$lt_cv_path_NM" != "no"; then
-+  NM="$lt_cv_path_NM"
+-    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'
+-      ;;
++# _LT_PROG_CXX
++# ------------
++# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
++# compiler, we have our own version here.
++m4_defun([_LT_PROG_CXX],
++[
++pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
++AC_PROG_CXX
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  AC_PROG_CXXCPP
 +else
-+  # Didn't find any BSD compatible name lister, look for dumpbin.
-+  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
-+  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
++  _lt_caught_CXX_error=yes
++fi
++popdef([AC_MSG_ERROR])
++])# _LT_PROG_CXX
  
--if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
--  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
--fi
--if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
--  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
--fi
-+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:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-+  (eval "$ac_compile" 2>conftest.err)
-+  cat conftest.err >&AS_MESSAGE_LOG_FD
-+  (eval echo "\"\$as_me:__oline__: $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:__oline__: 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
- 
--_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([], [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], [2],
--    [Run-time system search path for libraries])
--])# _LT_SYS_DYNAMIC_LINKER
-+# Old names:
-+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+-    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
+-      ;;
 +dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_PROG_NM], [])
-+dnl AC_DEFUN([AC_PROG_NM], [])
++dnl AC_DEFUN([_LT_PROG_CXX], [])
  
+-    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'
  
--# _LT_PATH_TOOL_PREFIX(TOOL)
--# --------------------------
--# find a file program which 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_LIB_M
-+# --------
-+# check for math library
-+AC_DEFUN([LT_LIB_M],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+LIBM=
-+case $host in
-+*-*-beos* | *-*-cygwin* | *-*-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")
-   ;;
- *)
--  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 at gnu.org
--
--_LT_EOF
--	  fi ;;
--	esac
+-      if test "$GCC" = yes; 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
--      break
--    fi
--  done
--  IFS="$lt_save_ifs"
--  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  AC_CHECK_LIB(m, cos, LIBM="-lm")
-   ;;
--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
-+esac
-+AC_SUBST([LIBM])
-+])# LT_LIB_M
- 
- # Old name:
--AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
- dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+-      ;;
++# _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],
++[AC_REQUIRE([_LT_PROG_CXX])dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_EGREP])dnl
  
+-    sysv5* | sco3.2v5* | sco5v6*)
+-      # Note: We can NOT 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'
++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_flag_spec_ld, $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(no_undefined_flag, $1)=
++_LT_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
  
--# _LT_PATH_MAGIC
--# --------------
--# find a file program which 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
-+# _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 "$GCC" = yes; 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
+-      ;;
++# Source file extension for C++ test sources.
++ac_ext=cpp
 +
-+if test "$GCC" = yes; then
-+  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++# Object file extension for compiled C++ test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
 +
-+  _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_PATH_MAGIC
-+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-+	[Compiler flag to turn off builtin functions])
-+])# _LT_COMPILER_NO_RTTI
- 
++# 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 "$_lt_caught_CXX_error" != yes; then
++  # Code to be used in simple compile tests
++  lt_simple_compile_test_code="int some_variable = 0;"
  
--# 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
-+# _LT_CMD_GLOBAL_SYMBOLS
-+# ----------------------
-+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_PROG_CC])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
+-    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
+-      ;;
++  # Code to be used in simple link tests
++  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
  
--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
--
--ac_prog=ld
--if test "$GCC" = yes; 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"
+-    *)
+-      _LT_TAGVAR(ld_shlibs, $1)=no
 -      ;;
--  "")
--    # If it fails, then pretend we aren't using GCC.
--    ac_prog=ld
--    ;;
--  *)
--    # If it is relative, then search for the first ld in PATH.
--    with_gnu_ld=unknown
--    ;;
--  esac
--elif test "$with_gnu_ld" = yes; then
--  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 "$with_gnu_ld" != no && break
--	;;
--      *)
--	test "$with_gnu_ld" != yes && break
+-    esac
++  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
++  _LT_TAG_COMPILER
+ 
+-    if test x$host_vendor = xsni; then
+-      case $host in
+-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
 -	;;
 -      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
-+# 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?!! ;)]
- 
--# 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], [])
-+# 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]]*\)'
- 
--# _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
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[[BCDT]]'
-   ;;
--*)
--  lt_cv_prog_gnu_ld=no
-+cygwin* | mingw* | pw32* | cegcc*)
-+  symcode='[[ABCDGISTW]]'
-+  ;;
-+hpux*)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[[ABCDEGRST]]'
++  # 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_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
+-])
+-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++  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
-+  ;;
-+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])
--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
--  darwin*)
--    if test "$GCC" = yes; 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_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
--_LT_DECL([], [reload_cmds], [2])dnl
--])# _LT_CMD_RELOAD
- 
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
-+  symcode='[[ABCDGIRSTW]]' ;;
-+esac
- 
--# _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
--# which 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.
-+# 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 -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- 
--case $host_os in
--aix[[4-9]]*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
- 
--beos*)
--  lt_cv_deplibs_check_method=pass_all
-+# 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
++  test -z "${LDCXX+set}" || LD=$LDCXX
++  CC=${CXX-"c++"}
++  compiler=$CC
++  _LT_TAGVAR(compiler, $1)=$CC
++  _LT_CC_BASENAME([$compiler])
  
--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
--  ;;
-+# Try without a prefix underscore, then with it.
-+for ac_symprfx in "" "_"; do
+-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
++  if test -n "$compiler"; then
++    # We don't want -fno-exception when compiling C++ code, so set the
++    # no_builtin_flag separately
++    if test "$GXX" = yes; then
++      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++    else
++      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
++    fi
  
--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'
--  ;;
-+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+  symxfrm="\\1 $ac_symprfx\\2 \\2"
- 
--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'
-+  # 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
-+    # and D for any global 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};"\
-+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-+"     \$ 0!~/External *\|/{next};"\
-+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-+"     {if(hide[section]) next};"\
-+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-+"     ' prfx=^$ac_symprfx]"
-   else
--    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
--    lt_cv_file_magic_cmd='$OBJDUMP -f'
-+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-   fi
--  ;;
+-_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])
++    if test "$GXX" = yes; then
++      # Set up default GNU C++ configuration
  
--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'
--  ;;
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
+-#
+-# 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
++      LT_PATH_LD
  
--darwin* | rhapsody*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
-+  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 test "$enable_shared" = yes && test "$GCC" = yes; 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_MSG_CHECKING([whether -lc should be explicitly linked in])
+-      $RM conftest*
+-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++      # 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 "$with_gnu_ld" = yes; then
++        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  
--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.*`
+-      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_TAGVAR(archive_cmds_need_lc, $1)=no
++        _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(archive_cmds_need_lc, $1)=yes
++          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+         fi
+-        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+       else
+-        cat conftest.err 1>&5
++        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
+-      $RM conftest*
+-      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
 -      ;;
 -    esac
--  else
--    lt_cv_deplibs_check_method=pass_all
 -  fi
 -  ;;
-+  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
- 
--gnu*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
-+      # 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
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
--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]) 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
--  ;;
-+_LT_EOF
-+	  # Now generate the symbol file.
-+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
- 
--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)$'
--  ;;
-+	  cat <<_LT_EOF >> conftest.$ac_ext
- 
--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
--  ;;
-+/* The mapping between symbol names and symbols.  */
-+const struct {
-+  const char *name;
-+  void       *address;
-+}
-+lt__PROGRAM__LTX_preloaded_symbols[[]] =
-+{
-+  { "@PROGRAM@", (void *) 0 },
-+_LT_EOF
-+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-+	  cat <<\_LT_EOF >> conftest.$ac_ext
-+  {0, (void *) 0}
-+};
- 
--# This must be Linux ELF.
--linux* | k*bsd*-gnu)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
-+/* This works around a problem in FreeBSD linker */
-+#ifdef FREEBSD_WORKAROUND
-+static const void *lt_preloaded_setup() {
-+  return lt__PROGRAM__LTX_preloaded_symbols;
-+}
-+#endif
+-esac
  
--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)$'
-+#ifdef __cplusplus
-+}
-+#endif
-+_LT_EOF
-+	  # Now try linking the two files.
-+	  mv conftest.$ac_objext conftstm.$ac_objext
-+	  lt_save_LIBS="$LIBS"
-+	  lt_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_save_LIBS"
-+	  CFLAGS="$lt_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
+-_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_flag_spec_ld], [1],
+-    [[If ld is used when linking, 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([], [fix_srcfile_path], [1],
+-    [Fix the shell variable $srcfile for the compiler])
+-_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([], [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
++      # 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 "\-L"'
++
 +    else
-+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
++      GXX=no
++      with_gnu_ld=no
++      wlarc=
 +    fi
-   else
--    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-+    cat conftest.$ac_ext >&5
-   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
--  ;;
-+  rm -rf conftest* conftst*
- 
--openbsd*)
--  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-   else
--    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-+    lt_cv_sys_global_symbol_pipe=
-   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
--  ;;
-+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
- 
--sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
-+_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_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_CMD_GLOBAL_SYMBOLS
- 
--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
--  ;;
--esac
--])
--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_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)=
- 
--_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_CHECK_MAGIC_METHOD
-+AC_MSG_CHECKING([for $compiler option to produce PIC])
-+m4_if([$1], [CXX], [
-+  # C++ specific cases for pic, static, wl, etc.
-+  if test "$GXX" = yes; then
-+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
- 
--
--# 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
--	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
--	*/dev/null* | *'Invalid file or object type'*)
--	  lt_cv_path_NM="$tmp_nm -B"
--	  break
--	  ;;
--	*)
--	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
--	  */dev/null*)
--	    lt_cv_path_NM="$tmp_nm -p"
--	    break
--	    ;;
--	  *)
--	    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 "$lt_cv_path_NM" != "no"; then
--  NM="$lt_cv_path_NM"
--else
--  # Didn't find any BSD compatible name lister, look for dumpbin.
--  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
--  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:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
--  (eval "$ac_compile" 2>conftest.err)
--  cat conftest.err >&AS_MESSAGE_LOG_FD
--  (eval echo "\"\$as_me:__oline__: $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:__oline__: 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_LIB_M
--# --------
--# check for math library
--AC_DEFUN([LT_LIB_M],
--[AC_REQUIRE([AC_CANONICAL_HOST])dnl
--LIBM=
--case $host in
--*-*-beos* | *-*-cygwin* | *-*-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 "$GCC" = yes; then
--  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
--
--  _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([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 "$host_cpu" = ia64; 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
--
--# 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 -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$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 -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
--lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/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
--    # and D for any global 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};"\
--"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
--"     \$ 0!~/External *\|/{next};"\
--"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
--"     {if(hide[section]) next};"\
--"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
--"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
--"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
--"     s[1]~prfx {split(s[1],t,\"@\"); print 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
--
--  # 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
--#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.  */
--const struct {
--  const char *name;
--  void       *address;
--}
--lt__PROGRAM__LTX_preloaded_symbols[[]] =
--{
--  { "@PROGRAM@", (void *) 0 },
--_LT_EOF
--	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$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_save_LIBS="$LIBS"
--	  lt_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_save_LIBS"
--	  CFLAGS="$lt_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 "$pipe_works" = yes; 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
--
--_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_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_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)=
--
--AC_MSG_CHECKING([for $compiler option to produce PIC])
--m4_if([$1], [CXX], [
--  # C++ specific cases for pic, static, wl, etc.
--  if test "$GXX" = yes; 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 "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      fi
--      ;;
-+    case $host_os in
-+    aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
- 
-     amigaos*)
-       case $host_cpu in
-@@ -4669,7 +3784,7 @@
- 	    ;;
- 	esac
- 	;;
--      netbsd*)
-+      netbsd* | netbsdelf*-gnu)
- 	;;
-       *qnx* | *nto*)
-         # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -5094,6 +4209,9 @@
-   cygwin* | mingw* | cegcc*)
-     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-+  linux* | k*bsd*-gnu)
-+    _LT_TAGVAR(link_all_deplibs, $1)=no
-+  ;;
-   *)
-     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-@@ -5158,6 +4276,9 @@
-   openbsd*)
-     with_gnu_ld=no
-     ;;
-+  linux* | k*bsd*-gnu)
-+    _LT_TAGVAR(link_all_deplibs, $1)=no
-+    ;;
-   esac
- 
-   _LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -5340,7 +4461,7 @@
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -5515,6 +4636,7 @@
- 	if test "$aix_use_runtimelinking" = yes; then
- 	  shared_flag="$shared_flag "'${wl}-G'
- 	fi
-+	_LT_TAGVAR(link_all_deplibs, $1)=no
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -5753,7 +4875,7 @@
-       _LT_TAGVAR(link_all_deplibs, $1)=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       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
-@@ -6137,543 +5259,867 @@
- ])# _LT_LINKER_SHLIBS
++
++    # 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 "$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
++          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
++          # need to do runtime linking.
++          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
++	    ;;
++          esac
  
++          exp_sym_flag='-bexport'
++          no_entry_flag='-bnoentry'
++        fi
  
 -# _LT_LANG_C_CONFIG([TAG])
 -# ------------------------
@@ -7611,428 +5916,83 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -[m4_require([_LT_DECL_EGREP])dnl
 -lt_save_CC="$CC"
 -AC_LANG_PUSH(C)
-+# _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
-+
-+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 which 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 "$can_build_shared" = "no" && 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 "$enable_shared" = yes && enable_static=no
-+    if test -n "$RANLIB"; then
-+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+      postinstall_cmds='$RANLIB $lib'
-+    fi
-+    ;;
-+
-+  aix[[4-9]]*)
-+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+      test "$enable_shared" = yes && enable_static=no
-+    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 "$enable_shared" = yes || enable_static=yes
-+  AC_MSG_RESULT([$enable_static])
-+
-+  _LT_CONFIG($1)
-+fi
-+AC_LANG_POP
-+CC="$lt_save_CC"
-+])# _LT_LANG_C_CONFIG
-+
-+
-+# _LT_PROG_CXX
-+# ------------
-+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-+# compiler, we have our own version here.
-+m4_defun([_LT_PROG_CXX],
-+[
-+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-+AC_PROG_CXX
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  AC_PROG_CXXCPP
-+else
-+  _lt_caught_CXX_error=yes
-+fi
-+popdef([AC_MSG_ERROR])
-+])# _LT_PROG_CXX
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([_LT_PROG_CXX], [])
-+
-+
-+# _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],
-+[AC_REQUIRE([_LT_PROG_CXX])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+
-+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_flag_spec_ld, $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(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 "$_lt_caught_CXX_error" != yes; 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_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++"}
-+  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 "$GXX" = yes; 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 "$GXX" = yes; then
-+      # Set up default GNU C++ configuration
-+
-+      LT_PATH_LD
++        # 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.
  
 -# Source file extension for C test sources.
 -ac_ext=c
-+      # 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 "$with_gnu_ld" = yes; then
-+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -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(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,'
  
 -# Object file extension for compiled C test sources.
 -objext=o
 -_LT_TAGVAR(objext, $1)=$objext
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++        if test "$GXX" = yes; 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 "$aix_use_runtimelinking" = yes; then
++	    shared_flag="$shared_flag "'${wl}-G'
++	  fi
++        else
++          # not using gcc
++          if test "$host_cpu" = ia64; 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 "$aix_use_runtimelinking" = yes; then
++	      shared_flag='${wl}-G'
++	    else
++	      shared_flag='${wl}-bM:SRE'
++	    fi
++          fi
++        fi
  
 -# Code to be used in simple compile tests
 -lt_simple_compile_test_code="int some_variable = 0;"
-+        # 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}'
++        _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_use_runtimelinking" = yes; 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
++          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
 -# Code to be used in simple link tests
 -lt_simple_link_test_code='int main(){return(0);}'
-+        # 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=
- 
--_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
-+        # 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
- 
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
-+      # 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 "\-L"'
- 
--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
-+    else
-+      GXX=no
-+      with_gnu_ld=no
-+      wlarc=
-+    fi
- 
--  # Report which library types will actually be built
--  AC_MSG_CHECKING([if libtool supports shared libraries])
--  AC_MSG_RESULT([$can_build_shared])
-+    # 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 "$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
-+          exp_sym_flag='-Bexport'
-+          no_entry_flag=""
-+        else
-+          aix_use_runtimelinking=no
- 
--  AC_MSG_CHECKING([whether to build shared libraries])
--  test "$can_build_shared" = "no" && enable_shared=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
-+	      case $ld_flag in
-+	      *-brtl*)
-+	        aix_use_runtimelinking=yes
-+	        break
-+	        ;;
-+	      esac
-+	    done
-+	    ;;
-+          esac
- 
--  # On AIX, shared libraries and static libraries use the same namespace, and
--  # are all built from PIC.
--  case $host_os in
--  aix3*)
--    test "$enable_shared" = yes && enable_static=no
--    if test -n "$RANLIB"; then
--      archive_cmds="$archive_cmds~\$RANLIB \$lib"
--      postinstall_cmds='$RANLIB $lib'
--    fi
--    ;;
-+          exp_sym_flag='-bexport'
-+          no_entry_flag='-bnoentry'
-+        fi
- 
--  aix[[4-9]]*)
--    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--      test "$enable_shared" = yes && enable_static=no
--    fi
--    ;;
--  esac
--  AC_MSG_RESULT([$enable_shared])
-+        # 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.
- 
--  AC_MSG_CHECKING([whether to build static libraries])
--  # Make sure either enable_shared or enable_static is yes.
--  test "$enable_shared" = yes || enable_static=yes
--  AC_MSG_RESULT([$enable_static])
-+        _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,'
- 
--  _LT_CONFIG($1)
--fi
--AC_LANG_POP
--CC="$lt_save_CC"
--])# _LT_LANG_C_CONFIG
-+        if test "$GXX" = yes; 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 "$aix_use_runtimelinking" = yes; then
-+	    shared_flag="$shared_flag "'${wl}-G'
-+	  fi
-+        else
-+          # not using gcc
-+          if test "$host_cpu" = ia64; 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 "$aix_use_runtimelinking" = yes; then
-+	      shared_flag='${wl}-G'
-+	    else
-+	      shared_flag='${wl}-bM:SRE'
-+	    fi
-+          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_use_runtimelinking" = yes; 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
-+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- 
--# _LT_PROG_CXX
--# ------------
--# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
--# compiler, we have our own version here.
--m4_defun([_LT_PROG_CXX],
--[
--pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
--AC_PROG_CXX
--if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
--    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
--    (test "X$CXX" != "Xg++"))) ; then
--  AC_PROG_CXXCPP
--else
--  _lt_caught_CXX_error=yes
--fi
--popdef([AC_MSG_ERROR])
--])# _LT_PROG_CXX
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 +        else
 +          if test "$host_cpu" = ia64; then
 +	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -8057,8 +6017,10 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +        fi
 +        ;;
  
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([_LT_PROG_CXX], [])
+-_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
 +      beos*)
 +	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 +	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -8070,6 +6032,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	fi
 +	;;
  
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
 +      chorus*)
 +        case $cc_basename in
 +          *)
@@ -8079,15 +6044,16 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +        esac
 +        ;;
  
--# _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],
--[AC_REQUIRE([_LT_PROG_CXX])dnl
--m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--m4_require([_LT_DECL_EGREP])dnl
+-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
 +      cygwin* | mingw* | pw32* | cegcc*)
 +        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
 +        # as there is no search path for DLLs.
@@ -8096,29 +6062,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +        _LT_TAGVAR(always_export_symbols, $1)=no
 +        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
  
--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_flag_spec_ld, $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(no_undefined_flag, $1)=
--_LT_TAGVAR(whole_archive_flag_spec, $1)=
--_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+-  # Report which library types will actually be built
+-  AC_MSG_CHECKING([if libtool supports shared libraries])
+-  AC_MSG_RESULT([$can_build_shared])
 +        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 (1st line
@@ -8138,8 +6084,8 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +        _LT_DARWIN_LINKER_FEATURES($1)
 +	;;
  
--# Source file extension for C++ test sources.
--ac_ext=cpp
+-  AC_MSG_CHECKING([whether to build shared libraries])
+-  test "$can_build_shared" = "no" && enable_shared=no
 +      dgux*)
 +        case $cc_basename in
 +          ec++*)
@@ -8158,42 +6104,35 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +        esac
 +        ;;
  
--# Object file extension for compiled C++ test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
+-  # On AIX, shared libraries and static libraries use the same namespace, and
+-  # are all built from PIC.
+-  case $host_os in
+-  aix3*)
+-    test "$enable_shared" = yes && enable_static=no
+-    if test -n "$RANLIB"; then
+-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+-      postinstall_cmds='$RANLIB $lib'
+-    fi
+-    ;;
 +      freebsd[[12]]*)
 +        # C++ shared libraries reported to be fairly broken before
 +	# switch to ELF
 +        _LT_TAGVAR(ld_shlibs, $1)=no
 +        ;;
- 
--# 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 "$_lt_caught_CXX_error" != yes; then
--  # Code to be used in simple compile tests
--  lt_simple_compile_test_code="int some_variable = 0;"
++
 +      freebsd-elf*)
 +        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +        ;;
- 
--  # Code to be used in simple link tests
--  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
++
 +      freebsd* | dragonfly*)
 +        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
 +        # conventions
 +        _LT_TAGVAR(ld_shlibs, $1)=yes
 +        ;;
- 
--  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
--  _LT_TAG_COMPILER
++
 +      gnu*)
 +        ;;
- 
--  # save warnings/boilerplate of simple test code
--  _LT_COMPILER_BOILERPLATE
--  _LT_LINKER_BOILERPLATE
++
 +      hpux9*)
 +        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 +        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -8202,29 +6141,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
 +				             # but as the default
 +				             # location of the library.
- 
--  # Allow CC to be a program name with arguments.
--  lt_save_CC=$CC
--  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++"}
--  compiler=$CC
--  _LT_TAGVAR(compiler, $1)=$CC
--  _LT_CC_BASENAME([$compiler])
++
 +        case $cc_basename in
 +          CC*)
 +            # FIXME: insert proper C++ library support
@@ -8253,21 +6170,22 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +        esac
 +        ;;
  
--  if test -n "$compiler"; then
--    # We don't want -fno-exception when compiling C++ code, so set the
--    # no_builtin_flag separately
--    if test "$GXX" = yes; then
--      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
--    else
--      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+-  aix[[4-9]]*)
+-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-      test "$enable_shared" = yes && enable_static=no
 -    fi
+-    ;;
+-  esac
+-  AC_MSG_RESULT([$enable_shared])
 +      hpux10*|hpux11*)
 +        if test $with_gnu_ld = no; then
 +	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 +	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
  
--    if test "$GXX" = yes; then
--      # Set up default GNU C++ configuration
+-  AC_MSG_CHECKING([whether to build static libraries])
+-  # Make sure either enable_shared or enable_static is yes.
+-  test "$enable_shared" = yes || enable_static=yes
+-  AC_MSG_RESULT([$enable_static])
 +          case $host_cpu in
 +            hppa*64*|ia64*)
 +              ;;
@@ -8290,7 +6208,11 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +            ;;
 +        esac
  
--      LT_PATH_LD
+-  _LT_CONFIG($1)
+-fi
+-AC_LANG_POP
+-CC="$lt_save_CC"
+-])# _LT_LANG_C_CONFIG
 +        case $cc_basename in
 +          CC*)
 +	    # FIXME: insert proper C++ library support
@@ -8341,11 +6263,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +        esac
 +        ;;
  
--      # 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 "$with_gnu_ld" = yes; then
--        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      interix[[3-9]]*)
 +	_LT_TAGVAR(hardcode_direct, $1)=no
 +	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -8366,6 +6283,23 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	    # SGI C++
 +	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
  
+-# _LT_PROG_CXX
+-# ------------
+-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
+-# compiler, we have our own version here.
+-m4_defun([_LT_PROG_CXX],
+-[
+-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
+-AC_PROG_CXX
+-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+-    (test "X$CXX" != "Xg++"))) ; then
+-  AC_PROG_CXXCPP
+-else
+-  _lt_caught_CXX_error=yes
+-fi
+-popdef([AC_MSG_ERROR])
+-])# _LT_PROG_CXX
 +	    # 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
@@ -8383,50 +6317,18 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	    _LT_TAGVAR(link_all_deplibs, $1)=yes
 +	    ;;
 +        esac
-         _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
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 +        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +        _LT_TAGVAR(inherit_rpath, $1)=yes
 +        ;;
  
--      # 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 "\-L"'
-+      linux* | k*bsd*-gnu)
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([_LT_PROG_CXX], [])
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 +        case $cc_basename in
 +          KCC*)
 +	    # Kuck and Associates, Inc. (KAI) C++ Compiler
  
--    else
--      GXX=no
--      with_gnu_ld=no
--      wlarc=
--    fi
 +	    # 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.
@@ -8442,53 +6344,45 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	    # 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; $ECHO "X$list" | $Xsed'
  
--    # 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 "$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
--          exp_sym_flag='-Bexport'
--          no_entry_flag=""
--        else
--          aix_use_runtimelinking=no
+-# _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],
+-[AC_REQUIRE([_LT_PROG_CXX])dnl
+-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+-m4_require([_LT_DECL_EGREP])dnl
 +	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 +	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
  
--          # 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
--	      case $ld_flag in
--	      *-brtl*)
--	        aix_use_runtimelinking=yes
--	        break
--	        ;;
--	      esac
--	    done
+-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_flag_spec_ld, $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(no_undefined_flag, $1)=
+-_LT_TAGVAR(whole_archive_flag_spec, $1)=
+-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
 +	    # 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'
- 	    ;;
--          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.
++	    ;;
 +	  icpc* | ecpc* )
 +	    # Intel C++
 +	    with_gnu_ld=yes
@@ -8542,12 +6436,8 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	      ;;
 +	    esac
  
--        _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,'
+-# Source file extension for C++ test sources.
+-ac_ext=cpp
 +	    _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; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
@@ -8557,62 +6447,20 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	    _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'
  
--        if test "$GXX" = yes; 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 "$aix_use_runtimelinking" = yes; then
--	    shared_flag="$shared_flag "'${wl}-G'
--	  fi
--        else
--          # not using gcc
--          if test "$host_cpu" = ia64; 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 "$aix_use_runtimelinking" = yes; then
--	      shared_flag='${wl}-G'
--	    else
--	      shared_flag='${wl}-bM:SRE'
--	    fi
--          fi
--        fi
+-# Object file extension for compiled C++ test sources.
+-objext=o
+-_LT_TAGVAR(objext, $1)=$objext
 +	    runpath_var=LD_RUN_PATH
 +	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 +	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
  
--        _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_use_runtimelinking" = yes; 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
--          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-# 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 "$_lt_caught_CXX_error" != yes; then
+-  # Code to be used in simple compile tests
+-  lt_simple_compile_test_code="int some_variable = 0;"
 +	    # Commands to make compiler produce verbose output that lists
 +	    # what "hidden" libraries, object files and flags are used when
 +	    # linking a shared library.
@@ -8646,44 +6494,15 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	      _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; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 +	      _LT_TAGVAR(compiler_needs_object, $1)=yes
  
--          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
--        else
--          if test "$host_cpu" = ia64; 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
--	    _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'
--	    # Exported symbols can be pulled into shared objects from archives
--	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
--	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
--	    # This is similar to how AIX traditionally builds its shared
--	    # libraries.
--	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
--          fi
--        fi
--        ;;
+-  # Code to be used in simple link tests
+-  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
 +	      # Not sure whether something based on
 +	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
 +	      # would be better.
 +	      output_verbose_link_cmd='echo'
  
--      beos*)
--	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
--	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--	  # Joseph Beckenbach <jrb3 at 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
+-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-  _LT_TAG_COMPILER
 +	      # 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
@@ -8693,83 +6512,66 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	    esac
 +	    ;;
 +	esac
- 	;;
++	;;
  
--      chorus*)
--        case $cc_basename in
--          *)
--	  # FIXME: insert proper C++ library support
--	  _LT_TAGVAR(ld_shlibs, $1)=no
--	  ;;
--        esac
--        ;;
--
--      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(allow_undefined_flag, $1)=unsupported
--        _LT_TAGVAR(always_export_symbols, $1)=no
--        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-  # save warnings/boilerplate of simple test code
+-  _LT_COMPILER_BOILERPLATE
+-  _LT_LINKER_BOILERPLATE
 +      lynxos*)
 +        # FIXME: insert proper C++ library support
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +	;;
  
--        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 (1st line
--          # is EXPORTS), use it as is; otherwise, prepend...
--          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; 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
--        ;;
--      darwin* | rhapsody*)
--        _LT_DARWIN_LINKER_FEATURES($1)
+-  # Allow CC to be a program name with arguments.
+-  lt_save_CC=$CC
+-  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++"}
+-  compiler=$CC
+-  _LT_TAGVAR(compiler, $1)=$CC
+-  _LT_CC_BASENAME([$compiler])
 +      m88k*)
 +        # FIXME: insert proper C++ library support
 +        _LT_TAGVAR(ld_shlibs, $1)=no
- 	;;
++	;;
  
--      dgux*)
+-  if test -n "$compiler"; then
+-    # We don't want -fno-exception when compiling C++ code, so set the
+-    # no_builtin_flag separately
+-    if test "$GXX" = yes; then
+-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+-    else
+-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+-    fi
 +      mvs*)
-         case $cc_basename in
--          ec++*)
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--          ghcx*)
--	    # Green Hills C++ Compiler
++        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
++	    ;;
 +	  *)
- 	    # FIXME: insert proper C++ library support
- 	    _LT_TAGVAR(ld_shlibs, $1)=no
- 	    ;;
--        esac
--        ;;
--
--      freebsd[[12]]*)
--        # C++ shared libraries reported to be fairly broken before
--	# switch to ELF
--        _LT_TAGVAR(ld_shlibs, $1)=no
--        ;;
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	    ;;
 +	esac
 +	;;
  
--      freebsd-elf*)
--        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
--        ;;
+-    if test "$GXX" = yes; then
+-      # Set up default GNU C++ configuration
 +      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'
@@ -8782,84 +6584,23 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
 +	;;
  
--      freebsd* | dragonfly*)
--        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
--        # conventions
+-      LT_PATH_LD
 +      *nto* | *qnx*)
-         _LT_TAGVAR(ld_shlibs, $1)=yes
--        ;;
--
--      gnu*)
--        ;;
--
--      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 $output_objdir/$soname = $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; $ECHO "X$list" | $Xsed'
--            ;;
--          *)
--            if test "$GXX" = yes; then
--              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--            else
--              # FIXME: insert proper C++ library support
--              _LT_TAGVAR(ld_shlibs, $1)=no
--            fi
--            ;;
--        esac
--        ;;
++        _LT_TAGVAR(ld_shlibs, $1)=yes
 +	;;
  
--      hpux10*|hpux11*)
--        if test $with_gnu_ld = no; then
--	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+-      # 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 "$with_gnu_ld" = yes; then
+-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      openbsd2*)
 +        # C++ shared libraries are fairly broken
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +	;;
  
--          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
+-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 +      openbsd*)
 +	if test -f /usr/libexec/ld.so; then
 +	  _LT_TAGVAR(hardcode_direct, $1)=yes
@@ -8878,17 +6619,37 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	fi
 +	;;
  
+-        # 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}'
 +      osf3* | osf4* | osf5*)
-         case $cc_basename in
--          CC*)
++        case $cc_basename in
 +          KCC*)
 +	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-+
+ 
+-        # 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=
 +	    # 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'
-+
+ 
+-        # 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
 +	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 +	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +
@@ -8901,17 +6662,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	    ;;
 +          RCC*)
 +	    # Rational C++ 2.4.1
- 	    # 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'
--	        ;;
++	    # FIXME: insert proper C++ library support
++	    _LT_TAGVAR(ld_shlibs, $1)=no
++	    ;;
 +          cxx*)
 +	    case $host in
 +	      osf3*)
@@ -8919,9 +6672,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 +	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 +		;;
- 	      *)
--	        _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'
--	        ;;
++	      *)
 +	        _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" && $ECHO "X-set_version $verstring" | $Xsed` -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~
@@ -8930,35 +6681,20 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	          $RM $lib.exp'
 +	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 +		;;
- 	    esac
++	    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.
-@@ -6682,23 +6128,28 @@
- 	    # 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; $ECHO "X$list" | $Xsed'
++	    # 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=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
- 	    ;;
--          *)
--	    if test "$GXX" = yes; then
--	      if test $with_gnu_ld = no; 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 -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	            ;;
--	          *)
--	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	            ;;
--	        esac
--	      fi
++	    ;;
 +	  *)
 +	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 +	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -8970,51 +6706,71 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +		  ;;
 +	      esac
-+
+ 
+-      # 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 "\-L"'
 +	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 +	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
+ 
+-    else
+-      GXX=no
+-      with_gnu_ld=no
+-      wlarc=
+-    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 "\-L"'
-+
- 	    else
- 	      # FIXME: insert proper C++ library support
- 	      _LT_TAGVAR(ld_shlibs, $1)=no
-@@ -6707,511 +6158,699 @@
-         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*)
-+      psos*)
-+        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
+-    # 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*)
++	    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
+         ;;
+-      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
+-          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
+-          # need to do runtime linking.
+-          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
 +      sunos4*)
-         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" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++        case $cc_basename in
++          CC*)
 +	    # Sun C++ 4.x
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
+ 	    ;;
+-          esac
 +          lcc*)
 +	    # Lucid
 +	    # FIXME: insert proper C++ library support
@@ -9026,7 +6782,10 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	    ;;
 +        esac
 +        ;;
-+
+ 
+-          exp_sym_flag='-bexport'
+-          no_entry_flag='-bnoentry'
+-        fi
 +      solaris*)
 +        case $cc_basename in
 +          CC*)
@@ -9036,7 +6795,12 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	    _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'
-+
+ 
+-        # 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(hardcode_libdir_flag_spec, $1)='-R$libdir'
 +	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +	    case $host_os in
@@ -9049,28 +6813,81 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	        ;;
 +	    esac
 +	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-+
+ 
+-        _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,'
 +	    output_verbose_link_cmd='echo'
  
- 	    # Archives containing C++ object files must be created using
--	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+-        if test "$GXX" = yes; 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 "$aix_use_runtimelinking" = yes; then
+-	    shared_flag="$shared_flag "'${wl}-G'
+-	  fi
+-        else
+-          # not using gcc
+-          if test "$host_cpu" = ia64; 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 "$aix_use_runtimelinking" = yes; then
+-	      shared_flag='${wl}-G'
+-	    else
+-	      shared_flag='${wl}-bM:SRE'
+-	    fi
+-          fi
+-        fi
++	    # 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 -ar -WR,-u -o $oldlib $oldobjs'
++	    # 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'
-+
+ 
+-        _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_use_runtimelinking" = yes; 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
+-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 +	    # The C++ compiler must be used to create the archive.
 +	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
- 	    ;;
-           *)
--	    if test "$GXX" = yes; then
--	      if test "$with_gnu_ld" = no; then
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	    ;;
++          *)
 +	    # GNU C++ compiler with Solaris linker
 +	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 +	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
@@ -9078,13 +6895,35 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $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 -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+
+ 
+-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-        else
+-          if test "$host_cpu" = ia64; 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
+-	    _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'
+-	    # Exported symbols can be pulled into shared objects from archives
+-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	    # This is similar to how AIX traditionally builds its shared
+-	    # libraries.
+-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-          fi
+-        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 "\-L"'
- 	      else
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
++	      else
 +	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
 +	        # platform.
 +	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
@@ -9095,7 +6934,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	        # 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 "\-L"'
- 	      fi
++	      fi
 +
 +	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
 +	      case $host_os in
@@ -9104,25 +6943,32 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
 +		  ;;
 +	      esac
- 	    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
++	    fi
++	    ;;
++        esac
          ;;
  
--      linux* | k*bsd*-gnu)
--        case $cc_basename in
--          KCC*)
--	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+-      beos*)
+-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+-	  # Joseph Beckenbach <jrb3 at 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
+-	;;
 +    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'
-+
+ 
+-      chorus*)
+-        case $cc_basename in
+-          *)
+-	  # FIXME: insert proper C++ library support
+-	  _LT_TAGVAR(ld_shlibs, $1)=no
 +      case $cc_basename in
 +        CC*)
 +	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -9131,10 +6977,19 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	*)
 +	  _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
+-        ;;
 +      esac
 +      ;;
-+
+ 
+-      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(allow_undefined_flag, $1)=unsupported
+-        _LT_TAGVAR(always_export_symbols, $1)=no
+-        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 +      sysv5* | sco3.2v5* | sco5v6*)
 +	# Note: We can NOT use -z defs as we might desire, because we do not
 +	# link with -lc, and that would cause any symbols used from libc to
@@ -9151,7 +7006,25 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	_LT_TAGVAR(link_all_deplibs, $1)=yes
 +	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
 +	runpath_var='LD_RUN_PATH'
-+
+ 
+-        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 (1st line
+-          # is EXPORTS), use it as is; otherwise, prepend...
+-          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; 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
+-        ;;
+-      darwin* | rhapsody*)
+-        _LT_DARWIN_LINKER_FEATURES($1)
+-	;;
 +	case $cc_basename in
 +          CC*)
 +	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -9163,110 +7036,62 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	    ;;
 +	esac
 +      ;;
-+
+ 
+-      dgux*)
 +      tandem*)
-+        case $cc_basename in
+         case $cc_basename in
+-          ec++*)
+-	    # FIXME: insert proper C++ library support
+-	    _LT_TAGVAR(ld_shlibs, $1)=no
+-	    ;;
+-          ghcx*)
+-	    # Green Hills C++ Compiler
 +          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
-+        ;;
-+
+ 	    # FIXME: insert proper C++ library support
+ 	    _LT_TAGVAR(ld_shlibs, $1)=no
+ 	    ;;
+@@ -6659,644 +6320,538 @@
+         esac
+         ;;
+ 
+-      freebsd[[12]]*)
+-        # C++ shared libraries reported to be fairly broken before
+-	# switch to ELF
 +      vxworks*)
 +        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+        ;;
+         _LT_TAGVAR(ld_shlibs, $1)=no
+         ;;
  
--	    # 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; $ECHO "X$list" | $Xsed'
+-      freebsd-elf*)
+-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +      *)
 +        # FIXME: insert proper C++ library support
 +        _LT_TAGVAR(ld_shlibs, $1)=no
-+        ;;
+         ;;
 +    esac
  
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-      freebsd* | dragonfly*)
+-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+-        # conventions
+-        _LT_TAGVAR(ld_shlibs, $1)=yes
+-        ;;
 +    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
 +    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
  
--	    # 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 | $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 | $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 | $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 | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
--	      ;;
--	    *) # Version 6 will 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
+-      gnu*)
+-        ;;
 +    _LT_TAGVAR(GCC, $1)="$GXX"
 +    _LT_TAGVAR(LD, $1)="$LD"
-+
+ 
+-      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.
 +    ## 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
@@ -9278,7 +7103,34 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    _LT_LINKER_SHLIBS($1)
 +    _LT_SYS_DYNAMIC_LINKER($1)
 +    _LT_LINKER_HARDCODE_LIBPATH($1)
-+
+ 
+-        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 $output_objdir/$soname = $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; $ECHO "X$list" | $Xsed'
+-            ;;
+-          *)
+-            if test "$GXX" = yes; then
+-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-            else
+-              # FIXME: insert proper C++ library support
+-              _LT_TAGVAR(ld_shlibs, $1)=no
+-            fi
+-            ;;
+-        esac
+-        ;;
 +    _LT_CONFIG($1)
 +  fi # test -n "$compiler"
 +
@@ -9402,7 +7254,11 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	 fi
 +       fi
 +       ;;
-+
+ 
+-      hpux10*|hpux11*)
+-        if test $with_gnu_ld = no; then
+-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +    *.$objext)
 +       # This assumes that the test object file only shows up
 +       # once in the compiler output.
@@ -9410,7 +7266,28 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	 pre_test_object_deps_done=yes
 +	 continue
 +       fi
-+
+ 
+-          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
 +       if test "$pre_test_object_deps_done" = no; then
 +	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
 +	   _LT_TAGVAR(predep_objects, $1)="$p"
@@ -9425,29 +7302,24 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	 fi
 +       fi
 +       ;;
-+
-+    *) ;; # Ignore the rest.
- 
--	    _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; $ECHO \"$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'
-+    esac
-+  done
- 
--	    runpath_var=LD_RUN_PATH
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
--	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+  # Clean up.
-+  rm -f a.out a.exe
-+else
-+  echo "libtool.m4: error: problem compiling $1 test program"
-+fi
  
+-        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.
@@ -9456,36 +7328,101 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	    # 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=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+-	    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; $ECHO "X$list" | $Xsed'
 -	    ;;
--	  xl*)
--	    # 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 "x$supports_anon_versioning" = xyes; 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'
+-          *)
+-	    if test "$GXX" = yes; then
+-	      if test $with_gnu_ld = no; 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 -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	            ;;
+-	          *)
+-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${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
 -	    ;;
--	  *)
--	    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; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
--	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+-        esac
+-        ;;
++    *) ;; # Ignore the rest.
+ 
+-      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" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++    esac
++  done
+ 
+-	    # 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 "$GXX" = yes; then
+-	      if test "$with_gnu_ld" = no; then
+-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-	      else
+-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -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
+-        ;;
++  # Clean up.
++  rm -f a.out a.exe
++else
++  echo "libtool.m4: error: problem compiling $1 test program"
++fi
+ 
+-      linux* | k*bsd*-gnu)
+-        case $cc_basename in
+-          KCC*)
+-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
 +$RM -f confest.$objext
  
--	      # Not sure whether something based on
--	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
--	      # would be better.
--	      output_verbose_link_cmd='echo'
+-	    # 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; $ECHO "X$list" | $Xsed'
 +# PORTME: override above test on systems where it is broken
 +m4_if([$1], [CXX],
 +[case $host_os in
@@ -9497,25 +7434,69 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  _LT_TAGVAR(postdeps,$1)=
 +  ;;
  
--	      # 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
--	;;
+-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 +linux*)
 +  case `$CC -V 2>&1 | sed 5q` in
 +  *Sun\ C*)
 +    # Sun C++ 5.9
  
--      lynxos*)
--        # FIXME: insert proper C++ library support
--	_LT_TAGVAR(ld_shlibs, $1)=no
--	;;
+-	    # 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 | $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 | $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 | $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 | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+-	      ;;
+-	    *) # Version 6 will 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
 +    # The more standards-conforming stlport4 library is
 +    # incompatible with the Cstd library. Avoid specifying
 +    # it if it's in CXXFLAGS. Ignore libCrun as
@@ -9525,30 +7506,14 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +      solaris_use_stlport4=yes
 +      ;;
 +    esac
- 
--      m88k*)
--        # FIXME: insert proper C++ library support
--        _LT_TAGVAR(ld_shlibs, $1)=no
--	;;
++
 +    if test "$solaris_use_stlport4" != yes; then
 +      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
 +    fi
 +    ;;
 +  esac
 +  ;;
- 
--      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
--	;;
++
 +solaris*)
 +  case $cc_basename in
 +  CC*)
@@ -9562,17 +7527,14 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +      ;;
 +    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::"'
--	;;
+-	    _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; $ECHO \"$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'
 +    # Adding this requires a known-good setup of shared libraries for
 +    # Sun compiler versions before 5.6, else PIC objects from an old
 +    # archive will be linked into the output, leading to subtle bugs.
@@ -9585,9 +7547,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +esac
 +])
  
--      *nto* | *qnx*)
--        _LT_TAGVAR(ld_shlibs, $1)=yes
--	;;
+-	    runpath_var=LD_RUN_PATH
+-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +case " $_LT_TAGVAR(postdeps, $1) " in
 +*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 +esac
@@ -9608,28 +7570,43 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    a shared library])
 +])# _LT_SYS_HIDDEN_LIBDEPS
  
--      openbsd2*)
--        # C++ shared libraries are fairly broken
--	_LT_TAGVAR(ld_shlibs, $1)=no
--	;;
- 
--      openbsd*)
--	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__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; 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=echo
--	else
--	  _LT_TAGVAR(ld_shlibs, $1)=no
--	fi
--	;;
+-	    # 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=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+-	    ;;
+-	  xl*)
+-	    # 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 "x$supports_anon_versioning" = xyes; 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; $ECHO \"$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='echo'
 +# _LT_PROG_F77
 +# ------------
 +# Since AC_PROG_F77 is broken, in that it returns the empty string
@@ -9643,11 +7620,29 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +fi
 +popdef([AC_MSG_ERROR])
 +])# _LT_PROG_F77
-+
+ 
+-	      # 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
+-	;;
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([_LT_PROG_F77], [])
-+
-+
+ 
+-      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
+-	;;
 +# _LT_LANG_F77_CONFIG([TAG])
 +# --------------------------
 +# Ensure that the configuration variables for a Fortran 77 compiler are
@@ -9656,7 +7651,19 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +m4_defun([_LT_LANG_F77_CONFIG],
 +[AC_REQUIRE([_LT_PROG_F77])dnl
 +AC_LANG_PUSH(Fortran 77)
-+
+ 
+-      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
+-	;;
 +_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +_LT_TAGVAR(allow_undefined_flag, $1)=
 +_LT_TAGVAR(always_export_symbols, $1)=no
@@ -9677,14 +7684,32 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +_LT_TAGVAR(no_undefined_flag, $1)=
 +_LT_TAGVAR(whole_archive_flag_spec, $1)=
 +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
+ 
+-      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::"'
+-	;;
 +# Source file extension for f77 test sources.
 +ac_ext=f
-+
+ 
+-      *nto* | *qnx*)
+-        _LT_TAGVAR(ld_shlibs, $1)=yes
+-	;;
 +# Object file extension for compiled f77 test sources.
 +objext=o
 +_LT_TAGVAR(objext, $1)=$objext
-+
+ 
+-      openbsd2*)
+-        # C++ shared libraries are fairly broken
+-	_LT_TAGVAR(ld_shlibs, $1)=no
+-	;;
 +# 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,
@@ -9697,28 +7722,83 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +      end
 +"
  
--      osf3* | osf4* | osf5*)
--        case $cc_basename in
--          KCC*)
--	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+-      openbsd*)
+-	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__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; 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=echo
+-	else
+-	  _LT_TAGVAR(ld_shlibs, $1)=no
+-	fi
+-	;;
 +  # Code to be used in simple link tests
 +  lt_simple_link_test_code="\
 +      program t
 +      end
 +"
  
+-      osf3* | osf4* | osf5*)
+-        case $cc_basename in
+-          KCC*)
+-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
++  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
++  _LT_TAG_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'
-+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+  _LT_TAG_COMPILER
- 
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +  # 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
++  CC=${F77-"f77"}
++  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 "$can_build_shared" = "no" && 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 "$enable_shared" = yes && enable_static=no
++        if test -n "$RANLIB"; then
++          archive_cmds="$archive_cmds~\$RANLIB \$lib"
++          postinstall_cmds='$RANLIB $lib'
++        fi
++        ;;
++      aix[[4-9]]*)
++	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++	  test "$enable_shared" = yes && enable_static=no
++	fi
++        ;;
++    esac
++    AC_MSG_RESULT([$enable_shared])
+ 
+-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
++    AC_MSG_CHECKING([whether to build static libraries])
++    # Make sure either enable_shared or enable_static is yes.
++    test "$enable_shared" = yes || enable_static=yes
++    AC_MSG_RESULT([$enable_static])
  
 -	    # Archives containing C++ object files must be created using
 -	    # the KAI C++ compiler.
@@ -9749,21 +7829,20 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 -		;;
 -	    esac
-+  # Allow CC to be a program name with arguments.
-+  lt_save_CC="$CC"
-+  lt_save_GCC=$GCC
-+  CC=${F77-"f77"}
-+  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])
++    _LT_TAGVAR(GCC, $1)="$G77"
++    _LT_TAGVAR(LD, $1)="$LD"
  
 -	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+    AC_MSG_CHECKING([whether to build shared libraries])
-+    test "$can_build_shared" = "no" && enable_shared=no
++    ## 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)
  
 -	    # Commands to make compiler produce verbose output that lists
 -	    # what "hidden" libraries, object files and flags are used when
@@ -9786,37 +7865,21 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 -		  ;;
 -	      esac
-+    # On AIX, shared libraries and static libraries use the same namespace, and
-+    # are all built from PIC.
-+    case $host_os in
-+      aix3*)
-+        test "$enable_shared" = yes && enable_static=no
-+        if test -n "$RANLIB"; then
-+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+          postinstall_cmds='$RANLIB $lib'
-+        fi
-+        ;;
-+      aix[[4-9]]*)
-+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+	  test "$enable_shared" = yes && enable_static=no
-+	fi
-+        ;;
-+    esac
-+    AC_MSG_RESULT([$enable_shared])
++    _LT_CONFIG($1)
++  fi # test -n "$compiler"
  
 -	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 -	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+    AC_MSG_CHECKING([whether to build static libraries])
-+    # Make sure either enable_shared or enable_static is yes.
-+    test "$enable_shared" = yes || enable_static=yes
-+    AC_MSG_RESULT([$enable_static])
++  GCC=$lt_save_GCC
++  CC="$lt_save_CC"
++fi # test "$_lt_disable_F77" != yes
  
 -	      # 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 "\-L"'
-+    _LT_TAGVAR(GCC, $1)="$G77"
-+    _LT_TAGVAR(LD, $1)="$LD"
++AC_LANG_POP
++])# _LT_LANG_F77_CONFIG
  
 -	    else
 -	      # FIXME: insert proper C++ library support
@@ -9825,23 +7888,24 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	    ;;
 -        esac
 -        ;;
-+    ## 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)
  
 -      psos*)
 -        # FIXME: insert proper C++ library support
 -        _LT_TAGVAR(ld_shlibs, $1)=no
 -        ;;
-+    _LT_CONFIG($1)
-+  fi # test -n "$compiler"
++# _LT_PROG_FC
++# -----------
++# Since AC_PROG_FC is broken, in that it returns the empty string
++# if there is no fortran compiler, we have our own version here.
++m4_defun([_LT_PROG_FC],
++[
++pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
++AC_PROG_FC
++if test -z "$FC" || test "X$FC" = "Xno"; then
++  _lt_disable_FC=yes
++fi
++popdef([AC_MSG_ERROR])
++])# _LT_PROG_FC
  
 -      sunos4*)
 -        case $cc_basename in
@@ -9861,9 +7925,8 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	    ;;
 -        esac
 -        ;;
-+  GCC=$lt_save_GCC
-+  CC="$lt_save_CC"
-+fi # test "$_lt_disable_F77" != yes
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([_LT_PROG_FC], [])
  
 -      solaris*)
 -        case $cc_basename in
@@ -9874,8 +7937,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	    _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'
-+AC_LANG_POP
-+])# _LT_LANG_F77_CONFIG
  
 -	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 -	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -9889,21 +7950,36 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	        ;;
 -	    esac
 -	    _LT_TAGVAR(link_all_deplibs, $1)=yes
++# _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_REQUIRE([_LT_PROG_FC])dnl
++AC_LANG_PUSH(Fortran)
  
 -	    output_verbose_link_cmd='echo'
-+# _LT_PROG_FC
-+# -----------
-+# Since AC_PROG_FC is broken, in that it returns the empty string
-+# if there is no fortran compiler, we have our own version here.
-+m4_defun([_LT_PROG_FC],
-+[
-+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-+AC_PROG_FC
-+if test -z "$FC" || test "X$FC" = "Xno"; then
-+  _lt_disable_FC=yes
-+fi
-+popdef([AC_MSG_ERROR])
-+])# _LT_PROG_FC
++_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_flag_spec_ld, $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(no_undefined_flag, $1)=
++_LT_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
  
 -	    # Archives containing C++ object files must be created using
 -	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -9914,8 +7990,8 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -          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'
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([_LT_PROG_FC], [])
++# Source file extension for fc test sources.
++ac_ext=${ac_fc_srcext-f}
  
 -	    # The C++ compiler must be used to create the archive.
 -	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
@@ -9928,6 +8004,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $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 -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++# Object file extension for compiled fc test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
  
 -	        # Commands to make compiler produce verbose output that lists
 -	        # what "hidden" libraries, object files and flags are used when
@@ -9939,43 +8018,28 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $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 -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+# _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_REQUIRE([_LT_PROG_FC])dnl
-+AC_LANG_PUSH(Fortran)
-+
-+_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_flag_spec_ld, $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(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++# 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 "$_lt_disable_FC" != yes; then
++  # Code to be used in simple compile tests
++  lt_simple_compile_test_code="\
++      subroutine t
++      return
++      end
++"
  
 -	        # 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 "\-L"'
 -	      fi
-+# Source file extension for fc test sources.
-+ac_ext=${ac_fc_srcext-f}
++  # Code to be used in simple link tests
++  lt_simple_link_test_code="\
++      program t
++      end
++"
  
 -	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
 -	      case $host_os in
@@ -9988,26 +8052,17 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	    ;;
 -        esac
 -        ;;
-+# Object file extension for compiled fc test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
++  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
++  _LT_TAG_COMPILER
  
 -    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'
-+# 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 "$_lt_disable_FC" != yes; then
-+  # Code to be used in simple compile tests
-+  lt_simple_compile_test_code="\
-+      subroutine t
-+      return
-+      end
-+"
++  # save warnings/boilerplate of simple test code
++  _LT_COMPILER_BOILERPLATE
++  _LT_LINKER_BOILERPLATE
  
 -      case $cc_basename in
 -        CC*)
@@ -10020,11 +8075,12 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	  ;;
 -      esac
 -      ;;
-+  # Code to be used in simple link tests
-+  lt_simple_link_test_code="\
-+      program t
-+      end
-+"
++  # Allow CC to be a program name with arguments.
++  lt_save_CC="$CC"
++  lt_save_GCC=$GCC
++  CC=${FC-"f95"}
++  compiler=$CC
++  GCC=$ac_cv_fc_compiler_gnu
  
 -      sysv5* | sco3.2v5* | sco5v6*)
 -	# Note: We can NOT use -z defs as we might desire, because we do not
@@ -10042,8 +8098,8 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	_LT_TAGVAR(link_all_deplibs, $1)=yes
 -	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
 -	runpath_var='LD_RUN_PATH'
-+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+  _LT_TAG_COMPILER
++  _LT_TAGVAR(compiler, $1)=$CC
++  _LT_CC_BASENAME([$compiler])
  
 -	case $cc_basename in
 -          CC*)
@@ -10056,9 +8112,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	    ;;
 -	esac
 -      ;;
-+  # save warnings/boilerplate of simple test code
-+  _LT_COMPILER_BOILERPLATE
-+  _LT_LINKER_BOILERPLATE
++  if test -n "$compiler"; then
++    AC_MSG_CHECKING([if libtool supports shared libraries])
++    AC_MSG_RESULT([$can_build_shared])
  
 -      tandem*)
 -        case $cc_basename in
@@ -10073,30 +8129,12 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	    ;;
 -        esac
 -        ;;
-+  # Allow CC to be a program name with arguments.
-+  lt_save_CC="$CC"
-+  lt_save_GCC=$GCC
-+  CC=${FC-"f95"}
-+  compiler=$CC
-+  GCC=$ac_cv_fc_compiler_gnu
++    AC_MSG_CHECKING([whether to build shared libraries])
++    test "$can_build_shared" = "no" && enable_shared=no
  
 -      vxworks*)
 -        # FIXME: insert proper C++ library support
 -        _LT_TAGVAR(ld_shlibs, $1)=no
--        ;;
-+  _LT_TAGVAR(compiler, $1)=$CC
-+  _LT_CC_BASENAME([$compiler])
- 
--      *)
--        # FIXME: insert proper C++ library support
--        _LT_TAGVAR(ld_shlibs, $1)=no
-+  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 "$can_build_shared" = "no" && enable_shared=no
-+
 +    # On AIX, shared libraries and static libraries use the same namespace, and
 +    # are all built from PIC.
 +    case $host_os in
@@ -10106,7 +8144,11 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +          archive_cmds="$archive_cmds~\$RANLIB \$lib"
 +          postinstall_cmds='$RANLIB $lib'
 +        fi
-+        ;;
+         ;;
+-
+-      *)
+-        # FIXME: insert proper C++ library support
+-        _LT_TAGVAR(ld_shlibs, $1)=no
 +      aix[[4-9]]*)
 +	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
 +	  test "$enable_shared" = yes && enable_static=no
@@ -10127,42 +8169,28 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
      _LT_TAGVAR(LD, $1)="$LD"
  
      ## CAVEAT EMPTOR:
-@@ -7229,1707 +6868,2016 @@
+@@ -7314,1636 +6869,2101 @@
      _LT_CONFIG($1)
    fi # test -n "$compiler"
  
 -  CC=$lt_save_CC
 -  LDCXX=$LD
 -  LD=$lt_save_LD
-   GCC=$lt_save_GCC
+-  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 "$_lt_caught_CXX_error" != yes
++  GCC=$lt_save_GCC
 +  CC="$lt_save_CC"
 +fi # test "$_lt_disable_FC" != yes
- 
- AC_LANG_POP
--])# _LT_LANG_CXX_CONFIG
++
++AC_LANG_POP
 +])# _LT_LANG_FC_CONFIG
- 
- 
--# _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
--# 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)=
++
++
 +# _LT_LANG_GCJ_CONFIG([TAG])
 +# --------------------------
 +# Ensure that the configuration variables for the GNU Java Compiler compiler
@@ -10171,55 +8199,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +m4_defun([_LT_LANG_GCJ_CONFIG],
 +[AC_REQUIRE([LT_PROG_GCJ])dnl
 +AC_LANG_SAVE
- 
--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
--])
--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.
++
 +# Source file extension for Java test sources.
 +ac_ext=java
 +
@@ -10252,14 +8232,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +
 +# GCJ did not exist at the time GCC didn't implicitly link libc in.
 +_LT_TAGVAR(archive_cmds_need_lc, $1)=no
- 
--  # Sentinel used to keep track of whether or not we are before
--  # the conftest object file.
--  pre_test_object_deps_done=no
++
 +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
- 
--  for p in `eval "$output_verbose_link_cmd"`; do
--    case $p in
++
 +if test -n "$compiler"; then
 +  _LT_COMPILER_NO_RTTI($1)
 +  _LT_COMPILER_PIC($1)
@@ -10267,72 +8242,17 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  _LT_COMPILER_FILE_LOCKS($1)
 +  _LT_LINKER_SHLIBS($1)
 +  _LT_LINKER_HARDCODE_LIBPATH($1)
- 
--    -L* | -R* | -l*)
--       # Some compilers place space between "-{L,R}" and the path.
--       # Remove the space.
--       if test $p = "-L" ||
--          test $p = "-R"; then
--	 prev=$p
--	 continue
--       else
--	 prev=
--       fi
++
 +  _LT_CONFIG($1)
 +fi
- 
--       if test "$pre_test_object_deps_done" = no; then
--	 case $p 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
--       ;;
++
 +AC_LANG_RESTORE
- 
--    *.$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
++
 +GCC=$lt_save_GCC
 +CC="$lt_save_CC"
 +])# _LT_LANG_GCJ_CONFIG
- 
--       if test "$pre_test_object_deps_done" = no; 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.
++
++
 +# _LT_LANG_RC_CONFIG([TAG])
 +# -------------------------
 +# Ensure that the configuration variables for the Windows resource compiler
@@ -10341,16 +8261,10 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +m4_defun([_LT_LANG_RC_CONFIG],
 +[AC_REQUIRE([LT_PROG_RC])dnl
 +AC_LANG_SAVE
- 
--    esac
--  done
++
 +# Source file extension for RC test sources.
 +ac_ext=rc
- 
--  # Clean up.
--  rm -f a.out a.exe
--else
--  echo "libtool.m4: error: problem compiling $1 test program"
++
 +# Object file extension for compiled RC test sources.
 +objext=o
 +_LT_TAGVAR(objext, $1)=$objext
@@ -10381,29 +8295,14 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +if test -n "$compiler"; then
 +  :
 +  _LT_CONFIG($1)
- fi
- 
--$RM -f confest.$objext
++fi
++
 +GCC=$lt_save_GCC
 +AC_LANG_RESTORE
 +CC="$lt_save_CC"
 +])# _LT_LANG_RC_CONFIG
- 
--# 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)=
--  ;;
- 
--linux*)
--  case `$CC -V 2>&1 | sed 5q` in
--  *Sun\ C*)
--    # Sun C++ 5.9
++
++
 +# LT_PROG_GCJ
 +# -----------
 +AC_DEFUN([LT_PROG_GCJ],
@@ -10413,56 +8312,19 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
 +      AC_SUBST(GCJFLAGS)])])[]dnl
 +])
- 
--    # The more standards-conforming stlport4 library is
--    # incompatible with the Cstd library. Avoid specifying
--    # it if it's in CXXFLAGS. Ignore libCrun as
--    # -library=stlport4 depends on it.
--    case " $CXX $CXXFLAGS " in
--    *" -library=stlport4 "*)
--      solaris_use_stlport4=yes
--      ;;
--    esac
++
 +# Old name:
 +AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
- 
--    if test "$solaris_use_stlport4" != yes; then
--      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
--    fi
--    ;;
--  esac
--  ;;
- 
--solaris*)
--  case $cc_basename in
--  CC*)
--    # The more standards-conforming stlport4 library is
--    # incompatible with the Cstd library. Avoid specifying
--    # it if it's in CXXFLAGS. Ignore libCrun as
--    # -library=stlport4 depends on it.
--    case " $CXX $CXXFLAGS " in
--    *" -library=stlport4 "*)
--      solaris_use_stlport4=yes
--      ;;
--    esac
++
++
 +# LT_PROG_RC
 +# ----------
 +AC_DEFUN([LT_PROG_RC],
 +[AC_CHECK_TOOL(RC, windres,)
 +])
- 
--    # Adding this requires a known-good setup of shared libraries for
--    # Sun compiler versions before 5.6, else PIC objects from an old
--    # archive will be linked into the output, leading to subtle bugs.
--    if test "$solaris_use_stlport4" != yes; then
--      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
--    fi
--    ;;
--  esac
--  ;;
--esac
++
 +# Old name:
 +AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
 +dnl aclocal-1.4 backwards compatibility:
@@ -10482,28 +8344,11 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +_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])
- ])
- 
--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
++])
++
  
+-AC_LANG_POP
+-])# _LT_LANG_CXX_CONFIG
 +# _LT_DECL_OBJDUMP
 +# --------------
 +# If we don't have a new enough Autoconf to choose the best objdump
@@ -10514,8 +8359,22 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
 +AC_SUBST([OBJDUMP])
 +])
-+
-+
+ 
+ 
+-# _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
+-# 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)=
 +# _LT_DECL_SED
 +# ------------
 +# Check for a fully-functional sed program, that truncates
@@ -10528,26 +8387,55 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
 +    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
 +])# _LT_DECL_SED
-+
+ 
+-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
 +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.                               #
- 
--# _LT_PROG_F77
--# ------------
--# Since AC_PROG_F77 is broken, in that it returns the empty string
--# if there is no fortran compiler, we have our own version here.
--m4_defun([_LT_PROG_F77],
--[
--pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
--AC_PROG_F77
--if test -z "$F77" || test "X$F77" = "Xno"; then
--  _lt_disable_F77=yes
--fi
--popdef([AC_MSG_ERROR])
--])# _LT_PROG_F77
++
 +m4_defun([AC_PROG_SED],
 +[AC_MSG_CHECKING([for a sed that does not truncate output])
 +AC_CACHE_VAL(lt_cv_path_SED,
@@ -10597,52 +8485,39 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    fi
 +  done
 +done
-+])
+ ])
+-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.
 +SED=$lt_cv_path_SED
 +AC_SUBST([SED])
 +AC_MSG_RESULT([$SED])
 +])#AC_PROG_SED
 +])#m4_ifndef
  
+-  # Sentinel used to keep track of whether or not we are before
+-  # the conftest object file.
+-  pre_test_object_deps_done=no
 +# Old name:
 +AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
- dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([_LT_PROG_F77], [])
--
--
--# _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_REQUIRE([_LT_PROG_F77])dnl
--AC_LANG_PUSH(Fortran 77)
++dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([LT_AC_PROG_SED], [])
  
--_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_flag_spec_ld, $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(no_undefined_flag, $1)=
--_LT_TAGVAR(whole_archive_flag_spec, $1)=
--_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+-  for p in `eval "$output_verbose_link_cmd"`; do
+-    case $p in
  
--# Source file extension for f77 test sources.
--ac_ext=f
+-    -L* | -R* | -l*)
+-       # Some compilers place space between "-{L,R}" and the path.
+-       # Remove the space.
+-       if test $p = "-L" ||
+-          test $p = "-R"; then
+-	 prev=$p
+-	 continue
+-       else
+-	 prev=
+-       fi
 +# _LT_CHECK_SHELL_FEATURES
 +# ------------------------
 +# Find out whether the shell is Bourne or XSI compatible,
@@ -10660,9 +8535,29 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +AC_MSG_RESULT([$xsi_shell])
 +_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
  
--# Object file extension for compiled f77 test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
+-       if test "$pre_test_object_deps_done" = no; then
+-	 case $p 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
+-       ;;
 +AC_MSG_CHECKING([whether the shell understands "+="])
 +lt_shell_append=no
 +( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
@@ -10671,17 +8566,13 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +AC_MSG_RESULT([$lt_shell_append])
 +_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
  
--# 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 "$_lt_disable_F77" != yes; then
--  # Code to be used in simple compile tests
--  lt_simple_compile_test_code="\
--      subroutine t
--      return
--      end
--"
+-    *.$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 ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 +  lt_unset=unset
 +else
@@ -10689,11 +8580,20 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +fi
 +_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
  
--  # Code to be used in simple link tests
--  lt_simple_link_test_code="\
--      program t
--      end
--"
+-       if test "$pre_test_object_deps_done" = no; 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
+-       ;;
 +# test EBCDIC or ASCII
 +case `echo X|tr X '\101'` in
 + A) # ASCII based system
@@ -10710,12 +8610,10 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
 +])# _LT_CHECK_SHELL_FEATURES
  
--  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
--  _LT_TAG_COMPILER
+-    *) ;; # Ignore the rest.
  
--  # save warnings/boilerplate of simple test code
--  _LT_COMPILER_BOILERPLATE
--  _LT_LINKER_BOILERPLATE
+-    esac
+-  done
 +# _LT_PROG_XSI_SHELLFNS
 +# ---------------------
 +# Bourne and XSI compatible variants of some useful shell functions.
@@ -10724,17 +8622,11 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  yes)
 +    cat << \_LT_EOF >> "$cfgfile"
  
--  # Allow CC to be a program name with arguments.
--  lt_save_CC="$CC"
--  lt_save_GCC=$GCC
--  CC=${F77-"f77"}
--  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])
+-  # Clean up.
+-  rm -f a.out a.exe
+-else
+-  echo "libtool.m4: error: problem compiling $1 test program"
+-fi
 +# func_dirname file append nondir_replacement
 +# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
 +# otherwise set result to NONDIR_REPLACEMENT.
@@ -10746,31 +8638,23 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  esac
 +}
  
--    AC_MSG_CHECKING([whether to build shared libraries])
--    test "$can_build_shared" = "no" && enable_shared=no
+-$RM -f confest.$objext
 +# func_basename file
 +func_basename ()
 +{
 +  func_basename_result="${1##*/}"
 +}
  
--    # On AIX, shared libraries and static libraries use the same namespace, and
--    # are all built from PIC.
--    case $host_os in
--      aix3*)
--        test "$enable_shared" = yes && enable_static=no
--        if test -n "$RANLIB"; then
--          archive_cmds="$archive_cmds~\$RANLIB \$lib"
--          postinstall_cmds='$RANLIB $lib'
--        fi
--        ;;
--      aix[[4-9]]*)
--	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--	  test "$enable_shared" = yes && enable_static=no
--	fi
--        ;;
--    esac
--    AC_MSG_RESULT([$enable_shared])
+-# 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)=
+-  ;;
 +# func_dirname_and_basename file append nondir_replacement
 +# perform func_basename and func_dirname in a single function
 +# call:
@@ -10792,10 +8676,10 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  func_basename_result="${1##*/}"
 +}
  
--    AC_MSG_CHECKING([whether to build static libraries])
--    # Make sure either enable_shared or enable_static is yes.
--    test "$enable_shared" = yes || enable_static=yes
--    AC_MSG_RESULT([$enable_static])
+-linux*)
+-  case `$CC -V 2>&1 | sed 5q` in
+-  *Sun\ C*)
+-    # Sun C++ 5.9
 +# func_stripname prefix suffix name
 +# strip PREFIX and SUFFIX off of NAME.
 +# PREFIX and SUFFIX must not contain globbing or regex special
@@ -10810,8 +8694,15 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  func_stripname_result=${func_stripname_result%"${2}"}
 +}
  
--    _LT_TAGVAR(GCC, $1)="$G77"
--    _LT_TAGVAR(LD, $1)="$LD"
+-    # The more standards-conforming stlport4 library is
+-    # incompatible with the Cstd library. Avoid specifying
+-    # it if it's in CXXFLAGS. Ignore libCrun as
+-    # -library=stlport4 depends on it.
+-    case " $CXX $CXXFLAGS " in
+-    *" -library=stlport4 "*)
+-      solaris_use_stlport4=yes
+-      ;;
+-    esac
 +# func_opt_split
 +func_opt_split ()
 +{
@@ -10819,69 +8710,102 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  func_opt_split_arg=${1#*=}
 +}
  
--    ## 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)
+-    if test "$solaris_use_stlport4" != yes; then
+-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+-    fi
+-    ;;
 +# func_lo2o object
 +func_lo2o ()
 +{
 +  case ${1} in
 +    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
 +    *)    func_lo2o_result=${1} ;;
-+  esac
+   esac
+-  ;;
+-
+-solaris*)
+-  case $cc_basename in
+-  CC*)
+-    # The more standards-conforming stlport4 library is
+-    # incompatible with the Cstd library. Avoid specifying
+-    # it if it's in CXXFLAGS. Ignore libCrun as
+-    # -library=stlport4 depends on it.
+-    case " $CXX $CXXFLAGS " in
+-    *" -library=stlport4 "*)
+-      solaris_use_stlport4=yes
+-      ;;
+-    esac
 +}
  
--    _LT_CONFIG($1)
--  fi # test -n "$compiler"
+-    # Adding this requires a known-good setup of shared libraries for
+-    # Sun compiler versions before 5.6, else PIC objects from an old
+-    # archive will be linked into the output, leading to subtle bugs.
+-    if test "$solaris_use_stlport4" != yes; then
+-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+-    fi
+-    ;;
+-  esac
+-  ;;
+-esac
+-])
 +# func_xform libobj-or-source
 +func_xform ()
 +{
 +  func_xform_result=${1%.*}.lo
 +}
  
--  GCC=$lt_save_GCC
--  CC="$lt_save_CC"
--fi # test "$_lt_disable_F77" != yes
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=$(( $[*] ))
-+}
- 
--AC_LANG_POP
--])# _LT_LANG_F77_CONFIG
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=${#1}
-+}
- 
-+_LT_EOF
-+    ;;
-+  *) # Bourne compatible functions.
-+    cat << \_LT_EOF >> "$cfgfile"
+-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
++# func_arith arithmetic-term...
++func_arith ()
++{
++  func_arith_result=$(( $[*] ))
++}
  
--# _LT_PROG_FC
--# -----------
--# Since AC_PROG_FC is broken, in that it returns the empty string
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++  func_len_result=${#1}
++}
+ 
+-# _LT_PROG_F77
+-# ------------
+-# Since AC_PROG_F77 is broken, in that it returns the empty string
 -# if there is no fortran compiler, we have our own version here.
--m4_defun([_LT_PROG_FC],
+-m4_defun([_LT_PROG_F77],
 -[
--pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
--AC_PROG_FC
--if test -z "$FC" || test "X$FC" = "Xno"; then
--  _lt_disable_FC=yes
+-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
+-AC_PROG_F77
+-if test -z "$F77" || test "X$F77" = "Xno"; then
+-  _lt_disable_F77=yes
 -fi
 -popdef([AC_MSG_ERROR])
--])# _LT_PROG_FC
+-])# _LT_PROG_F77
++_LT_EOF
++    ;;
++  *) # Bourne compatible functions.
++    cat << \_LT_EOF >> "$cfgfile"
+ 
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([_LT_PROG_F77], [])
 +# func_dirname file append nondir_replacement
 +# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
 +# otherwise set result to NONDIR_REPLACEMENT.
@@ -10896,42 +8820,24 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  fi
 +}
  
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([_LT_PROG_FC], [])
 +# func_basename file
 +func_basename ()
 +{
 +  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
 +}
  
+-# _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_REQUIRE([_LT_PROG_F77])dnl
+-AC_LANG_PUSH(Fortran 77)
 +dnl func_dirname_and_basename
 +dnl A portable version of this function is already defined in general.m4sh
 +dnl so there is no need for it here.
  
--# _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_REQUIRE([_LT_PROG_FC])dnl
--AC_LANG_PUSH(Fortran)
-+# func_stripname 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).
-+# func_strip_suffix prefix name
-+func_stripname ()
-+{
-+  case ${2} in
-+    .*) func_stripname_result=`$ECHO "X${3}" \
-+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-+    *)  func_stripname_result=`$ECHO "X${3}" \
-+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-+  esac
-+}
- 
 -_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 -_LT_TAGVAR(allow_undefined_flag, $1)=
 -_LT_TAGVAR(always_export_symbols, $1)=no
@@ -10952,12 +8858,31 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -_LT_TAGVAR(no_undefined_flag, $1)=
 -_LT_TAGVAR(whole_archive_flag_spec, $1)=
 -_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++# func_stripname 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).
++# func_strip_suffix prefix name
++func_stripname ()
++{
++  case ${2} in
++    .*) func_stripname_result=`$ECHO "X${3}" \
++           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
++    *)  func_stripname_result=`$ECHO "X${3}" \
++           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
++  esac
++}
+ 
+-# Source file extension for f77 test sources.
+-ac_ext=f
 +# sed scripts:
 +my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
 +my_sed_long_arg='1s/^-[[^=]]*=//'
  
--# Source file extension for fc test sources.
--ac_ext=${ac_fc_srcext-f}
+-# Object file extension for compiled f77 test sources.
+-objext=o
+-_LT_TAGVAR(objext, $1)=$objext
 +# func_opt_split
 +func_opt_split ()
 +{
@@ -10965,30 +8890,21 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
 +}
  
--# Object file extension for compiled fc test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
-+# func_lo2o object
-+func_lo2o ()
-+{
-+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-+}
- 
 -# No sense in running all these tests if we already determined that
--# the FC compiler isn't working.  Some variables (like enable_shared)
+-# 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 "$_lt_disable_FC" != yes; then
+-if test "$_lt_disable_F77" != yes; then
 -  # Code to be used in simple compile tests
 -  lt_simple_compile_test_code="\
 -      subroutine t
 -      return
 -      end
 -"
-+# func_xform libobj-or-source
-+func_xform ()
++# func_lo2o object
++func_lo2o ()
 +{
-+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
++  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
 +}
  
 -  # Code to be used in simple link tests
@@ -10996,14 +8912,23 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -      program t
 -      end
 -"
++# func_xform libobj-or-source
++func_xform ()
++{
++  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
++}
+ 
+-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-  _LT_TAG_COMPILER
 +# func_arith arithmetic-term...
 +func_arith ()
 +{
 +  func_arith_result=`expr "$[@]"`
 +}
  
--  # 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
 +# func_len string
 +# STRING may not start with a hyphen.
 +func_len ()
@@ -11011,51 +8936,25 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
 +}
  
--  # save warnings/boilerplate of simple test code
--  _LT_COMPILER_BOILERPLATE
--  _LT_LINKER_BOILERPLATE
-+_LT_EOF
-+esac
- 
 -  # Allow CC to be a program name with arguments.
 -  lt_save_CC="$CC"
 -  lt_save_GCC=$GCC
--  CC=${FC-"f95"}
+-  CC=${F77-"f77"}
 -  compiler=$CC
--  GCC=$ac_cv_fc_compiler_gnu
-+case $lt_shell_append in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
- 
 -  _LT_TAGVAR(compiler, $1)=$CC
 -  _LT_CC_BASENAME([$compiler])
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$[1]+=\$[2]"
-+}
-+_LT_EOF
-+    ;;
-+  *)
-+    cat << \_LT_EOF >> "$cfgfile"
- 
+-  GCC=$G77
 -  if test -n "$compiler"; then
 -    AC_MSG_CHECKING([if libtool supports shared libraries])
 -    AC_MSG_RESULT([$can_build_shared])
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$[1]=\$$[1]\$[2]"
-+}
++_LT_EOF
++esac
  
 -    AC_MSG_CHECKING([whether to build shared libraries])
 -    test "$can_build_shared" = "no" && enable_shared=no
-+_LT_EOF
-+    ;;
-+  esac
-+])
++case $lt_shell_append in
++  yes)
++    cat << \_LT_EOF >> "$cfgfile"
  
 -    # On AIX, shared libraries and static libraries use the same namespace, and
 -    # are all built from PIC.
@@ -11074,84 +8973,138 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -        ;;
 -    esac
 -    AC_MSG_RESULT([$enable_shared])
-+# Helper functions for option handling.                    -*- Autoconf -*-
-+#
-+#   Copyright (C) 2004, 2005, 2007, 2008 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.
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++  eval "$[1]+=\$[2]"
++}
++_LT_EOF
++    ;;
++  *)
++    cat << \_LT_EOF >> "$cfgfile"
  
 -    AC_MSG_CHECKING([whether to build static libraries])
 -    # Make sure either enable_shared or enable_static is yes.
 -    test "$enable_shared" = yes || enable_static=yes
 -    AC_MSG_RESULT([$enable_static])
-+# serial 6 ltoptions.m4
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
++{
++  eval "$[1]=\$$[1]\$[2]"
++}
  
--    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+-    _LT_TAGVAR(GCC, $1)="$G77"
 -    _LT_TAGVAR(LD, $1)="$LD"
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
++_LT_EOF
++    ;;
++  esac
++])
  
 -    ## 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)
++# Helper functions for option handling.                    -*- Autoconf -*-
++#
++#   Copyright (C) 2004, 2005, 2007, 2008 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.
  
 -    _LT_CONFIG($1)
 -  fi # test -n "$compiler"
-+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-+# ------------------------------------------
-+m4_define([_LT_MANGLE_OPTION],
-+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
++# serial 6 ltoptions.m4
  
 -  GCC=$lt_save_GCC
 -  CC="$lt_save_CC"
--fi # test "$_lt_disable_FC" != yes
+-fi # test "$_lt_disable_F77" != yes
++# This is to help aclocal find these macros, as it can't see m4_define.
++AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
  
 -AC_LANG_POP
--])# _LT_LANG_FC_CONFIG
-+# _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_LANG_F77_CONFIG
  
++# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
++# ------------------------------------------
++m4_define([_LT_MANGLE_OPTION],
++[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
  
--# _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
+-# _LT_PROG_FC
+-# -----------
+-# Since AC_PROG_FC is broken, in that it returns the empty string
+-# if there is no fortran compiler, we have our own version here.
+-m4_defun([_LT_PROG_FC],
+-[
+-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
+-AC_PROG_FC
+-if test -z "$FC" || test "X$FC" = "Xno"; then
+-  _lt_disable_FC=yes
+-fi
+-popdef([AC_MSG_ERROR])
+-])# _LT_PROG_FC
+ 
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([_LT_PROG_FC], [])
++# _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_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_GCJ_CONFIG],
--[AC_REQUIRE([LT_PROG_GCJ])dnl
--AC_LANG_SAVE
+-m4_defun([_LT_LANG_FC_CONFIG],
+-[AC_REQUIRE([_LT_PROG_FC])dnl
+-AC_LANG_PUSH(Fortran)
 +# _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])])
  
--# Source file extension for Java test sources.
--ac_ext=java
+-_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_flag_spec_ld, $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(no_undefined_flag, $1)=
+-_LT_TAGVAR(whole_archive_flag_spec, $1)=
+-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
  
--# Object file extension for compiled Java test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
+-# Source file extension for fc test sources.
+-ac_ext=${ac_fc_srcext-f}
 +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
 +# -------------------------------------------------------
 +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
@@ -11164,11 +9117,21 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +])[]dnl
 +])
  
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}"
+-# Object file extension for compiled fc test sources.
+-objext=o
+-_LT_TAGVAR(objext, $1)=$objext
  
--# Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+-# 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 "$_lt_disable_FC" != yes; then
+-  # Code to be used in simple compile tests
+-  lt_simple_compile_test_code="\
+-      subroutine t
+-      return
+-      end
+-"
 +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
 +# ----------------------------------------
 +# OPTION-LIST is a space-separated list of Libtool options associated
@@ -11180,8 +9143,11 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
 +    [_LT_SET_OPTION([$1], _LT_Option)])
  
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_TAG_COMPILER
+-  # Code to be used in simple link tests
+-  lt_simple_link_test_code="\
+-      program t
+-      end
+-"
 +m4_if([$1],[LT_INIT],[
 +  dnl
 +  dnl Simply set some default values (i.e off) if boolean options were not
@@ -11203,54 +9169,65 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  ])
 +])# _LT_SET_OPTIONS
  
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
+-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-  _LT_TAG_COMPILER
  
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--lt_save_GCC=$GCC
--GCC=yes
--CC=${GCJ-"gcj"}
--compiler=$CC
--_LT_TAGVAR(compiler, $1)=$CC
--_LT_TAGVAR(LD, $1)="$LD"
--_LT_CC_BASENAME([$compiler])
+-  # save warnings/boilerplate of simple test code
+-  _LT_COMPILER_BOILERPLATE
+-  _LT_LINKER_BOILERPLATE
  
--# GCJ did not exist at the time GCC didn't implicitly link libc in.
--_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+-  # Allow CC to be a program name with arguments.
+-  lt_save_CC="$CC"
+-  lt_save_GCC=$GCC
+-  CC=${FC-"f95"}
+-  compiler=$CC
+-  GCC=$ac_cv_fc_compiler_gnu
 +# _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_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-  _LT_TAGVAR(compiler, $1)=$CC
+-  _LT_CC_BASENAME([$compiler])
  
--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)
+-  if test -n "$compiler"; then
+-    AC_MSG_CHECKING([if libtool supports shared libraries])
+-    AC_MSG_RESULT([$can_build_shared])
 +# 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
  
--  _LT_CONFIG($1)
--fi
+-    AC_MSG_CHECKING([whether to build shared libraries])
+-    test "$can_build_shared" = "no" && enable_shared=no
  
--AC_LANG_RESTORE
+-    # On AIX, shared libraries and static libraries use the same namespace, and
+-    # are all built from PIC.
+-    case $host_os in
+-      aix3*)
+-        test "$enable_shared" = yes && enable_static=no
+-        if test -n "$RANLIB"; then
+-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+-          postinstall_cmds='$RANLIB $lib'
+-        fi
+-        ;;
+-      aix[[4-9]]*)
+-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-	  test "$enable_shared" = yes && enable_static=no
+-	fi
+-        ;;
+-    esac
+-    AC_MSG_RESULT([$enable_shared])
 +# dlopen
 +# ------
 +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
 +])
  
--GCC=$lt_save_GCC
--CC="$lt_save_CC"
--])# _LT_LANG_GCJ_CONFIG
+-    AC_MSG_CHECKING([whether to build static libraries])
+-    # Make sure either enable_shared or enable_static is yes.
+-    test "$enable_shared" = yes || enable_static=yes
+-    AC_MSG_RESULT([$enable_static])
 +AU_DEFUN([AC_LIBTOOL_DLOPEN],
 +[_LT_SET_OPTION([LT_INIT], [dlopen])
 +AC_DIAGNOSE([obsolete],
@@ -11258,29 +9235,34 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +put the `dlopen' option into LT_INIT's first parameter.])
 +])
  
+-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+-    _LT_TAGVAR(LD, $1)="$LD"
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
  
--# _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
+-    ## 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)
  
--# Source file extension for RC test sources.
--ac_ext=rc
+-    _LT_CONFIG($1)
+-  fi # test -n "$compiler"
 +# win32-dll
 +# ---------
 +# Declare package support for building win32 dll's.
 +LT_OPTION_DEFINE([LT_INIT], [win32-dll],
 +[enable_win32_dll=yes
  
--# Object file extension for compiled RC test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
+-  GCC=$lt_save_GCC
+-  CC="$lt_save_CC"
+-fi # test "$_lt_disable_FC" != yes
 +case $host in
 +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
 +  AC_CHECK_TOOL(AS, as, false)
@@ -11289,25 +9271,28 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  ;;
 +esac
  
--# Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+-AC_LANG_POP
+-])# _LT_LANG_FC_CONFIG
 +test -z "$AS" && AS=as
 +_LT_DECL([], [AS],      [0], [Assembler program])dnl
  
--# Code to be used in simple link tests
--lt_simple_link_test_code="$lt_simple_compile_test_code"
 +test -z "$DLLTOOL" && DLLTOOL=dlltool
 +_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
  
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_TAG_COMPILER
+-# _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
 +test -z "$OBJDUMP" && OBJDUMP=objdump
 +_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
 +])# win32-dll
  
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
+-# Source file extension for Java test sources.
+-ac_ext=java
 +AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
 +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 +_LT_SET_OPTION([LT_INIT], [win32-dll])
@@ -11316,27 +9301,17 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +put the `win32-dll' option into LT_INIT's first parameter.])
 +])
  
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--lt_save_GCC=$GCC
--GCC=
--CC=${RC-"windres"}
--compiler=$CC
--_LT_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
--_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+-# Object file extension for compiled Java test sources.
+-objext=o
+-_LT_TAGVAR(objext, $1)=$objext
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
  
--if test -n "$compiler"; then
--  :
--  _LT_CONFIG($1)
--fi
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}"
  
--GCC=$lt_save_GCC
--AC_LANG_RESTORE
--CC="$lt_save_CC"
--])# _LT_LANG_RC_CONFIG
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
 +# _LT_ENABLE_SHARED([DEFAULT])
 +# ----------------------------
 +# implement the --enable-shared flag, and supports the `shared' and
@@ -11365,52 +9340,62 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +      ;;
 +    esac],
 +    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-+
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_TAG_COMPILER
 +    _LT_DECL([build_libtool_libs], [enable_shared], [0],
 +	[Whether or not to build shared libraries])
 +])# _LT_ENABLE_SHARED
  
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
 +LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
 +LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
  
--# 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 "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
--      AC_SUBST(GCJFLAGS)])])[]dnl
-+# Old names:
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
- ])
- 
--# Old name:
--AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-lt_save_GCC=$GCC
+-GCC=yes
+-CC=${GCJ-"gcj"}
+-compiler=$CC
+-_LT_TAGVAR(compiler, $1)=$CC
+-_LT_TAGVAR(LD, $1)="$LD"
+-_LT_CC_BASENAME([$compiler])
++# Old names:
++AC_DEFUN([AC_ENABLE_SHARED],
++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
++])
+ 
+-# GCJ did not exist at the time GCC didn't implicitly link libc in.
+-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +AC_DEFUN([AC_DISABLE_SHARED],
 +[_LT_SET_OPTION([LT_INIT], [disable-shared])
 +])
-+
+ 
+-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
 +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([LT_AC_PROG_GCJ], [])
+ 
+-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)
++dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AM_ENABLE_SHARED], [])
 +dnl AC_DEFUN([AM_DISABLE_SHARED], [])
  
+-  _LT_CONFIG($1)
+-fi
  
--# LT_PROG_RC
--# ----------
--AC_DEFUN([LT_PROG_RC],
--[AC_CHECK_TOOL(RC, windres,)
--])
+-AC_LANG_RESTORE
  
--# Old name:
--AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([LT_AC_PROG_RC], [])
+-GCC=$lt_save_GCC
+-CC="$lt_save_CC"
+-])# _LT_LANG_GCJ_CONFIG
 +# _LT_ENABLE_STATIC([DEFAULT])
 +# ----------------------------
 +# implement the --enable-static flag, and support the `static' and
@@ -11444,6 +9429,172 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	[Whether or not to build static libraries])
 +])# _LT_ENABLE_STATIC
  
+-# _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
++LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
++LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+ 
+-# Source file extension for RC test sources.
+-ac_ext=rc
++# Old names:
++AC_DEFUN([AC_ENABLE_STATIC],
++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
++])
+ 
+-# Object file extension for compiled RC test sources.
+-objext=o
+-_LT_TAGVAR(objext, $1)=$objext
++AC_DEFUN([AC_DISABLE_STATIC],
++[_LT_SET_OPTION([LT_INIT], [disable-static])
++])
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
++AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
++AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="$lt_simple_compile_test_code"
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AM_ENABLE_STATIC], [])
++dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+ 
+-# 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
+-GCC=
+-CC=${RC-"windres"}
+-compiler=$CC
+-_LT_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
+-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++# _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)
+ 
+-if test -n "$compiler"; then
+-  :
+-  _LT_CONFIG($1)
+-fi
++_LT_DECL([fast_install], [enable_fast_install], [0],
++	 [Whether or not to optimize for fast installation])dnl
++])# _LT_ENABLE_FAST_INSTALL
+ 
+-GCC=$lt_save_GCC
+-AC_LANG_RESTORE
+-CC="$lt_save_CC"
+-])# _LT_LANG_RC_CONFIG
++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.])
++])
+ 
+-# 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 "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+-      AC_SUBST(GCJFLAGS)])])[]dnl
++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.])
+ ])
+ 
+-# Old name:
+-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+ dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
++dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
++dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+ 
+ 
+-# LT_PROG_RC
+-# ----------
+-AC_DEFUN([LT_PROG_RC],
+-[AC_CHECK_TOOL(RC, windres,)
+-])
++# _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],
++	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
++    [pic_mode="$withval"],
++    [pic_mode=default])
++
++test -z "$pic_mode" && 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_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
++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([LT_AC_PROG_RC], [])
++dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+ 
+ 
 -# _LT_DECL_EGREP
 -# --------------
 -# If we don't have a new enough Autoconf to choose the best grep
@@ -11458,13 +9609,19 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
 -AC_SUBST([GREP])
 -])
-+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
++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])])
  
-+# Old names:
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-+])
++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])])
  
 -# _LT_DECL_OBJDUMP
 -# --------------
@@ -11475,12 +9632,17 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -test -z "$OBJDUMP" && OBJDUMP=objdump
 -_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
 -AC_SUBST([OBJDUMP])
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], [disable-static])
- ])
+-])
++# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
++#
++# Copyright (C) 2004, 2005, 2007, 2008 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.
  
-+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
++# serial 6 ltsugar.m4
  
 -# _LT_DECL_SED
 -# ------------
@@ -11494,9 +9656,8 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
 -    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
 -])# _LT_DECL_SED
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
++# This is to help aclocal find these macros, as it can't see m4_define.
++AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
  
 -m4_ifndef([AC_PROG_SED], [
 -# NOTE: This macro has been submitted for inclusion into   #
@@ -11553,70 +9714,43 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -    fi
 -  done
 -done
-+
-+# _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.])
- ])
+-])
 -SED=$lt_cv_path_SED
 -AC_SUBST([SED])
 -AC_MSG_RESULT([$SED])
 -])#AC_PROG_SED
 -])#m4_ifndef
++# 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($@)))])])
  
 -# Old name:
 -AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
- dnl aclocal-1.4 backwards compatibility:
+-dnl aclocal-1.4 backwards compatibility:
 -dnl AC_DEFUN([LT_AC_PROG_SED], [])
-+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
  
++# 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_CHECK_SHELL_FEATURES
 -# ------------------------
@@ -11634,17 +9768,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  && xsi_shell=yes
 -AC_MSG_RESULT([$xsi_shell])
 -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-+# _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],
-+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-+    [pic_mode="$withval"],
-+    [pic_mode=default])
  
 -AC_MSG_CHECKING([whether the shell understands "+="])
 -lt_shell_append=no
@@ -11653,7 +9776,19 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  && lt_shell_append=yes
 -AC_MSG_RESULT([$lt_shell_append])
 -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
++# 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])])
  
 -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 -  lt_unset=unset
@@ -11661,8 +9796,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  lt_unset=false
 -fi
 -_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-+])# _LT_WITH_PIC
  
 -# test EBCDIC or ASCII
 -case `echo X|tr X '\101'` in
@@ -11679,16 +9812,20 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -_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_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.])
-+])
++# 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_PROG_XSI_SHELLFNS
 -# ---------------------
@@ -11697,8 +9834,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -[case $xsi_shell in
 -  yes)
 -    cat << \_LT_EOF >> "$cfgfile"
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
  
 -# func_dirname file append nondir_replacement
 -# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
@@ -11710,19 +9845,22 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -    *  ) func_dirname_result="${3}" ;;
 -  esac
 -}
++# 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])])
  
 -# func_basename file
 -func_basename ()
 -{
 -  func_basename_result="${1##*/}"
 -}
-+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])])
  
 -# func_dirname_and_basename file append nondir_replacement
 -# perform func_basename and func_dirname in a single function
@@ -11744,11 +9882,10 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  esac
 -  func_basename_result="${1##*/}"
 -}
-+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])])
++# lt_dict_add(DICT, KEY, VALUE)
++# -----------------------------
++m4_define([lt_dict_add],
++[m4_define([$1($2)], [$3])])
  
 -# func_stripname prefix suffix name
 -# strip PREFIX and SUFFIX off of NAME.
@@ -11763,14 +9900,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  func_stripname_result=${func_stripname_result#"${1}"}
 -  func_stripname_result=${func_stripname_result%"${2}"}
 -}
-+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-+#
-+# Copyright (C) 2004, 2005, 2007, 2008 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.
  
 -# func_opt_split
 -func_opt_split ()
@@ -11778,7 +9907,10 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -  func_opt_split_opt=${1%%=*}
 -  func_opt_split_arg=${1#*=}
 -}
-+# serial 6 ltsugar.m4
++# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
++# --------------------------------------------
++m4_define([lt_dict_add_subkey],
++[m4_define([$1($2:$3)], [$4])])
  
 -# func_lo2o object
 -func_lo2o ()
@@ -11788,33 +9920,24 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -    *)    func_lo2o_result=${1} ;;
 -  esac
 -}
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
  
 -# func_xform libobj-or-source
 -func_xform ()
 -{
 -  func_xform_result=${1%.*}.lo
 -}
++# 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)])]))])
  
 -# func_arith arithmetic-term...
 -func_arith ()
 -{
 -  func_arith_result=$(( $[*] ))
 -}
-+# 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($@)))])])
  
 -# func_len string
 -# STRING may not start with a hyphen.
@@ -11822,23 +9945,17 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -{
 -  func_len_result=${#1}
 -}
++# 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_EOF
 -    ;;
 -  *) # Bourne compatible functions.
 -    cat << \_LT_EOF >> "$cfgfile"
-+# 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)
  
 -# func_dirname file append nondir_replacement
 -# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
@@ -11853,29 +9970,55 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -    func_dirname_result="$func_dirname_result${2}"
 -  fi
 -}
++# 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
++])
  
 -# func_basename file
 -func_basename ()
 -{
 -  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
 -}
-+# 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).
++# ltversion.m4 -- version numbers			-*- Autoconf -*-
 +#
-+# 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])])
++#   Copyright (C) 2004 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.
++
++# Generated from ltversion.in.
++
++# serial 3017 ltversion.m4
++# This file is part of GNU Libtool
++
++m4_define([LT_PACKAGE_VERSION], [2.2.6b])
++m4_define([LT_PACKAGE_REVISION], [1.3017])
++
++AC_DEFUN([LTVERSION_VERSION],
++[macro_version='2.2.6b'
++macro_revision='1.3017'
++_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
++_LT_DECL(, macro_revision, 0)
++])
  
 -dnl func_dirname_and_basename
 -dnl A portable version of this function is already defined in general.m4sh
 -dnl so there is no need for it here.
++# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
++#
++#   Copyright (C) 2004, 2005, 2007 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.
  
 -# func_stripname prefix suffix name
 -# strip PREFIX and SUFFIX off of NAME.
@@ -11892,181 +10035,11 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
 -  esac
 -}
++# serial 4 lt~obsolete.m4
  
 -# sed scripts:
 -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
 -my_sed_long_arg='1s/^-[[^=]]*=//'
-+# 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])])
- 
--# func_opt_split
--func_opt_split ()
--{
--  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
--  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
--}
- 
--# func_lo2o object
--func_lo2o ()
--{
--  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
--}
-+# lt_dict_add(DICT, KEY, VALUE)
-+# -----------------------------
-+m4_define([lt_dict_add],
-+[m4_define([$1($2)], [$3])])
- 
--# func_xform libobj-or-source
--func_xform ()
--{
--  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
--}
- 
--# func_arith arithmetic-term...
--func_arith ()
--{
--  func_arith_result=`expr "$[@]"`
--}
-+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-+# --------------------------------------------
-+m4_define([lt_dict_add_subkey],
-+[m4_define([$1($2:$3)], [$4])])
- 
--# func_len string
--# STRING may not start with a hyphen.
--func_len ()
--{
--  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
--}
- 
--_LT_EOF
--esac
-+# 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)])]))])
- 
--case $lt_shell_append in
--  yes)
--    cat << \_LT_EOF >> "$cfgfile"
- 
--# func_append var value
--# Append VALUE to the end of shell variable VAR.
--func_append ()
--{
--  eval "$[1]+=\$[2]"
--}
--_LT_EOF
--    ;;
--  *)
--    cat << \_LT_EOF >> "$cfgfile"
-+# 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])])
- 
--# func_append var value
--# Append VALUE to the end of shell variable VAR.
--func_append ()
--{
--  eval "$[1]=\$$[1]\$[2]"
--}
- 
--_LT_EOF
--    ;;
--  esac
-+# 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
- ])
- 
--# Helper functions for option handling.                    -*- Autoconf -*-
-+# ltversion.m4 -- version numbers			-*- Autoconf -*-
- #
--#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
--#   Written by Gary V. Vaughan, 2004
-+#   Copyright (C) 2004 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 6 ltoptions.m4
-+# Generated from ltversion.in.
- 
--# This is to help aclocal find these macros, as it can't see m4_define.
--AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-+# serial 3012 ltversion.m4
-+# This file is part of GNU Libtool
-+
-+m4_define([LT_PACKAGE_VERSION], [2.2.6])
-+m4_define([LT_PACKAGE_REVISION], [1.3012])
- 
-+AC_DEFUN([LTVERSION_VERSION],
-+[macro_version='2.2.6'
-+macro_revision='1.3012'
-+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-+_LT_DECL(, macro_revision, 0)
-+])
- 
--# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
--# ------------------------------------------
--m4_define([_LT_MANGLE_OPTION],
--[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-+#
-+#   Copyright (C) 2004, 2005, 2007 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 4 lt~obsolete.m4
- 
--# _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
--])
 +# These exist entirely to fool aclocal when bootstrapping libtool.
 +#
 +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
@@ -12090,14 +10063,20 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +# we give up compatibility with versions before 1.7, at which point
 +# we need to keep only those names which we still refer to.
  
+-# func_opt_split
+-func_opt_split ()
+-{
+-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
+-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+-}
 +# This is to help aclocal find these macros, as it can't see m4_define.
 +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
  
--# _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])])
+-# func_lo2o object
+-func_lo2o ()
+-{
+-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+-}
 +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])])
@@ -12154,35 +10133,41 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 +m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
  
+-# func_xform libobj-or-source
+-func_xform ()
+-{
+-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
+-}
 +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  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.
  
--# _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
+-# func_arith arithmetic-term...
+-func_arith ()
+-{
+-  func_arith_result=`expr "$[@]"`
+-}
 +# 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.10'
++[am__api_version='1.11'
 +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.10.2], [],
++m4_if([$1], [1.11], [],
 +      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
++])
  
+-# func_len string
+-# STRING may not start with a hyphen.
+-func_len ()
+-{
+-  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
+-}
 +# _AM_AUTOCONF_VERSION(VERSION)
 +# -----------------------------
 +# aclocal traces this macro to find the Autoconf version.
@@ -12190,54 +10175,45 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +# the logic in aclocal, which can simply ignore this definition.
 +m4_define([_AM_AUTOCONF_VERSION], [])
  
--# _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)])
+-_LT_EOF
+-esac
 +# 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.10.2])dnl
++[AM_AUTOMAKE_VERSION([1.11])dnl
 +m4_ifndef([AC_AUTOCONF_VERSION],
 +  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
  
--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_SET_OPTIONS
+-case $lt_shell_append in
+-  yes)
+-    cat << \_LT_EOF >> "$cfgfile"
 +# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
  
+-# func_append var value
+-# Append VALUE to the end of shell variable VAR.
+-func_append ()
+-{
+-  eval "$[1]+=\$[2]"
+-}
+-_LT_EOF
+-    ;;
+-  *)
+-    cat << \_LT_EOF >> "$cfgfile"
 +# Copyright (C) 2001, 2003, 2005  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.
  
+-# func_append var value
+-# Append VALUE to the end of shell variable VAR.
+-func_append ()
+-{
+-  eval "$[1]=\$$[1]\$[2]"
+-}
 +# 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/../..'.
@@ -12276,37 +10252,31 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +# absolute PATH.  The drawback is that using absolute paths prevent a
 +# configured tree to be moved without reconfiguration.
  
--# _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_EOF
+-    ;;
+-  esac
 +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`
-+])
+ ])
  
+-# Helper functions for option handling.                    -*- Autoconf -*-
+-#
+-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+-#   Written by Gary V. Vaughan, 2004
 +# AM_CONDITIONAL                                            -*- Autoconf -*-
- 
--# 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
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
++
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
 +# 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.
- 
-+# serial 8
- 
--# dlopen
--# ------
--LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
--])
++
++# serial 9
++
 +# AM_CONDITIONAL(NAME, SHELL-CONDITION)
 +# -------------------------------------
 +# Define a conditional.
@@ -12318,6 +10288,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +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='#'
@@ -12330,43 +10301,33 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  AC_MSG_ERROR([[conditional "$1" was never defined.
 +Usually this means the macro was only invoked conditionally.]])
 +fi])])
- 
--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.])
--])
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
++
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
 +# 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 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 aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-+# serial 9
+-# serial 6 ltoptions.m4
++# serial 10
  
+-# This is to help aclocal find these macros, as it can't see m4_define.
+-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
 +# 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...
  
--# 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
+-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+-# ------------------------------------------
+-m4_define([_LT_MANGLE_OPTION],
+-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
 +# _AM_DEPENDENCIES(NAME)
 +# ----------------------
 +# See how the compiler implements dependency checking.
@@ -12383,8 +10344,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 +AC_REQUIRE([AM_DEP_TRACK])dnl
  
--test -z "$AS" && AS=as
--_LT_DECL([], [AS],      [0], [Assembler program])dnl
 +ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
 +       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
 +       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
@@ -12392,8 +10351,17 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
 +                   [depcc="$$1"   am_compiler_list=])
  
--test -z "$DLLTOOL" && DLLTOOL=dlltool
--_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+-# _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
+-])
 +AC_CACHE_CHECK([dependency style of $depcc],
 +               [am_cv_$1_dependencies_compiler_type],
 +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -12415,13 +10383,25 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  # directory.
 +  mkdir sub
  
--test -z "$OBJDUMP" && OBJDUMP=objdump
--_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
--])# win32-dll
 +  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])
+ 
+-# _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])])
 +  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
@@ -12438,8 +10418,18 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +      touch 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
@@ -12449,19 +10439,23 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +	break
 +      fi
 +      ;;
++    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
-+    # 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.
 +    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       source=sub/conftest.c object=$am__obj \
 +       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++       $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 sub/conftest.${OBJEXT-o} 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
@@ -12478,12 +10472,16 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +    fi
 +  done
  
--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.])
+-# _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
 +  cd ..
 +  rm -rf conftest.dir
 +else
@@ -12496,9 +10494,38 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
  ])
  
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
  
+-# _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_SET_OPTIONS
 +# AM_SET_DEPDIR
 +# -------------
 +# Choose a directory name for dependency files.
@@ -12508,38 +10535,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 +])
  
--# _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
 +# AM_DEP_TRACK
 +# ------------
 +AC_DEFUN([AM_DEP_TRACK],
@@ -12555,14 +10551,12 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 +])
  
--LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
--LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+-# -----------------------------------------
+-m4_define([_LT_MANGLE_DEFUN],
+-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
 +# Generate code to set up dependency tracking.              -*- Autoconf -*-
  
--# Old names:
--AC_DEFUN([AC_ENABLE_SHARED],
--[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
--])
 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
 +# Free Software Foundation, Inc.
 +#
@@ -12570,70 +10564,78 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
  
--AC_DEFUN([AC_DISABLE_SHARED],
--[_LT_SET_OPTION([LT_INIT], [disable-shared])
--])
-+#serial 4
+-# 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
++#serial 5
  
--AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
--AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
 +# _AM_OUTPUT_DEPENDENCY_COMMANDS
 +# ------------------------------
 +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[# Autoconf 2.62 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"`
-+  # When using ansi2knr, U may be empty or an underscore; expand it
-+  U=`sed -n 's/^U = //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' -e 's/\$U/'"$U"'/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"
++[{
++  # Autoconf 2.62 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"`
++    # When using ansi2knr, U may be empty or an underscore; expand it
++    U=`sed -n 's/^U = //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' -e 's/\$U/'"$U"'/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
-+done
++}
 +])# _AM_OUTPUT_DEPENDENCY_COMMANDS
  
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AM_ENABLE_SHARED], [])
--dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+-# 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.])
 +# AM_OUTPUT_DEPENDENCY_COMMANDS
 +# -----------------------------
 +# This macro should only be invoked once -- use via AC_REQUIRE.
@@ -12645,8 +10647,17 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +[AC_CONFIG_COMMANDS([depfiles],
 +     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
 +     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-+])
+ ])
  
+-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
 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
 +# Free Software Foundation, Inc.
 +#
@@ -12654,70 +10665,48 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
  
--# _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)
+-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
 +# serial 8
  
--    _LT_DECL([build_old_libs], [enable_static], [0],
--	[Whether or not to build static libraries])
--])# _LT_ENABLE_STATIC
+-test -z "$AS" && AS=as
+-_LT_DECL([], [AS],      [0], [Assembler program])dnl
 +# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
 +AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
  
--LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
--LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
+-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
 +# Do all the work for Automake.                             -*- Autoconf -*-
  
--# Old names:
--AC_DEFUN([AC_ENABLE_STATIC],
--[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
--])
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+-])# win32-dll
 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006, 2008 Free Software Foundation, Inc.
++# 2005, 2006, 2008, 2009 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([AC_DISABLE_STATIC],
--[_LT_SET_OPTION([LT_INIT], [disable-static])
+-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.])
 -])
-+# serial 13
++# serial 16
  
--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([AC_LIBTOOL_WIN32_DLL], [])
 +# 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 aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AM_ENABLE_STATIC], [])
--dnl AC_DEFUN([AM_DISABLE_STATIC], [])
 +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 +# AM_INIT_AUTOMAKE([OPTIONS])
 +# -----------------------------------------------
@@ -12730,7 +10719,7 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +# 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.60])dnl
++[AC_PREREQ([2.62])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
@@ -12746,6 +10735,34 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  fi
 +fi
  
+-# _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)
 +# test whether we have cygpath
 +if test -z "$CYGPATH_W"; then
 +  if (cygpath --version) >/dev/null 2>/dev/null; then
@@ -12756,6 +10773,9 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +fi
 +AC_SUBST([CYGPATH_W])
  
+-    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+-	[Whether or not to build shared libraries])
+-])# _LT_ENABLE_SHARED
 +# Define the identity of the package.
 +dnl Distinguish between old-style and new-style calls.
 +m4_ifval([$2],
@@ -12769,41 +10789,15 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
 + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
  
--# _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_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
 +_AM_IF_OPTION([no-define],,
 +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
 + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
  
--_LT_DECL([fast_install], [enable_fast_install], [0],
--	 [Whether or not to optimize for fast installation])dnl
--])# _LT_ENABLE_FAST_INSTALL
+-# Old names:
+-AC_DEFUN([AC_ENABLE_SHARED],
+-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
 +# Some tools Automake needs.
 +AC_REQUIRE([AM_SANITY_CHECK])dnl
 +AC_REQUIRE([AC_ARG_PROGRAM])dnl
@@ -12812,8 +10806,8 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
 +AM_MISSING_PROG(AUTOHEADER, autoheader)
 +AM_MISSING_PROG(MAKEINFO, makeinfo)
-+AM_PROG_INSTALL_SH
-+AM_PROG_INSTALL_STRIP
++AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
++AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 +AC_REQUIRE([AM_PROG_MKDIR_P])dnl
 +# We need awk for the "check" target.  The system "awk" is bad on
 +# some platforms.
@@ -12821,44 +10815,79 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +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([tar-pax], [_AM_PROG_TAR([pax])],
++			     [_AM_PROG_TAR([v7])])])
 +_AM_IF_OPTION([no-dependencies],,
 +[AC_PROVIDE_IFELSE([AC_PROG_CC],
-+                  [_AM_DEPENDENCIES(CC)],
-+                  [define([AC_PROG_CC],
-+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
++		  [_AM_DEPENDENCIES(CC)],
++		  [define([AC_PROG_CC],
++			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
 +AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+                  [_AM_DEPENDENCIES(CXX)],
-+                  [define([AC_PROG_CXX],
-+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++		  [_AM_DEPENDENCIES(CXX)],
++		  [define([AC_PROG_CXX],
++			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 +AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-+                  [_AM_DEPENDENCIES(OBJC)],
-+                  [define([AC_PROG_OBJC],
-+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-+])
-+])
++		  [_AM_DEPENDENCIES(OBJC)],
++		  [define([AC_PROG_OBJC],
++			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ ])
+-
+-AC_DEFUN([AC_DISABLE_SHARED],
+-[_LT_SET_OPTION([LT_INIT], [disable-shared])
++_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
++dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
++dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
++dnl 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
+ ])
+ 
+-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], [])
++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])])
  
--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.])
--])
 +# 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.
  
--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.])
--])
+-# _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)
 +# 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.
@@ -12876,45 +10905,49 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +done
 +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
  
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
--dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+-    _LT_DECL([build_old_libs], [enable_static], [0],
+-	[Whether or not to build static libraries])
+-])# _LT_ENABLE_STATIC
++# Copyright (C) 2001, 2003, 2005, 2008  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.
  
+-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
 +# AM_PROG_INSTALL_SH
 +# ------------------
 +# Define $install_sh.
 +AC_DEFUN([AM_PROG_INSTALL_SH],
 +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
++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)])
  
--# _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],
--	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
--    [pic_mode="$withval"],
--    [pic_mode=default])
+-# Old names:
+-AC_DEFUN([AC_ENABLE_STATIC],
+-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+-])
 +# Copyright (C) 2003, 2005  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.
  
--test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+-AC_DEFUN([AC_DISABLE_STATIC],
+-[_LT_SET_OPTION([LT_INIT], [disable-static])
+-])
 +# serial 2
  
--_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
--])# _LT_WITH_PIC
+-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
 +# Check whether the underlying file-system supports filenames
 +# with a leading dot.  For instance MS-DOS doesn't.
 +AC_DEFUN([AM_SET_LEADING_DOT],
@@ -12928,84 +10961,143 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +rmdir .tst 2>/dev/null
 +AC_SUBST([am__leading_dot])])
  
--LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
--LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
 +# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 +# From Jim Meyering
  
--# 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.])
--])
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
 +# 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 aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-+# serial 4
- 
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+  dnl maintainer-mode is disabled by default
-+  AC_ARG_ENABLE(maintainer-mode,
-+[  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer],
-+      USE_MAINTAINER_MODE=$enableval,
-+      USE_MAINTAINER_MODE=no)
-+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  AC_SUBST(MAINT)dnl
-+]
-+)
- 
--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])])
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
- 
--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])])
-+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
- 
--# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
--#
--# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
--# Written by Gary V. Vaughan, 2004
-+# Copyright (C) 2001, 2002, 2003, 2005  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 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
  
--# serial 6 ltsugar.m4
-+# serial 3
-+
-+# AM_MAKE_INCLUDE()
+-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
++# AM_MAINTAINER_MODE([DEFAULT-MODE])
+ # ----------------------------------
+-# 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], [])
+-
++# Control maintainer-specific portions of Makefiles.
++# Default is to disable them, unless `enable' is passed literally.
++# For symmetry, `disable' may be passed as well.  Anyway, the user
++# can override the default with the --enable/--disable switch.
++AC_DEFUN([AM_MAINTAINER_MODE],
++[m4_case(m4_default([$1], [disable]),
++       [enable], [m4_define([am_maintainer_other], [disable])],
++       [disable], [m4_define([am_maintainer_other], [enable])],
++       [m4_define([am_maintainer_other], [enable])
++        m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
++AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
++  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
++  AC_ARG_ENABLE([maintainer-mode],
++[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
++			  (and sometimes confusing) to the casual installer],
++      [USE_MAINTAINER_MODE=$enableval],
++      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
++  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
++  MAINT=$MAINTAINER_MODE_TRUE
++  AC_SUBST([MAINT])dnl
++]
++)
+ 
+-# _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],
+-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+-    [pic_mode="$withval"],
+-    [pic_mode=default])
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+ 
+-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
++# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+ 
+-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+-])# _LT_WITH_PIC
++# Copyright (C) 2001, 2002, 2003, 2005, 2009  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.
+ 
+-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
++# serial 4
+ 
+-# 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.])
++# 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 done
++	@echo this is the am__doit target
 +.PHONY: am__doit
 +END
 +# If we don't find an include directive, just comment out the code.
@@ -13015,42 +11107,77 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +_am_result=none
 +# First try GNU make style include.
 +echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+   am__include=include
-+   am__quote=
-+   _am_result=GNU
-+fi
++# 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
-+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+      am__include=.include
-+      am__quote="\""
-+      _am_result=BSD
-+   fi
++   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
-+])
+ ])
  
--# This is to help aclocal find these macros, as it can't see m4_define.
--AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+-dnl aclocal-1.4 backwards compatibility:
+-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+-
+-
+-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])])
 +# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
  
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+-#
+-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+-# Written by Gary V. Vaughan, 2004
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
 +# 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 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
++# serial 6
+ 
+-# This is to help aclocal find these macros, as it can't see m4_define.
+-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
++# 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)])
+ 
+ 
 -# lt_join(SEP, ARG1, [ARG2...])
 -# -----------------------------
 -# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
@@ -13064,28 +11191,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -m4_define([_lt_join],
 -[m4_if([$#$2], [2], [],
 -       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-+# serial 5
- 
-+# 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)])
- 
--# 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)
- 
 +# AM_MISSING_HAS_RUN
 +# ------------------
 +# Define MISSING if not defined so far and test if it supports --run.
@@ -13093,7 +11198,14 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +AC_DEFUN([AM_MISSING_HAS_RUN],
 +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 +AC_REQUIRE_AUX_FILE([missing])dnl
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++if test x"${MISSING+set}" != xset; then
++  case $am_aux_dir in
++  *\ * | *\	*)
++    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
++  *)
++    MISSING="\${SHELL} $am_aux_dir/missing" ;;
++  esac
++fi
 +# Use eval to expand $SHELL
 +if eval "$MISSING --run true"; then
 +  am_missing_run="$MISSING --run "
@@ -13103,25 +11215,24 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +fi
 +])
  
--# 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).
 +# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- #
--# 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])])
--
++#
 +# 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.
  
+-# 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)
 +# AM_PROG_MKDIR_P
 +# ---------------
 +# Check for `mkdir -p'.
@@ -13142,6 +11253,29 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +esac
 +])
  
++# Helper functions for option handling.                     -*- Autoconf -*-
+ 
+-# 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).
++# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+ #
+-# 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])])
+-
++# 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 4
+ 
 -# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
 -# ----------------------------------------------------------
 -# Produce a SEP delimited list of all paired combinations of elements of
@@ -13155,13 +11289,16 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -	     [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])])])])])
-+# Helper functions for option handling.                     -*- Autoconf -*-
++# _AM_MANGLE_OPTION(NAME)
++# -----------------------
++AC_DEFUN([_AM_MANGLE_OPTION],
++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
  
-+# Copyright (C) 2001, 2002, 2003, 2005, 2008  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_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)])
  
 -# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
 -# -----------------------------------------------------------------------
@@ -13173,62 +11310,37 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -		 [lt_append([$1], [$2], [$3])$4],
 -		 [$5])],
 -	  [lt_append([$1], [$2], [$3])$4])])
-+# serial 4
- 
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
- 
--# lt_dict_add(DICT, KEY, VALUE)
--# -----------------------------
--m4_define([lt_dict_add],
--[m4_define([$1($2)], [$3])])
-+# _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)])])
  
--# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
--# --------------------------------------------
--m4_define([lt_dict_add_subkey],
--[m4_define([$1($2:$3)], [$4])])
 +# _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])])
  
-+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
- 
--# 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)])]))])
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+-# lt_dict_add(DICT, KEY, VALUE)
+-# -----------------------------
+-m4_define([lt_dict_add],
+-[m4_define([$1($2)], [$3])])
++# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+ 
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
 +# 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.
  
-+# serial 4
+-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+-# --------------------------------------------
+-m4_define([lt_dict_add_subkey],
+-[m4_define([$1($2:$3)], [$4])])
++# serial 5
  
--# 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])])
 +# AM_SANITY_CHECK
 +# ---------------
 +AC_DEFUN([AM_SANITY_CHECK],
@@ -13236,16 +11348,35 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +# Just in case
 +sleep 1
 +echo timestamp > conftest.file
++# Reject unsafe characters in $srcdir or the absolute working directory
++# name.  Accept space and tab only in the latter.
++am_lf='
++'
++case `pwd` in
++  *[[\\\"\#\$\&\'\`$am_lf]]*)
++    AC_MSG_ERROR([unsafe absolute working directory name]);;
++esac
++case $srcdir in
++  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
++    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
++esac
+ 
+-# 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)])]))])
 +# Do `set' in a subshell so we don't clobber the current shell's
 +# arguments.  Must try -L first in case configure is actually a
 +# symlink; some systems play weird games with the mod time of symlinks
 +# (eg FreeBSD returns the mod time of the symlink's containing
 +# directory).
 +if (
-+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++   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`
++      set X `ls -t "$srcdir/configure" conftest.file`
 +   fi
 +   rm -f conftest.file
 +   if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -13259,14 +11390,12 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +alias in your environment])
 +   fi
  
--# 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
--])
+-# 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])])
 +   test "$[2]" = conftest.file
 +   )
 +then
@@ -13278,20 +11407,20 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +fi
 +AC_MSG_RESULT(yes)])
  
--# ltversion.m4 -- version numbers			-*- Autoconf -*-
--#
--#   Copyright (C) 2004 Free Software Foundation, Inc.
--#   Written by Scott James Remnant, 2004
 +# Copyright (C) 2001, 2003, 2005  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 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.
  
--# Generated from ltversion.in.
+-# 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
+-])
 +# AM_PROG_INSTALL_STRIP
 +# ---------------------
 +# One issue with vendor `install' (even GNU) is that you can't
@@ -13314,22 +11443,37 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 +AC_SUBST([INSTALL_STRIP_PROGRAM])])
  
--# serial 3012 ltversion.m4
--# This file is part of GNU Libtool
-+# Copyright (C) 2006  Free Software Foundation, Inc.
-+#
+-# ltversion.m4 -- version numbers			-*- Autoconf -*-
+-#
+-#   Copyright (C) 2004 Free Software Foundation, Inc.
+-#   Written by Scott James Remnant, 2004
++# Copyright (C) 2006, 2008  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 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_PACKAGE_VERSION], [2.2.6])
--m4_define([LT_PACKAGE_REVISION], [1.3012])
+-# Generated from ltversion.in.
++# serial 2
+ 
+-# serial 3012 ltversion.m4
+-# This file is part of GNU Libtool
 +# _AM_SUBST_NOTMAKE(VARIABLE)
 +# ---------------------------
 +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 +# This macro is traced by Automake.
 +AC_DEFUN([_AM_SUBST_NOTMAKE])
  
+-m4_define([LT_PACKAGE_VERSION], [2.2.6])
+-m4_define([LT_PACKAGE_REVISION], [1.3012])
++# AM_SUBST_NOTMAKE(VARIABLE)
++# ---------------------------
++# Public sister of _AM_SUBST_NOTMAKE.
++AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+ 
 -AC_DEFUN([LTVERSION_VERSION],
 -[macro_version='2.2.6'
 -macro_revision='1.3012'
@@ -13384,10 +11528,65 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -# 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.
--
++# 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.
++AM_MISSING_PROG([AMTAR], [tar])
++m4_if([$1], [v7],
++     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
++     [m4_case([$1], [ustar],, [pax],,
++              [m4_fatal([Unknown tar format])])
++AC_MSG_CHECKING([how to create a $1 tar archive])
++# Loop over all known methods to create a tar archive until one works.
++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
++_am_tools=${am_cv_prog_tar_$1-$_am_tools}
++# Do not fold the above two line into one, because Tru64 sh and
++# Solaris sh will not grok spaces in the rhs of `-'.
++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
+ 
 -# This is to help aclocal find these macros, as it can't see m4_define.
 -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
--
++  # 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
+ 
 -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])])
@@ -13443,111 +11642,6 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 -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])])
--
--AC_DEFUN([LT_AC_PROG_GCJ],
--[AC_CHECK_TOOL(GCJ, gcj, no)
--  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
--  AC_SUBST(GCJFLAGS)
--])
--
--AC_DEFUN([LT_AC_PROG_RC],
--[AC_CHECK_TOOL(RC, windres, no)
--])
--
--# 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.                               #
--# LT_AC_PROG_SED
--# --------------
--# Check for a fully-functional sed program, that truncates
--# as few characters as possible.  Prefer GNU sed if found.
--AC_DEFUN([LT_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
-+# 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.
-+AM_MISSING_PROG([AMTAR], [tar])
-+m4_if([$1], [v7],
-+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-+     [m4_case([$1], [ustar],, [pax],,
-+              [m4_fatal([Unknown tar format])])
-+AC_MSG_CHECKING([how to create a $1 tar archive])
-+# Loop over all known methods to create a tar archive until one works.
-+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-+# Do not fold the above two line into one, because Tru64 sh and
-+# Solaris sh will not grok spaces in the rhs of `-'.
-+for _am_tool in $_am_tools
- 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
-+  case $_am_tool in
-+  gnutar)
-+    for _am_tar in tar gnutar gtar;
-+    do
-+      AM_RUN_LOG([$_am_tar --version]) && break
-     done
--  done
--done
--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
-+    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
@@ -13557,27 +11651,8 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +  if test -s conftest.tar; then
 +    AM_RUN_LOG([$am__untar <conftest.tar])
 +    grep GrepMe conftest.dir/file >/dev/null 2>&1 && 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 $lt_ac_count -gt 10 && 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_MSG_RESULT([$SED])
--])
++  fi
++done
 +rm -rf conftest.dir
 +
 +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
@@ -13586,19 +11661,19 @@ diff -urN hdf5-1.8.3-orig/aclocal.m4 hdf5-1.8.3/aclocal.m4
 +AC_SUBST([am__untar])
 +]) # _AM_PROG_TAR
  
-diff -urN hdf5-1.8.3-orig/bin/config.guess hdf5-1.8.3/bin/config.guess
---- hdf5-1.8.3-orig/bin/config.guess	2009-06-19 12:59:55.000000000 +0200
-+++ hdf5-1.8.3/bin/config.guess	2009-06-19 15:35:22.000000000 +0200
+diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
+--- hdf5-1.8.4.orig/bin/config.guess	2009-11-10 22:12:09.000000000 +0100
++++ hdf5-1.8.4/bin/config.guess	2009-12-21 16:07:59.000000000 +0100
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 -#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 +#   Free Software Foundation, Inc.
  
 -timestamp='2005-12-13'
-+timestamp='2009-04-27'
++timestamp='2009-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
@@ -13613,6 +11688,15 @@ diff -urN hdf5-1.8.3-orig/bin/config.guess hdf5-1.8.3/bin/config.guess
  
  This is free software; see the source for copying conditions.  There is NO
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -106,7 +107,7 @@
+ 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 -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$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 ; } ;
 @@ -160,6 +161,7 @@
  	    arm*) machine=arm-unknown ;;
  	    sh3el) machine=shl-unknown ;;
@@ -13621,6 +11705,15 @@ diff -urN hdf5-1.8.3-orig/bin/config.guess hdf5-1.8.3/bin/config.guess
  	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
  	esac
  	# The Operating System including object format, if it has switched
+@@ -168,7 +170,7 @@
+ 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ 		eval $set_cc_for_build
+ 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+-			| grep __ELF__ >/dev/null
++			| grep -q __ELF__
+ 		then
+ 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ 		    # Return netbsd for either.  FIX?
 @@ -206,8 +208,11 @@
      *:ekkoBSD:*:*)
  	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
@@ -13676,6 +11769,15 @@ diff -urN hdf5-1.8.3-orig/bin/config.guess hdf5-1.8.3/bin/config.guess
  	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
+@@ -635,7 +656,7 @@
+ 	    # => hppa64-hp-hpux11.23
+ 
+ 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+-		grep __LP64__ >/dev/null
++		grep -q __LP64__
+ 	    then
+ 		HP_ARCH="hppa2.0w"
+ 	    else
 @@ -764,12 +785,19 @@
  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
  	exit ;;
@@ -13698,7 +11800,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.guess hdf5-1.8.3/bin/config.guess
  	echo ${UNAME_MACHINE}-pc-mingw32
  	exit ;;
      i*:windows32*:*)
-@@ -779,9 +807,18 @@
+@@ -779,12 +807,24 @@
      i*:PW*:*)
  	echo ${UNAME_MACHINE}-pc-pw32
  	exit ;;
@@ -13720,7 +11822,13 @@ diff -urN hdf5-1.8.3-orig/bin/config.guess hdf5-1.8.3/bin/config.guess
      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
  	echo i${UNAME_MACHINE}-pc-mks
  	exit ;;
-@@ -815,6 +852,16 @@
++    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
+@@ -815,6 +855,16 @@
  	echo ${UNAME_MACHINE}-pc-minix
  	exit ;;
      arm*:Linux:*:*)
@@ -13737,20 +11845,47 @@ diff -urN hdf5-1.8.3-orig/bin/config.guess hdf5-1.8.3/bin/config.guess
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
      cris:Linux:*:*)
-@@ -851,7 +898,11 @@
- 	#endif
- 	#endif
- EOF
+@@ -835,42 +885,27 @@
+     m68*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+-    mips:Linux:*:*)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#undef CPU
+-	#undef mips
+-	#undef mipsel
+-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mipsel
+-	#else
+-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips
+-	#else
+-	CPU=
+-	#endif
+-	#endif
+-EOF
 -	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
-+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+	    /^CPU/{
-+		s: ::g
-+		p
-+	    }'`"
- 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-     mips64:Linux:*:*)
-@@ -870,7 +921,11 @@
+-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+-	;;
+-    mips64:Linux:*:*)
++    mips:Linux:*:* | mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#undef CPU
+-	#undef mips64
+-	#undef mips64el
++	#undef ${UNAME_MACHINE}
++	#undef ${UNAME_MACHINE}el
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mips64el
++	CPU=${UNAME_MACHINE}el
+ 	#else
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips64
++	CPU=${UNAME_MACHINE}
+ 	#else
+ 	CPU=
  	#endif
  	#endif
  EOF
@@ -13763,7 +11898,12 @@ diff -urN hdf5-1.8.3-orig/bin/config.guess hdf5-1.8.3/bin/config.guess
  	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
  	;;
      or32:Linux:*:*)
-@@ -896,6 +951,9 @@
+@@ -892,10 +927,13 @@
+ 	  EV67)  UNAME_MACHINE=alphaev67 ;;
+ 	  EV68*) UNAME_MACHINE=alphaev68 ;;
+         esac
+-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
++	objdump --private-headers /bin/sh | grep -q ld.so.1
  	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
  	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
  	exit ;;
@@ -13773,7 +11913,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.guess hdf5-1.8.3/bin/config.guess
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -925,6 +983,9 @@
+@@ -925,6 +963,9 @@
      x86_64:Linux:*:*)
  	echo x86_64-unknown-linux-gnu
  	exit ;;
@@ -13783,17 +11923,25 @@ diff -urN hdf5-1.8.3-orig/bin/config.guess hdf5-1.8.3/bin/config.guess
      i*86:Linux:*:*)
  	# The BFD linker knows what the default object file format is, so
  	# first see if it will tell us. cd to the root directory to prevent
-@@ -943,9 +1004,6 @@
- 	  a.out-i386-linux)
- 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- 		exit ;;
+@@ -940,17 +981,6 @@
+ 	  elf32-i386)
+ 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ 		;;
+-	  a.out-i386-linux)
+-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+-		exit ;;
 -	  coff-i386)
 -		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 -		exit ;;
- 	  "")
- 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
- 		# one that does not give us useful --help.
-@@ -967,7 +1025,7 @@
+-	  "")
+-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+-		# one that does not give us useful --help.
+-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+-		exit ;;
+ 	esac
+ 	# Determine whether the default compiler is a.out or elf
+ 	eval $set_cc_for_build
+@@ -967,7 +997,7 @@
  	LIBC=gnulibc1
  	# endif
  	#else
@@ -13802,7 +11950,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.guess hdf5-1.8.3/bin/config.guess
  	LIBC=gnu
  	#else
  	LIBC=gnuaout
-@@ -977,7 +1035,11 @@
+@@ -977,7 +1007,11 @@
  	LIBC=dietlibc
  	#endif
  EOF
@@ -13815,7 +11963,16 @@ diff -urN hdf5-1.8.3-orig/bin/config.guess hdf5-1.8.3/bin/config.guess
  	test x"${LIBC}" != x && {
  		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
  		exit
-@@ -1056,8 +1118,11 @@
+@@ -1012,7 +1046,7 @@
+     i*86:syllable:*:*)
+ 	echo ${UNAME_MACHINE}-pc-syllable
+ 	exit ;;
+-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     i*86:*DOS:*:*)
+@@ -1056,8 +1090,11 @@
      pc:*:*:*)
  	# Left here for compatibility:
          # uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -13829,7 +11986,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.guess hdf5-1.8.3/bin/config.guess
          exit ;;
      Intel:Mach:3*:*)
  	echo i386-pc-mach3
-@@ -1095,6 +1160,16 @@
+@@ -1095,6 +1132,16 @@
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
          /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
            && { echo i486-ncr-sysv4; exit; } ;;
@@ -13846,7 +12003,16 @@ diff -urN hdf5-1.8.3-orig/bin/config.guess hdf5-1.8.3/bin/config.guess
      m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
  	echo m68k-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
-@@ -1170,6 +1245,9 @@
+@@ -1107,7 +1154,7 @@
+     rs6000:LynxOS:2.*:*)
+ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ 	exit ;;
+     SM[BE]S:UNIX_SV:*:*)
+@@ -1170,6 +1217,9 @@
      BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
  	echo i586-pc-beos
  	exit ;;
@@ -13856,7 +12022,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.guess hdf5-1.8.3/bin/config.guess
      SX-4:SUPER-UX:*:*)
  	echo sx4-nec-superux${UNAME_RELEASE}
  	exit ;;
-@@ -1179,6 +1257,15 @@
+@@ -1179,6 +1229,15 @@
      SX-6:SUPER-UX:*:*)
  	echo sx6-nec-superux${UNAME_RELEASE}
  	exit ;;
@@ -13872,7 +12038,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.guess hdf5-1.8.3/bin/config.guess
      Power*:Rhapsody:*:*)
  	echo powerpc-apple-rhapsody${UNAME_RELEASE}
  	exit ;;
-@@ -1269,6 +1356,9 @@
+@@ -1269,6 +1328,9 @@
      i*86:rdos:*:*)
  	echo ${UNAME_MACHINE}-pc-rdos
  	exit ;;
@@ -13882,7 +12048,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.guess hdf5-1.8.3/bin/config.guess
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1429,9 +1519,9 @@
+@@ -1429,9 +1491,9 @@
  the operating system you are using. It is advised that you
  download the most up to date version of the config scripts from
  
@@ -13894,19 +12060,19 @@ diff -urN hdf5-1.8.3-orig/bin/config.guess hdf5-1.8.3/bin/config.guess
  
  If the version you run ($0) is already up to date, please
  send the following data and any information you think might be
-diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
---- hdf5-1.8.3-orig/bin/config.sub	2009-06-19 12:59:54.000000000 +0200
-+++ hdf5-1.8.3/bin/config.sub	2009-06-19 15:35:23.000000000 +0200
+diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
+--- hdf5-1.8.4.orig/bin/config.sub	2009-11-10 22:12:09.000000000 +0100
++++ hdf5-1.8.4/bin/config.sub	2009-12-21 16:07:59.000000000 +0100
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Configuration validation subroutine script.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 -#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 +#   Free Software Foundation, Inc.
  
 -timestamp='2005-12-11'
-+timestamp='2009-04-17'
++timestamp='2009-06-11'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
@@ -13929,29 +12095,17 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
    storm-chaos* | os2-emx* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-@@ -176,10 +178,6 @@
- 		os=-sco5v6
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- 		;;
--	-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/'`
-@@ -200,10 +198,6 @@
- 		# Don't forget version if it is 3.2v4 or newer.
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+@@ -151,6 +153,9 @@
+ 		os=
+ 		basic_machine=$1
  		;;
--	-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/'`
-@@ -248,20 +242,24 @@
++        -bluegene*)
++	        os=-cnk
++		;;
+ 	-sim | -cisco | -oki | -wec | -winbond)
+ 		os=
+ 		basic_machine=$1
+@@ -240,20 +245,24 @@
  	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
  	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
  	| am33_2.0 \
@@ -13980,7 +12134,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  	| mips64vr4100 | mips64vr4100el \
  	| mips64vr4300 | mips64vr4300el \
  	| mips64vr5000 | mips64vr5000el \
-@@ -274,26 +272,26 @@
+@@ -266,26 +275,26 @@
  	| mipsisa64sr71k | mipsisa64sr71kel \
  	| mipstx39 | mipstx39el \
  	| mn10200 | mn10300 \
@@ -14016,17 +12170,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  		basic_machine=$basic_machine-unknown
  		;;
  	m6811 | m68hc11 | m6812 | m68hc12)
-@@ -306,9 +304,6 @@
- 	ms1)
- 		basic_machine=mt-unknown
- 		;;
--	ms1)
--		basic_machine=mt-unknown
--		;;
- 
- 	# We use `pc' rather than `unknown'
- 	# because (1) that's what they normally are, and
-@@ -328,25 +323,28 @@
+@@ -317,25 +326,28 @@
  	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
  	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
  	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
@@ -14060,7 +12204,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  	| mips64vr4100-* | mips64vr4100el-* \
  	| mips64vr4300-* | mips64vr4300el-* \
  	| mips64vr5000-* | mips64vr5000el-* \
-@@ -361,28 +359,31 @@
+@@ -350,28 +362,31 @@
  	| mmix-* \
  	| mt-* \
  	| msp430-* \
@@ -14100,7 +12244,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
-@@ -446,6 +447,10 @@
+@@ -435,6 +450,10 @@
  		basic_machine=m68k-apollo
  		os=-bsd
  		;;
@@ -14111,7 +12255,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  	aux)
  		basic_machine=m68k-apple
  		os=-aux
-@@ -454,10 +459,22 @@
+@@ -443,10 +462,26 @@
  		basic_machine=ns32k-sequent
  		os=-dynix
  		;;
@@ -14123,6 +12267,10 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
 +		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		os=-linux
 +		;;
++	bluegene*)
++		basic_machine=powerpc-ibm
++		os=-cnk
++		;;
  	c90)
  		basic_machine=c90-cray
  		os=-unicos
@@ -14134,14 +12282,10 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  	convex-c1)
  		basic_machine=c1-convex
  		os=-bsd
-@@ -486,12 +503,8 @@
+@@ -475,8 +510,8 @@
  		basic_machine=craynv-cray
  		os=-unicosmp
  		;;
--	craynv)
--		basic_machine=craynv-cray
--		os=-unicosmp
--		;;
 -	cr16c)
 -		basic_machine=cr16c-unknown
 +	cr16)
@@ -14149,30 +12293,18 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  		os=-elf
  		;;
  	crds | unos)
-@@ -500,9 +513,6 @@
- 	crisv32 | crisv32-* | etraxfs*)
- 		basic_machine=crisv32-axis
- 		;;
--	crisv32 | crisv32-* | etraxfs*)
--		basic_machine=crisv32-axis
--		;;
- 	cris | cris-* | etrax*)
- 		basic_machine=cris-axis
- 		;;
-@@ -532,9 +542,9 @@
+@@ -514,6 +549,10 @@
  		basic_machine=m88k-motorola
  		os=-sysv3
  		;;
--	djgpp)
--		basic_machine=i586-pc
--		os=-msdosdjgpp
 +	dicos)
 +		basic_machine=i686-pc
 +		os=-dicos
- 		;;
++		;;
  	djgpp)
  		basic_machine=i586-pc
-@@ -690,6 +700,14 @@
+ 		os=-msdosdjgpp
+@@ -668,6 +707,14 @@
  		basic_machine=m68k-isi
  		os=-sysv
  		;;
@@ -14187,7 +12319,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  	m88k-omron*)
  		basic_machine=m88k-omron
  		;;
-@@ -705,6 +723,10 @@
+@@ -683,6 +730,10 @@
  		basic_machine=i386-pc
  		os=-mingw32
  		;;
@@ -14198,17 +12330,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  	miniframe)
  		basic_machine=m68000-convergent
  		;;
-@@ -733,9 +755,6 @@
- 	ms1-*)
- 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
- 		;;
--	ms1-*)
--		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
--		;;
- 	mvs)
- 		basic_machine=i370-ibm
- 		os=-mvs
-@@ -834,6 +853,14 @@
+@@ -809,6 +860,14 @@
  		basic_machine=i860-intel
  		os=-osf
  		;;
@@ -14223,18 +12345,20 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  	pbd)
  		basic_machine=sparc-tti
  		;;
-@@ -909,10 +936,6 @@
- 		basic_machine=i386-pc
- 		os=-rdos
+@@ -818,6 +877,12 @@
+ 	pc532 | pc532-*)
+ 		basic_machine=ns32k-pc532
  		;;
--	rdos)
--		basic_machine=i386-pc
--		os=-rdos
--		;;
- 	rom68k)
- 		basic_machine=m68k-rom68k
- 		os=-coff
-@@ -939,6 +962,10 @@
++	pc98)
++		basic_machine=i386-pc
++		;;
++	pc98-*)
++		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	pentium | p5 | k5 | k6 | nexgen | viac3)
+ 		basic_machine=i586-pc
+ 		;;
+@@ -904,6 +969,10 @@
  	sb1el)
  		basic_machine=mipsisa64sb1el-unknown
  		;;
@@ -14245,7 +12369,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  	sei)
  		basic_machine=mips-sei
  		os=-seiux
-@@ -950,6 +977,9 @@
+@@ -915,6 +984,9 @@
  		basic_machine=sh-hitachi
  		os=-hms
  		;;
@@ -14255,7 +12379,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  	sh64)
  		basic_machine=sh64-unknown
  		;;
-@@ -1039,6 +1069,10 @@
+@@ -1004,6 +1076,10 @@
  		basic_machine=tic6x-unknown
  		os=-coff
  		;;
@@ -14266,18 +12390,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  	tx39)
  		basic_machine=mipstx39-unknown
  		;;
-@@ -1103,10 +1137,6 @@
- 		basic_machine=i686-pc
- 		os=-mingw32
- 		;;
--	xbox)
--		basic_machine=i686-pc
--		os=-mingw32
--		;;
- 	xps | xps100)
- 		basic_machine=xps100-honeywell
- 		;;
-@@ -1118,6 +1148,10 @@
+@@ -1079,6 +1155,10 @@
  		basic_machine=z8k-unknown
  		os=-sim
  		;;
@@ -14288,17 +12401,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  	none)
  		basic_machine=none-none
  		os=-none
-@@ -1140,9 +1174,6 @@
- 	mmix)
- 		basic_machine=mmix-knuth
- 		;;
--	mmix)
--		basic_machine=mmix-knuth
--		;;
- 	rs6000)
- 		basic_machine=rs6000-ibm
- 		;;
-@@ -1159,10 +1190,10 @@
+@@ -1117,10 +1197,10 @@
  	we32k)
  		basic_machine=we32k-att
  		;;
@@ -14311,9 +12414,12 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  		basic_machine=sparc-sun
  		;;
  	cydra)
-@@ -1231,16 +1262,18 @@
+@@ -1187,18 +1267,20 @@
+ 	# 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* | -sunos | -sunos[34]*\
+-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
++	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
  	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
 +	      | -kopensolaris* \
  	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
@@ -14333,7 +12439,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
  	      | -uxpv* | -beos* | -mpeix* | -udk* \
-@@ -1250,7 +1283,7 @@
+@@ -1208,7 +1290,7 @@
  	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
@@ -14342,18 +12448,17 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
-@@ -1380,8 +1413,8 @@
+@@ -1338,6 +1420,9 @@
  	-zvmoe)
  		os=-zvmoe
  		;;
--	-zvmoe)
--		os=-zvmoe
 +	-dicos*)
 +		os=-dicos
- 		;;
++		;;
  	-none)
  		;;
-@@ -1405,6 +1438,12 @@
+ 	*)
+@@ -1360,6 +1445,12 @@
  # system, and we'll never get to this point.
  
  case $basic_machine in
@@ -14366,7 +12471,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  	*-acorn)
  		os=-riscix1.2
  		;;
-@@ -1414,9 +1453,9 @@
+@@ -1369,9 +1460,9 @@
  	arm*-semi)
  		os=-aout
  		;;
@@ -14379,7 +12484,7 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  	# This must come before the *-dec entry.
  	pdp10-*)
  		os=-tops20
-@@ -1442,6 +1481,9 @@
+@@ -1397,6 +1488,9 @@
  	m68*-cisco)
  		os=-aout
  		;;
@@ -14389,34 +12494,57 @@ diff -urN hdf5-1.8.3-orig/bin/config.sub hdf5-1.8.3/bin/config.sub
  	mips*-cisco)
  		os=-elf
  		;;
-diff -urN hdf5-1.8.3-orig/bin/depcomp hdf5-1.8.3/bin/depcomp
---- hdf5-1.8.3-orig/bin/depcomp	2009-05-13 17:03:21.000000000 +0200
-+++ hdf5-1.8.3/bin/depcomp	2009-06-19 15:35:41.000000000 +0200
+@@ -1526,7 +1620,7 @@
+ 			-sunos*)
+ 				vendor=sun
+ 				;;
+-			-aix*)
++			-cnk*|-aix*)
+ 				vendor=ibm
+ 				;;
+ 			-beos*)
+diff -urN hdf5-1.8.4.orig/bin/depcomp hdf5-1.8.4/bin/depcomp
+--- hdf5-1.8.4.orig/bin/depcomp	2009-11-10 22:12:09.000000000 +0100
++++ hdf5-1.8.4/bin/depcomp	2009-12-21 16:08:05.000000000 +0100
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
  
 -scriptversion=2005-02-09.22
-+scriptversion=2007-03-29.01
++scriptversion=2009-04-28.21; # UTC
  
 -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
-+# Foundation, Inc.
++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 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
-@@ -17,8 +18,8 @@
+@@ -16,9 +17,7 @@
+ # 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
+-# along with this program; if not, write to the Free Software
 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 -# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
++# 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
-@@ -91,7 +92,20 @@
+@@ -86,12 +85,34 @@
+    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
++
+ 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.
@@ -14438,7 +12566,25 @@ diff -urN hdf5-1.8.3-orig/bin/depcomp hdf5-1.8.3/bin/depcomp
    stat=$?
    if test $stat -eq 0; then :
    else
-@@ -201,34 +215,39 @@
+@@ -178,14 +199,14 @@
+ ' < "$tmpdepfile" \
+     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+     tr '
+-' ' ' >> $depfile
+-    echo >> $depfile
++' ' ' >> "$depfile"
++    echo >> "$depfile"
+ 
+     # The second pass generates a dummy entry for each header file.
+     tr ' ' '
+ ' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+-   >> $depfile
++   >> "$depfile"
+   else
+     # The sourcefile does not contain any dependencies, so just
+     # store a dummy comment line, to avoid errors with the Makefile
+@@ -201,34 +222,39 @@
    # 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.
@@ -14448,40103 +12594,1863 @@ diff -urN hdf5-1.8.3-orig/bin/depcomp hdf5-1.8.3/bin/depcomp
 +  test "x$dir" = "x$object" && dir=
 +  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
    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 -f "$tmpdepfile"; then :
--  else
--    stripped=`echo "$stripped" | sed 's,^.*/,,'`
--    tmpdepfile="$stripped.u"
--  fi
--
-   if test $stat -eq 0; then :
-   else
--    rm -f "$tmpdepfile"
-+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-     exit $stat
-   fi
- 
-+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-+  do
-+    test -f "$tmpdepfile" && break
-+  done
-   if test -f "$tmpdepfile"; then
--    outname="$stripped.o"
-     # Each line is of the form `foo.o: dependent.h'.
-     # Do two passes, one to just change these to
-     # `$object: dependent.h' and one to simply `dependent.h:'.
--    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
--    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+    # That's a tab and a space in the [].
-+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-     # The sourcefile does not contain any dependencies, so just
-     # store a dummy comment line, to avoid errors with the Makefile
-@@ -276,6 +295,46 @@
-   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.
-+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+  test "x$dir" = "x$object" && dir=
-+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+  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 -eq 0; then :
-+  else
-+     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,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-+    # Add `dependent.h:' lines.
-+    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
-+  else
-+    echo "#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'.
-@@ -288,13 +347,13 @@
- 
-    if test "$libtool" = yes; then
-       # With Tru64 cc, shared objects can also be used to make a
--      # static library.  This mecanism is used in libtool 1.4 series to
-+      # static library.  This mechanism is used in libtool 1.4 series to
-       # handle both shared and static libraries in a single compilation.
-       # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-       #
-       # With libtool 1.5 this exception was removed, and libtool now
-       # generates 2 separate objects for the 2 libraries.  These two
--      # compilations output dependencies in in $dir.libs/$base.o.d and
-+      # 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
-@@ -467,7 +526,8 @@
-   done
- 
-   "$@" -E |
--    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-+    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"
-diff -urN hdf5-1.8.3-orig/bin/install-sh hdf5-1.8.3/bin/install-sh
---- hdf5-1.8.3-orig/bin/install-sh	2009-05-13 17:03:21.000000000 +0200
-+++ hdf5-1.8.3/bin/install-sh	2009-06-19 15:35:23.000000000 +0200
-@@ -1,251 +1,519 @@
- #!/bin/sh
--#
- # install - install a program, script, or datafile
--# This comes from X11R5 (mit/util/scripts/install.sh).
-+
-+scriptversion=2006-12-25.00
-+
-+# 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.
- #
--# Copyright 1991 by the Massachusetts Institute of Technology
- #
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation, and that the name of M.I.T. not be used in advertising or
--# publicity pertaining to distribution of the software without specific,
--# written prior permission.  M.I.T. makes no representations about the
--# suitability of this software for any purpose.  It is provided "as is"
--# without express or implied warranty.
-+# 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.  It can only install one file at a time, a restriction
--# shared with many OS's install programs.
-+# 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-}"
--
-+doit=${DOITPROG-}
-+if test -z "$doit"; then
-+  doit_exec=exec
-+else
-+  doit_exec=$doit
-+fi
- 
--# put in absolute paths if you don't have them in your path; or use env. vars.
-+# Put in absolute file names if you don't have them in your path;
-+# or use environment vars.
- 
--mvprog="${MVPROG-mv}"
--cpprog="${CPPROG-cp}"
--chmodprog="${CHMODPROG-chmod}"
--chownprog="${CHOWNPROG-chown}"
--chgrpprog="${CHGRPPROG-chgrp}"
--stripprog="${STRIPPROG-strip}"
--rmprog="${RMPROG-rm}"
--mkdirprog="${MKDIRPROG-mkdir}"
--
--transformbasename=""
--transform_arg=""
--instcmd="$mvprog"
--chmodcmd="$chmodprog 0755"
--chowncmd=""
--chgrpcmd=""
--stripcmd=""
-+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"
--mvcmd="$mvprog"
--src=""
--dst=""
--dir_arg=""
--
--while [ x"$1" != x ]; do
--    case $1 in
--	-c) instcmd="$cpprog"
--	    shift
--	    continue;;
--
--	-d) dir_arg=true
--	    shift
--	    continue;;
--
--	-m) chmodcmd="$chmodprog $2"
--	    shift
--	    shift
--	    continue;;
--
--	-o) chowncmd="$chownprog $2"
--	    shift
--	    shift
--	    continue;;
--
--	-g) chgrpcmd="$chgrpprog $2"
--	    shift
--	    shift
--	    continue;;
--
--	-s) stripcmd="$stripprog"
--	    shift
--	    continue;;
--
--	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
--	    shift
--	    continue;;
--
--	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
--	    shift
--	    continue;;
-+stripcmd=
- 
--	*)  if [ x"$src" = x ]
--	    then
--		src=$1
--	    else
--		# this colon is to work around a 386BSD /bin/sh bug
--		:
--		dst=$1
--	    fi
--	    shift
--	    continue;;
--    esac
--done
-+src=
-+dst=
-+dir_arg=
-+dst_arg=
- 
--if [ x"$src" = x ]
--then
--	echo "install:	no input file specified"
--	exit 1
--else
--	true
--fi
-+copy_on_change=false
-+no_target_directory=
- 
--if [ x"$dir_arg" != x ]; then
--	dst=$src
--	src=""
--	
--	if [ -d $dst ]; then
--		instcmd=:
--		chmodcmd=""
--	else
--		instcmd=$mkdirprog
--	fi
--else
-+usage="\
-+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-+   or: $0 [OPTION]... SRCFILES... DIRECTORY
-+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-+   or: $0 [OPTION]... -d DIRECTORIES...
- 
--# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
--# might cause directories to be created, which would be especially bad 
--# if $src (and thus $dsttmp) contains '*'.
--
--	if [ -f $src -o -d $src ]
--	then
--		true
--	else
--		echo "install:  $src does not exist"
--		exit 1
--	fi
--	
--	if [ x"$dst" = x ]
--	then
--		echo "install:	no destination specified"
--		exit 1
--	else
--		true
--	fi
-+In the 1st form, copy SRCFILE to DSTFILE.
-+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-+In the 4th, create DIRECTORIES.
- 
--# If destination is a directory, append the input filename; if your system
--# does not like double slashes in filenames, you may need to add some logic
-+Options:
-+     --help     display this help and exit.
-+     --version  display version info and exit.
- 
--	if [ -d $dst ]
--	then
--		dst="$dst"/`basename $src`
--	else
--		true
--	fi
--fi
-+  -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.
- 
--## this sed command emulates the dirname command
--dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-+Environment variables override the default commands:
-+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-+  RMPROG STRIPPROG
-+"
- 
--# Make sure that the destination directory exists.
--#  this part is taken from Noah Friedman's mkinstalldirs script
-+while test $# -ne 0; do
-+  case $1 in
-+    -c) ;;
- 
--# Skip lots of stat calls in the usual case.
--if [ ! -d "$dstdir" ]; then
--defaultIFS='
--	'
--IFS="${IFS-${defaultIFS}}"
--
--oIFS="${IFS}"
--# Some sh's can't handle IFS=/ for some reason.
--IFS='%'
--set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
--IFS="${oIFS}"
--
--pathcomp=''
--
--while [ $# -ne 0 ] ; do
--	pathcomp="${pathcomp}${1}"
--	shift
--
--	if [ ! -d "${pathcomp}" ] ;
--        then
--		$mkdirprog "${pathcomp}"
--	else
--		true
--	fi
-+    -C) copy_on_change=true;;
- 
--	pathcomp="${pathcomp}/"
--done
--fi
-+    -d) dir_arg=true;;
- 
--if [ x"$dir_arg" != x ]
--then
--	$doit $instcmd $dst &&
--
--	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
--	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
--	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
--	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
--else
-+    -g) chgrpcmd="$chgrpprog $2"
-+	shift;;
- 
--# If we're going to rename the final executable, determine the name now.
-+    --help) echo "$usage"; exit $?;;
- 
--	if [ x"$transformarg" = x ] 
--	then
--		dstfile=`basename $dst`
--	else
--		dstfile=`basename $dst $transformbasename | 
--			sed $transformarg`$transformbasename
--	fi
-+    -m) mode=$2
-+	case $mode in
-+	  *' '* | *'	'* | *'
-+'*	  | *'*'* | *'?'* | *'['*)
-+	    echo "$0: invalid mode: $mode" >&2
-+	    exit 1;;
-+	esac
-+	shift;;
- 
--# don't allow the sed command to completely eliminate the filename
-+    -o) chowncmd="$chownprog $2"
-+	shift;;
- 
--	if [ x"$dstfile" = x ] 
--	then
--		dstfile=`basename $dst`
--	else
--		true
--	fi
-+    -s) stripcmd=$stripprog;;
- 
--# Make a temp file name in the proper directory.
-+    -t) dst_arg=$2
-+	shift;;
- 
--	dsttmp=$dstdir/#inst.$$#
-+    -T) no_target_directory=true;;
- 
--# Move or copy the file name to the temp name
-+    --version) echo "$0 $scriptversion"; exit $?;;
- 
--	$doit $instcmd $src $dsttmp &&
-+    --)	shift
-+	break;;
- 
--	trap "rm -f ${dsttmp}" 0 &&
-+    -*)	echo "$0: invalid option: $1" >&2
-+	exit 1;;
- 
--# and set any options; do chmod last to preserve setuid bits
-+    *)  break;;
-+  esac
-+  shift
-+done
- 
--# 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 $instcmd $src $dsttmp" command.
-+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
-+  done
-+fi
- 
--	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
--	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
--	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
--	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;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
- 
--# Now rename the file to the real destination.
-+if test -z "$dir_arg"; then
-+  trap '(exit $?); exit' 1 2 13 15
- 
--	$doit $rmcmd -f $dstdir/$dstfile &&
--	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-+  # 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
- 
--fi &&
-+for src
-+do
-+  # Protect names starting with `-'.
-+  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
-+    # Protect names starting with `-'.
-+    case $dst in
-+      -*) dst=./$dst;;
-+    esac
- 
-+    # 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-writeable 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 -z "$d" && 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
- 
--exit 0
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-diff -urN hdf5-1.8.3-orig/bin/ltmain.sh hdf5-1.8.3/bin/ltmain.sh
---- hdf5-1.8.3-orig/bin/ltmain.sh	2009-06-19 12:59:55.000000000 +0200
-+++ hdf5-1.8.3/bin/ltmain.sh	2009-06-19 15:34:45.000000000 +0200
-@@ -65,7 +65,7 @@
- #       compiler:		$LTCC
- #       compiler flags:		$LTCFLAGS
- #       linker:		$LD (gnu? $with_gnu_ld)
--#       $progname:		(GNU libtool) 2.2.6
-+#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
- #       automake:		$automake_version
- #       autoconf:		$autoconf_version
- #
-@@ -73,7 +73,7 @@
- 
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=2.2.6
-+VERSION="2.2.6 Debian-2.2.6a-4"
- TIMESTAMP=""
- package_revision=1.3012
- 
-@@ -116,15 +116,15 @@
- 
- : ${CP="cp -f"}
- : ${ECHO="echo"}
--: ${EGREP="/usr/bin/grep -E"}
--: ${FGREP="/usr/bin/grep -F"}
--: ${GREP="/usr/bin/grep"}
-+: ${EGREP="/bin/grep -E"}
-+: ${FGREP="/bin/grep -F"}
-+: ${GREP="/bin/grep"}
- : ${LN_S="ln -s"}
- : ${MAKE="make"}
- : ${MKDIR="mkdir"}
- : ${MV="mv -f"}
- : ${RM="rm -f"}
--: ${SED="/opt/local/bin/gsed"}
-+: ${SED="/bin/sed"}
- : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
- : ${Xsed="$SED -e 1s/^X//"}
- 
-@@ -809,34 +809,6 @@
-       # don't eliminate duplications in $postdeps and $predeps
-       opt_duplicate_compiler_generated_deps=:
-       ;;
--    tag)
--      tagname="$arg"
--      preserve_args="${preserve_args}=$arg"
--
--      # Check whether tagname contains only valid characters
--      case $tagname in
--      *[!-_A-Za-z0-9,/]*)
--	$echo "$progname: invalid tag name: $tagname" 1>&2
--	exit $EXIT_FAILURE
--	;;
--      esac
--
--      case $tagname in
--      CC)
--	# Don't test for the "default" C tag, as we know, it's there, but
--	# not specially marked.
--	;;
--      *)
--	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
--	  taglist="$taglist $tagname"
--	  # Evaluate the configuration.
--	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
--	else
--	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
--	fi
--	;;
--      esac
--      ;;
-     *)
-       opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
-       ;;
-@@ -4727,11 +4699,6 @@
-         prev=weak
- 	continue
- 	;;
--      -version-number)
--	prev=vinfo
--	vinfo_number=yes
--	continue
--	;;
- 
-       -Wc,*)
- 	func_stripname '-Wc,' '' "$arg"
-@@ -4807,11 +4774,6 @@
-         continue
-         ;;
- 
--      -XCClinker)
--	prev=xcclinker
--	continue
--	;;
--
-       # Some other compiler flag.
-       -* | +*)
-         func_quote_for_eval "$arg"
-@@ -5071,7 +5033,10 @@
- 	case $pass in
- 	dlopen) libs="$dlfiles" ;;
- 	dlpreopen) libs="$dlprefiles" ;;
--	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-+	link)
-+	  libs="$deplibs %DEPLIBS%"
-+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-+	  ;;
- 	esac
-       fi
-       if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5382,19 +5347,19 @@
- 	    # It is a libtool convenience library, so add in its objects.
- 	    convenience="$convenience $ladir/$objdir/$old_library"
- 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-+	    tmp_libs=
-+	    for deplib in $dependency_libs; do
-+	      deplibs="$deplib $deplibs"
-+	      if $opt_duplicate_deps ; then
-+		case "$tmp_libs " in
-+		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+		esac
-+	      fi
-+	      tmp_libs="$tmp_libs $deplib"
-+	    done
- 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
- 	    func_fatal_error "\`$lib' is not a convenience library"
- 	  fi
--	  tmp_libs=
--	  for deplib in $dependency_libs; do
--	    deplibs="$deplib $deplibs"
--	    if $opt_duplicate_deps ; then
--	      case "$tmp_libs " in
--	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--	      esac
--	    fi
--	    tmp_libs="$tmp_libs $deplib"
--	  done
- 	  continue
- 	fi # $pass = conv
- 
-@@ -5737,14 +5702,6 @@
- 		*-*-sunos*) add_shlibpath="$dir" ;;
- 		esac
- 		add_dir="-L$dir"
--		# Try looking first in the location we're being installed to.
--		if test -n "$inst_prefix_dir"; then
--		  case $libdir in
--		    [\\/]*)
--		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
--		      ;;
--		  esac
--		fi
- 		add="-l$name"
- 	      elif test "$hardcode_shlibpath_var" = no; then
- 		add_shlibpath="$dir"
-@@ -5939,6 +5896,7 @@
- 	  if test "$link_all_deplibs" != no; then
- 	    # Add the search paths of all dependency libraries
- 	    for deplib in $dependency_libs; do
-+	      path=
- 	      case $deplib in
- 	      -L*) path="$deplib" ;;
- 	      *.la)
-@@ -6252,6 +6210,9 @@
- 	    revision="$number_minor"
- 	    lt_irix_increment=no
- 	    ;;
-+	  *)
-+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-+	    ;;
- 	  esac
- 	  ;;
- 	no)
-@@ -6918,35 +6879,6 @@
-       done
-       deplibs="$new_libs"
- 
--
--      # 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 "*)
--	    new_libs="$new_libs -L$path/$objdir" ;;
--	  esac
--	  ;;
--	esac
--      done
--      for deplib in $deplibs; do
--	case $deplib in
--	-L*)
--	  case " $new_libs " in
--	  *" $deplib "*) ;;
--	  *) new_libs="$new_libs $deplib" ;;
--	  esac
--	  ;;
--	*) new_libs="$new_libs $deplib" ;;
--	esac
--      done
--      deplibs="$new_libs"
--
--
-       # All the library-specific variables (install_libdir is set above).
-       library_names=
-       old_library=
-@@ -7632,45 +7564,6 @@
-       compile_deplibs="$new_libs"
- 
- 
--      case $host in
--      *darwin*)
--        # Don't allow lazy linking, it breaks C++ global constructors
--        if test "$tagname" = CXX ; then
--        compile_command="$compile_command ${wl}-bind_at_load"
--        finalize_command="$finalize_command ${wl}-bind_at_load"
--        fi
--        ;;
--      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 "*)
--	    new_libs="$new_libs -L$path/$objdir" ;;
--	  esac
--	  ;;
--	esac
--      done
--      for deplib in $compile_deplibs; do
--	case $deplib in
--	-L*)
--	  case " $new_libs " in
--	  *" $deplib "*) ;;
--	  *) new_libs="$new_libs $deplib" ;;
--	  esac
--	  ;;
--	*) new_libs="$new_libs $deplib" ;;
--	esac
--      done
--      compile_deplibs="$new_libs"
--
--
-       compile_command="$compile_command $compile_deplibs"
-       finalize_command="$finalize_command $finalize_deplibs"
- 
-@@ -8469,7 +8362,6 @@
- 	func_show_eval "rmdir $dir >/dev/null 2>&1"
-       fi
-     done
--    objdir="$origobjdir"
- 
-     exit $exit_status
- }
-diff -urN hdf5-1.8.3-orig/bin/missing hdf5-1.8.3/bin/missing
---- hdf5-1.8.3-orig/bin/missing	2009-05-13 17:03:21.000000000 +0200
-+++ hdf5-1.8.3/bin/missing	2009-06-19 15:35:23.000000000 +0200
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
- 
--scriptversion=2005-02-08.22
-+scriptversion=2006-05-10.23
- 
--# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
- #   Free Software Foundation, Inc.
- # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
- 
-@@ -19,8 +19,8 @@
- 
- # 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.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- 
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -33,6 +33,8 @@
- fi
- 
- run=:
-+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
- 
- # In the cases where this matters, `missing' is being run in the
- # srcdir already.
-@@ -44,7 +46,7 @@
- 
- msg="missing on your system"
- 
--case "$1" in
-+case $1 in
- --run)
-   # Try to run requested program, and just exit if it succeeds.
-   run=
-@@ -77,6 +79,7 @@
-   aclocal      touch file \`aclocal.m4'
-   autoconf     touch file \`configure'
-   autoheader   touch file \`config.h.in'
-+  autom4te     touch the output file, or create a stub one
-   automake     touch all \`Makefile.in' files
-   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-   flex         create \`lex.yy.c', if possible, from existing .c
-@@ -106,7 +109,7 @@
- # Now exit if we have it, but it failed.  Also exit now if we
- # don't have it and --version was passed (most likely to detect
- # the program).
--case "$1" in
-+case $1 in
-   lex|yacc)
-     # Not GNU programs, they don't have --version.
-     ;;
-@@ -135,7 +138,7 @@
- 
- # If it does not exist, or fails to run (possibly an outdated version),
- # try to emulate it.
--case "$1" in
-+case $1 in
-   aclocal*)
-     echo 1>&2 "\
- WARNING: \`$1' is $msg.  You should only need it if
-@@ -164,7 +167,7 @@
-     test -z "$files" && files="config.h"
-     touch_files=
-     for f in $files; do
--      case "$f" in
-+      case $f in
-       *:*) touch_files="$touch_files "`echo "$f" |
- 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-       *) touch_files="$touch_files $f.in";;
-@@ -192,8 +195,8 @@
-          You can get \`$1' as part of \`Autoconf' from any GNU
-          archive site."
- 
--    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
--    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-+    file=`echo "$*" | sed -n "$sed_output"`
-+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-     if test -f "$file"; then
- 	touch $file
-     else
-@@ -214,25 +217,25 @@
-          in order for those modifications to take effect.  You can get
-          \`Bison' from any GNU archive site."
-     rm -f y.tab.c y.tab.h
--    if [ $# -ne 1 ]; then
-+    if test $# -ne 1; then
-         eval LASTARG="\${$#}"
--	case "$LASTARG" in
-+	case $LASTARG in
- 	*.y)
- 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
--	    if [ -f "$SRCFILE" ]; then
-+	    if test -f "$SRCFILE"; then
- 	         cp "$SRCFILE" y.tab.c
- 	    fi
- 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
--	    if [ -f "$SRCFILE" ]; then
-+	    if test -f "$SRCFILE"; then
- 	         cp "$SRCFILE" y.tab.h
- 	    fi
- 	  ;;
- 	esac
-     fi
--    if [ ! -f y.tab.h ]; then
-+    if test ! -f y.tab.h; then
- 	echo >y.tab.h
-     fi
--    if [ ! -f y.tab.c ]; then
-+    if test ! -f y.tab.c; then
- 	echo 'main() { return 0; }' >y.tab.c
-     fi
-     ;;
-@@ -244,18 +247,18 @@
-          in order for those modifications to take effect.  You can get
-          \`Flex' from any GNU archive site."
-     rm -f lex.yy.c
--    if [ $# -ne 1 ]; then
-+    if test $# -ne 1; then
-         eval LASTARG="\${$#}"
--	case "$LASTARG" in
-+	case $LASTARG in
- 	*.l)
- 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
--	    if [ -f "$SRCFILE" ]; then
-+	    if test -f "$SRCFILE"; then
- 	         cp "$SRCFILE" lex.yy.c
- 	    fi
- 	  ;;
- 	esac
-     fi
--    if [ ! -f lex.yy.c ]; then
-+    if test ! -f lex.yy.c; then
- 	echo 'main() { return 0; }' >lex.yy.c
-     fi
-     ;;
-@@ -267,11 +270,9 @@
- 	 \`Help2man' package in order for those modifications to take
- 	 effect.  You can get \`Help2man' from any GNU archive site."
- 
--    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
--    if test -z "$file"; then
--	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
--    fi
--    if [ -f "$file" ]; then
-+    file=`echo "$*" | sed -n "$sed_output"`
-+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-+    if test -f "$file"; then
- 	touch $file
-     else
- 	test -z "$file" || exec >$file
-@@ -289,14 +290,23 @@
-          DU, IRIX).  You might want to install the \`Texinfo' package or
-          the \`GNU make' package.  Grab either from any GNU archive site."
-     # The file to touch is that specified with -o ...
--    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+    file=`echo "$*" | sed -n "$sed_output"`
-+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-     if test -z "$file"; then
-       # ... or it is the one specified with @setfilename ...
-       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
--      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-+      file=`sed -n '
-+	/^@setfilename/{
-+	  s/.* \([^ ]*\) *$/\1/
-+	  p
-+	  q
-+	}' $infile`
-       # ... or it is derived from the source name (dir/f.texi becomes f.info)
-       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-     fi
-+    # If the file does not exist, the user really needs makeinfo;
-+    # let's fail without touching anything.
-+    test -f $file || exit 1
-     touch $file
-     ;;
- 
-@@ -314,13 +324,13 @@
-     fi
-     firstarg="$1"
-     if shift; then
--	case "$firstarg" in
-+	case $firstarg in
- 	*o*)
- 	    firstarg=`echo "$firstarg" | sed s/o//`
- 	    tar "$firstarg" "$@" && exit 0
- 	    ;;
- 	esac
--	case "$firstarg" in
-+	case $firstarg in
- 	*h*)
- 	    firstarg=`echo "$firstarg" | sed s/h//`
- 	    tar "$firstarg" "$@" && exit 0
-diff -urN hdf5-1.8.3-orig/bin/mkinstalldirs hdf5-1.8.3/bin/mkinstalldirs
---- hdf5-1.8.3-orig/bin/mkinstalldirs	2009-05-13 17:03:21.000000000 +0200
-+++ hdf5-1.8.3/bin/mkinstalldirs	2009-06-19 15:35:41.000000000 +0200
-@@ -1,31 +1,59 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
--# Author: Noah Friedman <friedman at prep.ai.mit.edu>
--# Created: 1993-05-16
--# Public domain
- 
--# $Id: mkinstalldirs 9902 2005-02-01 04:17:02Z jlaird $
-+scriptversion=2006-05-11.19
- 
-+# Original author: Noah Friedman <friedman at prep.ai.mit.edu>
-+# Created: 1993-05-16
-+# Public domain.
-+#
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake at gnu.org> or send patches to
-+# <automake-patches at gnu.org>.
-+
-+nl='
-+'
-+IFS=" ""	$nl"
- errstatus=0
--dirmode=""
-+dirmode=
- 
- usage="\
--Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-+
-+Create each directory DIR (with mode MODE, if specified), including all
-+leading file name components.
-+
-+Report bugs to <bug-automake at gnu.org>."
- 
- # process command line arguments
- while test $# -gt 0 ; do
--   case "${1}" in
--     -h | --help | --h* )			# -h for help
--	echo "${usage}" 1>&2; exit 0 ;;
--     -m )					# -m PERM arg
--	shift
--	test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
--	dirmode="${1}"
--	shift ;;
--     -- ) shift; break ;;			# stop option processing
--     -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
--     * )  break ;;				# first non-opt arg
--   esac
-+  case $1 in
-+    -h | --help | --h*)         # -h for help
-+      echo "$usage"
-+      exit $?
-+      ;;
-+    -m)                         # -m PERM arg
-+      shift
-+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-+      dirmode=$1
-+      shift
-+      ;;
-+    --version)
-+      echo "$0 $scriptversion"
-+      exit $?
-+      ;;
-+    --)                         # stop option processing
-+      shift
-+      break
-+      ;;
-+    -*)                         # unknown option
-+      echo "$usage" 1>&2
-+      exit 1
-+      ;;
-+    *)                          # first non-opt arg
-+      break
-+      ;;
-+  esac
- done
- 
- for file
-@@ -38,64 +66,96 @@
- done
- 
- case $# in
--0) exit 0 ;;
-+  0) exit 0 ;;
- esac
- 
-+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-+# mkdir -p a/c at the same time, both will detect that a is missing,
-+# one will create a, then the other will try to create a and die with
-+# a "File exists" error.  This is a problem when calling mkinstalldirs
-+# from a parallel make.  We use --version in the probe to restrict
-+# ourselves to GNU mkdir, which is thread-safe.
- case $dirmode in
--'')
--  if mkdir -p -- . 2>/dev/null; then
--    echo "mkdir -p -- $*"
--    exec mkdir -p -- "$@"
--  fi ;;
--*)
--  if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
--    echo "mkdir -m $dirmode -p -- $*"
--    exec mkdir -m "$dirmode" -p -- "$@"
--  fi ;;
-+  '')
-+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+      echo "mkdir -p -- $*"
-+      exec mkdir -p -- "$@"
-+    else
-+      # On NextStep and OpenStep, the `mkdir' command does not
-+      # recognize any option.  It will interpret all options as
-+      # directories to create, and then abort because `.' already
-+      # exists.
-+      test -d ./-p && rmdir ./-p
-+      test -d ./--version && rmdir ./--version
-+    fi
-+    ;;
-+  *)
-+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-+       test ! -d ./--version; then
-+      echo "mkdir -m $dirmode -p -- $*"
-+      exec mkdir -m "$dirmode" -p -- "$@"
-+    else
-+      # Clean up after NextStep and OpenStep mkdir.
-+      for d in ./-m ./-p ./--version "./$dirmode";
-+      do
-+        test -d $d && rmdir $d
-+      done
-+    fi
-+    ;;
- esac
- 
- for file
- do
--   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
--   shift
-+  case $file in
-+    /*) pathcomp=/ ;;
-+    *)  pathcomp= ;;
-+  esac
-+  oIFS=$IFS
-+  IFS=/
-+  set fnord $file
-+  shift
-+  IFS=$oIFS
-+
-+  for d
-+  do
-+    test "x$d" = x && continue
-+
-+    pathcomp=$pathcomp$d
-+    case $pathcomp in
-+      -*) pathcomp=./$pathcomp ;;
-+    esac
-+
-+    if test ! -d "$pathcomp"; then
-+      echo "mkdir $pathcomp"
-+
-+      mkdir "$pathcomp" || lasterr=$?
-+
-+      if test ! -d "$pathcomp"; then
-+	errstatus=$lasterr
-+      else
-+	if test ! -z "$dirmode"; then
-+	  echo "chmod $dirmode $pathcomp"
-+	  lasterr=
-+	  chmod "$dirmode" "$pathcomp" || lasterr=$?
- 
--   pathcomp=
--   for d
--   do
--     pathcomp="$pathcomp$d"
--     case "$pathcomp" in
--       -* ) pathcomp=./$pathcomp ;;
--     esac
--
--     if test ! -d "$pathcomp"; then
--	echo "mkdir $pathcomp"
--
--	mkdir "$pathcomp" || lasterr=$?
--
--	if test ! -d "$pathcomp"; then
--	  errstatus=$lasterr
--	else
--	  if test ! -z "$dirmode"; then
--	     echo "chmod $dirmode $pathcomp"
--
--	     lasterr=""
--	     chmod "$dirmode" "$pathcomp" || lasterr=$?
--
--	     if test ! -z "$lasterr"; then
--	       errstatus=$lasterr
--	     fi
-+	  if test ! -z "$lasterr"; then
-+	    errstatus=$lasterr
- 	  fi
- 	fi
--     fi
-+      fi
-+    fi
- 
--     pathcomp="$pathcomp/"
--   done
-+    pathcomp=$pathcomp/
-+  done
- done
- 
- exit $errstatus
- 
- # Local Variables:
- # mode: shell-script
--# sh-indentation: 3
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
- # End:
--# mkinstalldirs ends here
-diff -urN hdf5-1.8.3-orig/c++/examples/Makefile.in hdf5-1.8.3/c++/examples/Makefile.in
---- hdf5-1.8.3-orig/c++/examples/Makefile.in	2009-05-13 17:03:20.000000000 +0200
-+++ hdf5-1.8.3/c++/examples/Makefile.in	2009-06-19 15:35:23.000000000 +0200
-@@ -272,6 +272,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/c++/Makefile.in hdf5-1.8.3/c++/Makefile.in
---- hdf5-1.8.3-orig/c++/Makefile.in	2009-05-13 17:03:20.000000000 +0200
-+++ hdf5-1.8.3/c++/Makefile.in	2009-06-19 15:35:23.000000000 +0200
-@@ -278,6 +278,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/c++/src/Makefile.in hdf5-1.8.3/c++/src/Makefile.in
---- hdf5-1.8.3-orig/c++/src/Makefile.in	2009-05-13 17:03:20.000000000 +0200
-+++ hdf5-1.8.3/c++/src/Makefile.in	2009-06-19 15:35:24.000000000 +0200
-@@ -312,6 +312,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/c++/test/Makefile.in hdf5-1.8.3/c++/test/Makefile.in
---- hdf5-1.8.3-orig/c++/test/Makefile.in	2009-05-13 17:03:19.000000000 +0200
-+++ hdf5-1.8.3/c++/test/Makefile.in	2009-06-19 15:35:24.000000000 +0200
-@@ -294,6 +294,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/configure hdf5-1.8.3/configure
---- hdf5-1.8.3-orig/configure	2009-05-13 17:03:25.000000000 +0200
-+++ hdf5-1.8.3/configure	2009-06-19 15:35:11.000000000 +0200
-@@ -1,12 +1,12 @@
- #! /bin/sh
--# From configure.in Id: configure.in 16855 2009-04-24 03:28:44Z epourmal .
-+# From configure.in Id: configure.in 16893 2009-04-29 20:08:52Z acheng .
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.61 for HDF5 1.8.3.
-+# Generated by GNU Autoconf 2.63 for HDF5 1.8.3.
- #
- # Report bugs to <help at hdfgroup.org>.
- #
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
-@@ -18,7 +18,7 @@
- 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
-+  # 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
-@@ -40,17 +40,45 @@
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
-+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
-+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='printf %s\n'
-+  as_echo_n='printf %s'
-+else
-+  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
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conf$$.sh
-+  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
- 
- # Support unset when possible.
-@@ -66,8 +94,6 @@
- # 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.)
--as_nl='
--'
- IFS=" ""	$as_nl"
- 
- # Find who we are.  Look in the path if we contain no directory separator.
-@@ -90,7 +116,7 @@
-   as_myself=$0
- fi
- if test ! -f "$as_myself"; then
--  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-   { (exit 1); exit 1; }
- fi
- 
-@@ -103,17 +129,10 @@
- PS4='+ '
- 
- # NLS nuisances.
--for as_var in \
--  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
--  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
--  LC_TELEPHONE LC_TIME
--do
--  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
--    eval $as_var=C; export $as_var
--  else
--    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
--  fi
--done
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
- 
- # Required to use basename.
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -135,7 +154,7 @@
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
- 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--echo X/"$0" |
-+$as_echo X/"$0" |
-     sed '/^.*\/\([^/][^/]*\)\/*$/{
- 	    s//\1/
- 	    q
-@@ -161,7 +180,7 @@
-   as_have_required=no
- fi
- 
--  if test $as_have_required = yes && 	 (eval ":
-+  if test $as_have_required = yes &&	 (eval ":
- (as_func_return () {
-   (exit \$1)
- }
-@@ -243,7 +262,7 @@
- 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
-+  # 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
-@@ -264,7 +283,7 @@
- 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
-+  # 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
-@@ -344,10 +363,10 @@
- 
-       if test "x$CONFIG_SHELL" != x; then
-   for as_var in BASH_ENV ENV
--        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
--        done
--        export CONFIG_SHELL
--        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+	done
-+	export CONFIG_SHELL
-+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
- fi
- 
- 
-@@ -416,9 +435,10 @@
- 
- test \$exitcode = 0") || {
-   echo No shell found that supports shell functions.
--  echo Please tell autoconf at gnu.org about your system,
--  echo including any error possibly output before this
--  echo message
-+  echo Please tell bug-autoconf at gnu.org about your system,
-+  echo including any error possibly output before this message.
-+  echo This can help us improve future autoconf versions.
-+  echo Configuration will now proceed without shell functions.
- }
- 
- 
-@@ -454,7 +474,7 @@
-       s/-\n.*//
-     ' >$as_me.lineno &&
-   chmod +x "$as_me.lineno" ||
--    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-    { (exit 1); exit 1; }; }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-@@ -482,7 +502,6 @@
- *)
-   ECHO_N='-n';;
- esac
--
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
-@@ -495,19 +514,22 @@
-   rm -f conf$$.dir/conf$$.file
- else
-   rm -f conf$$.dir
--  mkdir conf$$.dir
-+  mkdir conf$$.dir 2>/dev/null
- fi
--echo >conf$$.file
--if ln -s conf$$.file conf$$ 2>/dev/null; then
--  as_ln_s='ln -s'
--  # ... but there are two gotchas:
--  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
--  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
--  # In both cases, we have to default to `cp -p'.
--  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+if (echo >conf$$.file) 2>/dev/null; then
-+  if ln -s conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s='ln -s'
-+    # ... but there are two gotchas:
-+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+    # In both cases, we have to default to `cp -p'.
-+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+      as_ln_s='cp -p'
-+  elif ln conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s=ln
-+  else
-     as_ln_s='cp -p'
--elif ln conf$$.file conf$$ 2>/dev/null; then
--  as_ln_s=ln
-+  fi
- else
-   as_ln_s='cp -p'
- fi
-@@ -532,10 +554,10 @@
-   as_test_x='
-     eval sh -c '\''
-       if test -d "$1"; then
--        test -d "$1/.";
-+	test -d "$1/.";
-       else
- 	case $1 in
--        -*)set "./$1";;
-+	-*)set "./$1";;
- 	esac;
- 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- 	???[sx]*):;;*)false;;esac;fi
-@@ -766,225 +788,271 @@
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL
--PATH_SEPARATOR
--PACKAGE_NAME
--PACKAGE_TARNAME
--PACKAGE_VERSION
--PACKAGE_STRING
--PACKAGE_BUGREPORT
--exec_prefix
--prefix
--program_transform_name
--bindir
--sbindir
--libexecdir
--datarootdir
--datadir
--sysconfdir
--sharedstatedir
--localstatedir
--includedir
--oldincludedir
--docdir
--infodir
--htmldir
--dvidir
--pdfdir
--psdir
--libdir
--localedir
--mandir
--DEFS
--ECHO_C
--ECHO_N
--ECHO_T
--LIBS
--build_alias
--host_alias
--target_alias
--INSTALL_PROGRAM
--INSTALL_SCRIPT
--INSTALL_DATA
--am__isrc
--CYGPATH_W
--PACKAGE
--VERSION
--ACLOCAL
--AUTOCONF
--AUTOMAKE
--AUTOHEADER
--MAKEINFO
--install_sh
--STRIP
--INSTALL_STRIP_PROGRAM
--mkdir_p
--AWK
--SET_MAKE
--am__leading_dot
--AMTAR
--am__tar
--am__untar
--MAINTAINER_MODE_TRUE
--MAINTAINER_MODE_FALSE
--MAINT
--build
--build_cpu
--build_vendor
--build_os
--host
--host_cpu
--host_vendor
--host_os
--CPPFLAGS
--H5_CFLAGS
--H5_CPPFLAGS
--H5_FCFLAGS
--H5_CXXFLAGS
--EXTERNAL_FILTERS
--MPE
--STATIC_EXEC
--HDF_FORTRAN
--FC
--HDF_CXX
--CXX
--HDF5_HL
--GPFS
--LINUX_LFS
--INSTRUMENT
--CODESTACK
--HAVE_DMALLOC
--DIRECT_VFD
--THREADSAFE
-+ac_subst_vars='LTLIBOBJS
-+LIBOBJS
-+SETX
-+SEARCH
-+BUILD_HDF5_HL_CONDITIONAL_FALSE
-+BUILD_HDF5_HL_CONDITIONAL_TRUE
-+BUILD_FORTRAN_CONDITIONAL_FALSE
-+BUILD_FORTRAN_CONDITIONAL_TRUE
-+BUILD_PARALLEL_CONDITIONAL_FALSE
-+BUILD_PARALLEL_CONDITIONAL_TRUE
-+BUILD_CXX_CONDITIONAL_FALSE
-+BUILD_CXX_CONDITIONAL_TRUE
-+STRICT_FORMAT_CHECKS
-+DEFAULT_API_VERSION
-+DEPRECATED_SYMBOLS
-+BUILD_ALL_CONDITIONAL_FALSE
-+BUILD_ALL_CONDITIONAL_TRUE
-+HL_FOR
-+HL
-+DYNAMIC_DIRS
-+ROOT
-+CC_VERSION
-+WORDS_BIGENDIAN
-+BYTESEX
-+CONFIG_MODE
-+CONFIG_USER
-+CONFIG_DATE
-+H5_VERSION
-+DIRECT_VFD_CONDITIONAL_FALSE
-+DIRECT_VFD_CONDITIONAL_TRUE
-+USE_FILTER_SCALEOFFSET
-+USE_FILTER_NBIT
-+USE_FILTER_FLETCHER32
-+USE_FILTER_SHUFFLE
-+FILTERS
-+MPI_GET_SIZE
-+ADD_PARALLEL_FILES
-+USINGMEMCHECKER
-+CLEARFILEBUF
-+INSTRUMENT_LIBRARY
-+TRACE_API
-+DEBUG_PKG
-+H5_LONE_COLON
-+PTHREAD
-+BUILD_SZIP_CONDITIONAL_FALSE
-+BUILD_SZIP_CONDITIONAL_TRUE
-+LL_PATH
-+USE_FILTER_SZIP
-+USE_FILTER_DEFLATE
-+AM_MAKEFLAGS
-+CPP
-+OTOOL64
-+OTOOL
-+LIPO
-+NMEDIT
-+DSYMUTIL
-+lt_ECHO
-+RANLIB
-+OBJDUMP
-+LN_S
-+NM
-+ac_ct_DUMPBIN
-+DUMPBIN
-+LD
-+FGREP
-+EGREP
-+GREP
-+SED
-+LIBTOOL
-+CXX_SHARED_CONDITIONAL_FALSE
-+CXX_SHARED_CONDITIONAL_TRUE
-+FORTRAN_SHARED_CONDITIONAL_FALSE
-+FORTRAN_SHARED_CONDITIONAL_TRUE
-+TESTPARALLEL
-+RUNPARALLEL
-+RUNSERIAL
-+PARALLEL
-+TIME
-+TR
-+AR
-+PERL
-+LT_STATIC_EXEC
-+CXXCPP
-+am__fastdepCXX_FALSE
-+am__fastdepCXX_TRUE
-+CXXDEPMODE
-+ac_ct_CXX
-+CXXFLAGS
-+FORTRAN_DEFAULT_REALisDBLE_F_FALSE
-+FORTRAN_DEFAULT_REALisDBLE_F_TRUE
-+FORTRAN_HAVE_SIZEOF_FALSE
-+FORTRAN_HAVE_SIZEOF_TRUE
-+FCLIBS
-+F9XMODEXT
-+F9XMODFLAG
-+FSEARCH_DIRS
-+F9XSUFFIXFLAG
-+FCFLAGS_f90
-+ac_ct_FC
-+FCFLAGS
-+OBJECT_NAMELEN_DEFAULT_F
-+SIZE_T
-+HID_T
-+HSSIZE_T
-+HSIZE_T
-+HADDR_T
-+R_INTEGER
-+R_LARGE
-+HDF5_INTERFACES
-+am__fastdepCC_FALSE
-+am__fastdepCC_TRUE
-+CCDEPMODE
-+AMDEPBACKSLASH
-+AMDEP_FALSE
-+AMDEP_TRUE
-+am__quote
-+am__include
-+DEPDIR
-+OBJEXT
-+EXEEXT
-+ac_ct_CC
-+LDFLAGS
-+CFLAGS
-+CC
-+UNAME_INFO
-+enable_static
-+enable_shared
- STATIC_SHARED
-+THREADSAFE
-+DIRECT_VFD
-+HAVE_DMALLOC
-+CODESTACK
-+INSTRUMENT
-+LINUX_LFS
-+GPFS
-+HDF5_HL
-+CXX
-+HDF_CXX
-+FC
-+HDF_FORTRAN
-+STATIC_EXEC
-+MPE
-+EXTERNAL_FILTERS
-+H5_CXXFLAGS
-+H5_FCFLAGS
-+H5_CPPFLAGS
-+H5_CFLAGS
-+CPPFLAGS
-+host_os
-+host_vendor
-+host_cpu
-+host
-+build_os
-+build_vendor
-+build_cpu
-+build
-+MAINT
-+MAINTAINER_MODE_FALSE
-+MAINTAINER_MODE_TRUE
-+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
-+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_BUGREPORT
-+PACKAGE_STRING
-+PACKAGE_VERSION
-+PACKAGE_TARNAME
-+PACKAGE_NAME
-+PATH_SEPARATOR
-+SHELL'
-+ac_subst_files=''
-+ac_user_opts='
-+enable_option_checking
-+enable_maintainer_mode
-+enable_dependency_tracking
-+enable_fortran
-+enable_cxx
-+enable_static_exec
- enable_shared
- enable_static
--UNAME_INFO
--CC
--CFLAGS
--LDFLAGS
--ac_ct_CC
--EXEEXT
--OBJEXT
--DEPDIR
--am__include
--am__quote
--AMDEP_TRUE
--AMDEP_FALSE
--AMDEPBACKSLASH
--CCDEPMODE
--am__fastdepCC_TRUE
--am__fastdepCC_FALSE
--HDF5_INTERFACES
--R_LARGE
--R_INTEGER
--HADDR_T
--HSIZE_T
--HSSIZE_T
--HID_T
--SIZE_T
--OBJECT_NAMELEN_DEFAULT_F
--FCFLAGS
--ac_ct_FC
--FCFLAGS_f90
--F9XSUFFIXFLAG
--FSEARCH_DIRS
--F9XMODFLAG
--F9XMODEXT
--FCLIBS
--FORTRAN_HAVE_SIZEOF_TRUE
--FORTRAN_HAVE_SIZEOF_FALSE
--FORTRAN_DEFAULT_REALisDBLE_F_TRUE
--FORTRAN_DEFAULT_REALisDBLE_F_FALSE
--CXXFLAGS
--ac_ct_CXX
--CXXDEPMODE
--am__fastdepCXX_TRUE
--am__fastdepCXX_FALSE
--CXXCPP
--LT_STATIC_EXEC
--PERL
--AR
--TR
--TIME
--PARALLEL
--RUNSERIAL
--RUNPARALLEL
--TESTPARALLEL
--FORTRAN_SHARED_CONDITIONAL_TRUE
--FORTRAN_SHARED_CONDITIONAL_FALSE
--CXX_SHARED_CONDITIONAL_TRUE
--CXX_SHARED_CONDITIONAL_FALSE
--LIBTOOL
--SED
--GREP
--EGREP
--FGREP
--LD
--DUMPBIN
--ac_ct_DUMPBIN
--NM
--LN_S
--OBJDUMP
--RANLIB
--lt_ECHO
--DSYMUTIL
--NMEDIT
--LIPO
--OTOOL
--OTOOL64
--CPP
--AM_MAKEFLAGS
--USE_FILTER_DEFLATE
--USE_FILTER_SZIP
--LL_PATH
--BUILD_SZIP_CONDITIONAL_TRUE
--BUILD_SZIP_CONDITIONAL_FALSE
--PTHREAD
--H5_LONE_COLON
--DEBUG_PKG
--TRACE_API
--INSTRUMENT_LIBRARY
--CLEARFILEBUF
--USINGMEMCHECKER
--ADD_PARALLEL_FILES
--MPI_GET_SIZE
--FILTERS
--USE_FILTER_SHUFFLE
--USE_FILTER_FLETCHER32
--USE_FILTER_NBIT
--USE_FILTER_SCALEOFFSET
--DIRECT_VFD_CONDITIONAL_TRUE
--DIRECT_VFD_CONDITIONAL_FALSE
--H5_VERSION
--CONFIG_DATE
--CONFIG_USER
--CONFIG_MODE
--BYTESEX
--WORDS_BIGENDIAN
--CC_VERSION
--ROOT
--DYNAMIC_DIRS
--HL
--HL_FOR
--BUILD_ALL_CONDITIONAL_TRUE
--BUILD_ALL_CONDITIONAL_FALSE
--DEPRECATED_SYMBOLS
--DEFAULT_API_VERSION
--STRICT_FORMAT_CHECKS
--BUILD_CXX_CONDITIONAL_TRUE
--BUILD_CXX_CONDITIONAL_FALSE
--BUILD_PARALLEL_CONDITIONAL_TRUE
--BUILD_PARALLEL_CONDITIONAL_FALSE
--BUILD_FORTRAN_CONDITIONAL_TRUE
--BUILD_FORTRAN_CONDITIONAL_FALSE
--BUILD_HDF5_HL_CONDITIONAL_TRUE
--BUILD_HDF5_HL_CONDITIONAL_FALSE
--SEARCH
--SETX
--LIBOBJS
--LTLIBOBJS'
--ac_subst_files=''
-+with_pic
-+enable_fast_install
-+with_gnu_ld
-+enable_libtool_lock
-+enable_sharedlib_rpath
-+enable_production
-+enable_linux_lfs
-+with_fnord
-+with_dmalloc
-+with_zlib
-+with_szlib
-+with_pthread
-+enable_threadsafe
-+enable_gpfs
-+enable_debug
-+enable_codestack
-+enable_metadata_trace_file
-+enable_trace
-+enable_instrument
-+enable_clear_file_buffers
-+enable_using_memchecker
-+enable_parallel
-+with_mpe
-+enable_mpi_size
-+enable_filters
-+with_default_vfd
-+enable_direct_vfd
-+enable_dconv_exception
-+enable_dconv_accuracy
-+enable_hl
-+enable_build_all
-+enable_deprecated_symbols
-+with_default_api_version
-+enable_strict_format_checks
-+enable_embedded_libinfo
-+'
-       ac_precious_vars='build_alias
- host_alias
- target_alias
-@@ -1005,6 +1073,8 @@
- # 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
-@@ -1103,13 +1173,21 @@
-     datarootdir=$ac_optarg ;;
- 
-   -disable-* | --disable-*)
--    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-    { (exit 1); exit 1; }; }
--    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
--    eval enable_$ac_feature=no ;;
-+    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 ;;
-@@ -1122,13 +1200,21 @@
-     dvidir=$ac_optarg ;;
- 
-   -enable-* | --enable-*)
--    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-    { (exit 1); exit 1; }; }
--    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
--    eval enable_$ac_feature=\$ac_optarg ;;
-+    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- \
-@@ -1319,22 +1405,38 @@
-     ac_init_version=: ;;
- 
-   -with-* | --with-*)
--    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid package name: $ac_package" >&2
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-    { (exit 1); exit 1; }; }
--    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
--    eval with_$ac_package=\$ac_optarg ;;
-+    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_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid package name: $ac_package" >&2
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-    { (exit 1); exit 1; }; }
--    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
--    eval with_$ac_package=no ;;
-+    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.
-@@ -1354,7 +1456,7 @@
-   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-     x_libraries=$ac_optarg ;;
- 
--  -*) { echo "$as_me: error: unrecognized option: $ac_option
-+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
- Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; }
-     ;;
-@@ -1363,16 +1465,16 @@
-     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-    { (exit 1); exit 1; }; }
-     eval $ac_envvar=\$ac_optarg
-     export $ac_envvar ;;
- 
-   *)
-     # FIXME: should be removed in autoconf 3.0.
--    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-     ;;
- 
-@@ -1381,22 +1483,38 @@
- 
- if test -n "$ac_prev"; then
-   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
--  { echo "$as_me: error: missing argument to $ac_option" >&2
-+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-    { (exit 1); exit 1; }; }
- fi
- 
--# Be sure to have absolute directory names.
-+if test -n "$ac_unrecognized_opts"; then
-+  case $enable_option_checking in
-+    no) ;;
-+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-+   { (exit 1); exit 1; }; } ;;
-+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-+  esac
-+fi
-+
-+# 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
--  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-    { (exit 1); exit 1; }; }
- done
- 
-@@ -1411,7 +1529,7 @@
- if test "x$host_alias" != x; then
-   if test "x$build_alias" = x; then
-     cross_compiling=maybe
--    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-     If a cross compiler is detected then cross compile mode will be used." >&2
-   elif test "x$build_alias" != "x$host_alias"; then
-     cross_compiling=yes
-@@ -1427,10 +1545,10 @@
- ac_pwd=`pwd` && test -n "$ac_pwd" &&
- ac_ls_di=`ls -di .` &&
- ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
--  { echo "$as_me: error: Working directory cannot be determined" >&2
-+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
-    { (exit 1); exit 1; }; }
- test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
--  { echo "$as_me: error: pwd does not report name of working directory" >&2
-+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-    { (exit 1); exit 1; }; }
- 
- 
-@@ -1438,12 +1556,12 @@
- if test -z "$srcdir"; then
-   ac_srcdir_defaulted=yes
-   # Try the directory containing this script, then the parent directory.
--  ac_confdir=`$as_dirname -- "$0" ||
--$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$0" : 'X\(//\)[^/]' \| \
--	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--echo X"$0" |
-+  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
-@@ -1470,12 +1588,12 @@
- fi
- if test ! -r "$srcdir/$ac_unique_file"; then
-   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
--  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-    { (exit 1); exit 1; }; }
- fi
- ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
- ac_abs_confdir=`(
--	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-    { (exit 1); exit 1; }; }
- 	pwd)`
- # When building in place, set srcdir=.
-@@ -1524,9 +1642,9 @@
- 
- Installation directories:
-   --prefix=PREFIX         install architecture-independent files in PREFIX
--			  [$ac_default_prefix]
-+                          [$ac_default_prefix]
-   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
--			  [PREFIX]
-+                          [PREFIX]
- 
- By default, \`make install' will install all the files in
- \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-@@ -1536,25 +1654,25 @@
- 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/hdf5]
--  --htmldir=DIR          html documentation [DOCDIR]
--  --dvidir=DIR           dvi documentation [DOCDIR]
--  --pdfdir=DIR           pdf documentation [DOCDIR]
--  --psdir=DIR            ps documentation [DOCDIR]
-+  --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/hdf5]
-+  --htmldir=DIR           html documentation [DOCDIR]
-+  --dvidir=DIR            dvi documentation [DOCDIR]
-+  --pdfdir=DIR            pdf documentation [DOCDIR]
-+  --psdir=DIR             ps documentation [DOCDIR]
- _ACEOF
- 
-   cat <<\_ACEOF
-@@ -1577,16 +1695,16 @@
-   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-maintainer-mode  enable make rules and dependencies not useful
- 			  (and sometimes confusing) to the casual installer
-   --disable-dependency-tracking  speeds up one-time build
-   --enable-dependency-tracking   do not reject slow dependency extractors
--  --enable-fortran        Compile the Fortran interface [default=no]
--  --enable-cxx            Compile the C++ interface [default=no]
--  --enable-static-exec    Build only statically linked executables
--                          [default=no]
-+  --enable-fortran        Compile the Fortran interface default=no
-+  --enable-cxx            Compile the C++ interface default=no
-+  --enable-static-exec    Build only statically linked executables default=no
-   --enable-shared[=PKGS]  build shared libraries [default=yes]
-   --enable-static[=PKGS]  build static libraries [default=yes]
-   --enable-fast-install[=PKGS]
-@@ -1596,10 +1714,10 @@
-                           Disable use of the '=Wl,-rpath' linker option
-   --enable-production     Determines how to run the compiler.
-   --enable-linux-lfs      Enable support for large (64-bit) files on Linux.
--                          [default=check]
-+                          default=check
-   --enable-threadsafe     Enable thread safe capability
-   --enable-gpfs           Enable GPFS hints for the MPI/POSIX file driver.
--                          [default=no]
-+                          default=no
-   --enable-debug=all      Turn on debugging in all packages. One may also
-                           specify a comma-separated list of package names
-                           without the leading H5 or the word no. The default
-@@ -1638,7 +1756,7 @@
-                           data conversions [default=yes]
-   --enable-dconv-accuracy if data accuracy is guaranteed during data
-                           conversions [default=yes]
--  --enable-hl             Enable the high level library [default=yes]
-+  --enable-hl             Enable the high level library default=yes
-   --enable-build-all      Build helper programs that only developers should
-                           need [default=no]
-   --enable-deprecated-symbols
-@@ -1664,13 +1782,13 @@
-     --with-xxx=DIR     - Specify only the directory which contains the
-                          include/ and lib/ subdirectories
- 
--  --with-dmalloc=DIR      Use dmalloc memory debugging aid [default=no]
-+  --with-dmalloc=DIR      Use dmalloc memory debugging aid default=no
-   --with-zlib=DIR         Use zlib library for external deflate I/O filter
--                          [default=yes]
-+                          default=yes
-   --with-szlib=DIR        Use szlib library for external szlib I/O filter
--                          [default=no]
--  --with-pthread=DIR      Use the Pthreads library [default=no]
--  --with-mpe=DIR          Use MPE instrumentation [default=no]
-+                          default=no
-+  --with-pthread=DIR      Use the Pthreads library default=no
-+  --with-mpe=DIR          Use MPE instrumentation default=no
-   --with-default-vfd=driver
-                           Specify default file driver [default=sec2]
-   --with-default-api-version=(v16|v18)
-@@ -1703,15 +1821,17 @@
- 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" || 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=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-   # A ".." for each directory in $ac_dir_suffix.
--  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+  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/ ;;
-@@ -1747,7 +1867,7 @@
-       echo &&
-       $SHELL "$ac_srcdir/configure" --help=recursive
-     else
--      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi || ac_status=$?
-     cd "$ac_pwd" || { ac_status=$?; break; }
-   done
-@@ -1757,10 +1877,10 @@
- if $ac_init_version; then
-   cat <<\_ACEOF
- HDF5 configure 1.8.3
--generated by GNU Autoconf 2.61
-+generated by GNU Autoconf 2.63
- 
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1771,7 +1891,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by HDF5 $as_me 1.8.3, which was
--generated by GNU Autoconf 2.61.  Invocation command line was
-+generated by GNU Autoconf 2.63.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -1807,7 +1927,7 @@
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  echo "PATH: $as_dir"
-+  $as_echo "PATH: $as_dir"
- done
- IFS=$as_save_IFS
- 
-@@ -1842,7 +1962,7 @@
-     | -silent | --silent | --silen | --sile | --sil)
-       continue ;;
-     *\'*)
--      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-     esac
-     case $ac_pass in
-     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-@@ -1894,11 +2014,12 @@
-     case $ac_val in #(
-     *${as_nl}*)
-       case $ac_var in #(
--      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
--echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-       esac
-       case $ac_var in #(
-       _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-       *) $as_unset $ac_var ;;
-       esac ;;
-     esac
-@@ -1928,9 +2049,9 @@
-     do
-       eval ac_val=\$$ac_var
-       case $ac_val in
--      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-       esac
--      echo "$ac_var='\''$ac_val'\''"
-+      $as_echo "$ac_var='\''$ac_val'\''"
-     done | sort
-     echo
- 
-@@ -1945,9 +2066,9 @@
-       do
- 	eval ac_val=\$$ac_var
- 	case $ac_val in
--	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- 	esac
--	echo "$ac_var='\''$ac_val'\''"
-+	$as_echo "$ac_var='\''$ac_val'\''"
-       done | sort
-       echo
-     fi
-@@ -1963,8 +2084,8 @@
-       echo
-     fi
-     test "$ac_signal" != 0 &&
--      echo "$as_me: caught signal $ac_signal"
--    echo "$as_me: exit $exit_status"
-+      $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 &&
-@@ -2006,21 +2127,24 @@
- 
- 
- # Let the site file select an alternate cache file if it wants to.
--# Prefer explicitly selected file to automatically selected ones.
-+# Prefer an explicitly selected file to automatically selected ones.
-+ac_site_file1=NONE
-+ac_site_file2=NONE
- if test -n "$CONFIG_SITE"; then
--  set x "$CONFIG_SITE"
-+  ac_site_file1=$CONFIG_SITE
- elif test "x$prefix" != xNONE; then
--  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+  ac_site_file1=$prefix/share/config.site
-+  ac_site_file2=$prefix/etc/config.site
- else
--  set x "$ac_default_prefix/share/config.site" \
--	"$ac_default_prefix/etc/config.site"
-+  ac_site_file1=$ac_default_prefix/share/config.site
-+  ac_site_file2=$ac_default_prefix/etc/config.site
- fi
--shift
--for ac_site_file
-+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
- do
-+  test "x$ac_site_file" = xNONE && continue
-   if test -r "$ac_site_file"; then
--    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
--echo "$as_me: loading site script $ac_site_file" >&6;}
-+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-     sed 's/^/| /' "$ac_site_file" >&5
-     . "$ac_site_file"
-   fi
-@@ -2030,16 +2154,16 @@
-   # Some versions of bash will fail to source /dev/null (special
-   # files actually), so we avoid doing that.
-   if test -f "$cache_file"; then
--    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
--echo "$as_me: loading cache $cache_file" >&6;}
-+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
-+$as_echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-       [\\/]* | ?:[\\/]* ) . "$cache_file";;
-       *)                      . "./$cache_file";;
-     esac
-   fi
- else
--  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
--echo "$as_me: creating cache $cache_file" >&6;}
-+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
-+$as_echo "$as_me: creating cache $cache_file" >&6;}
-   >$cache_file
- fi
- 
-@@ -2053,29 +2177,38 @@
-   eval ac_new_val=\$ac_env_${ac_var}_value
-   case $ac_old_set,$ac_new_set in
-     set,)
--      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
--echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,set)
--      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
--echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,);;
-     *)
-       if test "x$ac_old_val" != "x$ac_new_val"; then
--	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
--echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
--	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
--echo "$as_me:   former value:  $ac_old_val" >&2;}
--	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
--echo "$as_me:   current value: $ac_new_val" >&2;}
--	ac_cache_corrupted=:
-+	# differences in whitespace do not lead to failure.
-+	ac_old_val_w=`echo x $ac_old_val`
-+	ac_new_val_w=`echo x $ac_new_val`
-+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-+	  ac_cache_corrupted=:
-+	else
-+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-+	  eval $ac_var=\$ac_old_val
-+	fi
-+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
-+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
-+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-       fi;;
-   esac
-   # Pass precious variables to config.status.
-   if test "$ac_new_set" = set; then
-     case $ac_new_val in
--    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    *\'*) 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
-@@ -2085,10 +2218,12 @@
-   fi
- done
- if $ac_cache_corrupted; then
--  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
--echo "$as_me: error: changes in the environment can compromise the build" >&2;}
--  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
--echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-@@ -2144,8 +2279,8 @@
-   fi
- done
- if test -z "$ac_aux_dir"; then
--  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in bin \"$srcdir\"/bin" >&5
--echo "$as_me: error: cannot find install-sh or install.sh in bin \"$srcdir\"/bin" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in bin \"$srcdir\"/bin" >&5
-+$as_echo "$as_me: error: cannot find install-sh or install.sh in bin \"$srcdir\"/bin" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-@@ -2174,11 +2309,12 @@
- # 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.
--{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-+# Reject install programs that cannot install multiple files.
-+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+$as_echo_n "checking for a BSD-compatible install... " >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
-@@ -2207,17 +2343,29 @@
- 	    # program-specific install script used by HP pwplus--don't use.
- 	    :
- 	  else
--	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
--	    break 3
-+	    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
-@@ -2230,8 +2378,8 @@
-     INSTALL=$ac_install_sh
-   fi
- fi
--{ echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-+$as_echo "$INSTALL" >&6; }
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -2241,8 +2389,8 @@
- 
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
--{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
--echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+$as_echo_n "checking whether build environment is sane... " >&6; }
- # Just in case
- sleep 1
- echo timestamp > conftest.file
-@@ -2265,9 +2413,9 @@
-       # 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".
--      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-+      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
- alias in your environment" >&5
--echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-+$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
- alias in your environment" >&2;}
-    { (exit 1); exit 1; }; }
-    fi
-@@ -2278,26 +2426,23 @@
-    # Ok.
-    :
- else
--   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-+   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
- Check your system clock" >&5
--echo "$as_me: error: newly created file is older than distributed files!
-+$as_echo "$as_me: error: newly created file is older than distributed files!
- Check your system clock" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- test "$program_prefix" != NONE &&
-   program_transform_name="s&^&$program_prefix&;$program_transform_name"
- # Use a double $ so make ignores it.
- test "$program_suffix" != NONE &&
-   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
--# Double any \ or $.  echo might interpret backslashes.
-+# Double any \ or $.
- # By default was `s,x,x', remove it if useless.
--cat <<\_ACEOF >conftest.sed
--s/[\\$]/&&/g;s/;s,x,x,$//
--_ACEOF
--program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
--rm -f conftest.sed
-+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`
-@@ -2308,15 +2453,15 @@
-   am_missing_run="$MISSING --run "
- else
-   am_missing_run=
--  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
--echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-+  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
- 
--{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
--echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
- if test -z "$MKDIR_P"; then
-   if test "${ac_cv_path_mkdir+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-@@ -2351,8 +2496,8 @@
-     MKDIR_P="$ac_install_sh -d"
-   fi
- fi
--{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
--echo "${ECHO_T}$MKDIR_P" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-+$as_echo "$MKDIR_P" >&6; }
- 
- mkdir_p="$MKDIR_P"
- case $mkdir_p in
-@@ -2364,10 +2509,10 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_AWK+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$AWK"; then
-   ac_cv_prog_AWK="$AWK" # Let the user override the test.
-@@ -2380,7 +2525,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_AWK="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -2391,22 +2536,23 @@
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
--  { echo "$as_me:$LINENO: result: $AWK" >&5
--echo "${ECHO_T}$AWK" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
-+$as_echo "$AWK" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-   test -n "$AWK" && break
- done
- 
--{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
--echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
--set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-+set x ${MAKE-make}
-+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
- if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.make <<\_ACEOF
- SHELL = /bin/sh
-@@ -2423,12 +2569,12 @@
- rm -f conftest.make
- fi
- if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-   SET_MAKE=
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
- 
-@@ -2447,8 +2593,8 @@
-   am__isrc=' -I$(srcdir)'
-   # test to see if srcdir already configured
-   if test -f $srcdir/config.status; then
--    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
--echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-+    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-+$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-    { (exit 1); exit 1; }; }
-   fi
- fi
-@@ -2503,10 +2649,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$STRIP"; then
-   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -2519,7 +2665,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -2530,11 +2676,11 @@
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
--  { echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-+$as_echo "$STRIP" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -2543,10 +2689,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -2559,7 +2705,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_STRIP="strip"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -2570,11 +2716,11 @@
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+$as_echo "$ac_ct_STRIP" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
-   if test "x$ac_ct_STRIP" = x; then
-@@ -2582,12 +2728,8 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     STRIP=$ac_ct_STRIP
-@@ -2612,8 +2754,8 @@
- 
- 
- 
--{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
--echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-     # Check whether --enable-maintainer-mode was given.
- if test "${enable_maintainer_mode+set}" = set; then
-   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-@@ -2621,8 +2763,8 @@
-   USE_MAINTAINER_MODE=no
- fi
- 
--  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
--echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+$as_echo "$USE_MAINTAINER_MODE" >&6; }
-    if test $USE_MAINTAINER_MODE = yes; then
-   MAINTAINER_MODE_TRUE=
-   MAINTAINER_MODE_FALSE='#'
-@@ -2646,34 +2788,34 @@
- 
- # Make sure we can run config.sub.
- $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
--  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
--echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-    { (exit 1); exit 1; }; }
- 
--{ echo "$as_me:$LINENO: checking build system type" >&5
--echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
-+$as_echo_n "checking build system type... " >&6; }
- if test "${ac_cv_build+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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 &&
--  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
--echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-    { (exit 1); exit 1; }; }
- ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
--  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
--echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
--echo "${ECHO_T}$ac_cv_build" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+$as_echo "$ac_cv_build" >&6; }
- case $ac_cv_build in
- *-*-*) ;;
--*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
--echo "$as_me: error: invalid value of canonical build" >&2;}
-+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
-    { (exit 1); exit 1; }; };;
- esac
- build=$ac_cv_build
-@@ -2690,27 +2832,27 @@
- case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
- 
- 
--{ echo "$as_me:$LINENO: checking host system type" >&5
--echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
-+$as_echo_n "checking host system type... " >&6; }
- if test "${ac_cv_host+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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` ||
--    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
--echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
--echo "${ECHO_T}$ac_cv_host" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+$as_echo "$ac_cv_host" >&6; }
- case $ac_cv_host in
- *-*-*) ;;
--*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
--echo "$as_me: error: invalid value of canonical host" >&2;}
-+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
-    { (exit 1); exit 1; }; };;
- esac
- host=$ac_cv_host
-@@ -2747,11 +2889,11 @@
- 
- 
- 
--{ echo "$as_me:$LINENO: checking shell variables initial values" >&5
--echo $ECHO_N "checking shell variables initial values... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking shell variables initial values" >&5
-+$as_echo_n "checking shell variables initial values... " >&6; }
- set >&5
--{ echo "$as_me:$LINENO: result: done" >&5
--echo "${ECHO_T}done" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: done" >&5
-+$as_echo "done" >&6; }
- 
- 
- 
-@@ -2776,46 +2918,46 @@
- 
- 
- 
--{ echo "$as_me:$LINENO: checking if basename works" >&5
--echo $ECHO_N "checking if basename works... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if basename works" >&5
-+$as_echo_n "checking if basename works... " >&6; }
- BASENAME_TEST="`basename /foo/bar/baz/qux/basename_works`"
- if test $BASENAME_TEST != "basename_works"; then
--  { { echo "$as_me:$LINENO: error: basename program doesn't work" >&5
--echo "$as_me: error: basename program doesn't work" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: basename program doesn't work" >&5
-+$as_echo "$as_me: error: basename program doesn't work" >&2;}
-    { (exit 1); exit 1; }; }
- else
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
- 
--{ echo "$as_me:$LINENO: checking if xargs works" >&5
--echo $ECHO_N "checking if xargs works... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if xargs works" >&5
-+$as_echo_n "checking if xargs works... " >&6; }
- XARGS_TEST="`echo /foo/bar/baz/qux/xargs_works | xargs basename`"
- if test $XARGS_TEST != "xargs_works"; then
--  { { echo "$as_me:$LINENO: error: xargs program doesn't work" >&5
--echo "$as_me: error: xargs program doesn't work" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: xargs program doesn't work" >&5
-+$as_echo "$as_me: error: xargs program doesn't work" >&2;}
-    { (exit 1); exit 1; }; }
- else
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
- 
--{ echo "$as_me:$LINENO: checking for cached host" >&5
--echo $ECHO_N "checking for cached host... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for cached host" >&5
-+$as_echo_n "checking for cached host... " >&6; }
- if test "${hdf5_cv_host+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   hdf5_cv_host="none"
- fi
--{ echo "$as_me:$LINENO: result: $hdf5_cv_host" >&5
--echo "${ECHO_T}$hdf5_cv_host" >&6; };
-+{ $as_echo "$as_me:$LINENO: result: $hdf5_cv_host" >&5
-+$as_echo "$hdf5_cv_host" >&6; };
- if test $hdf5_cv_host = "none"; then
-   hdf5_cv_host=$host
- elif test $hdf5_cv_host != $host; then
-   echo "The config.cache file was generated on $hdf5_cv_host but"
-   echo "this is $host.  Please remove that file and try again."
--  { { echo "$as_me:$LINENO: error: config.cache file is invalid" >&5
--echo "$as_me: error: config.cache file is invalid" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: config.cache file is invalid" >&5
-+$as_echo "$as_me: error: config.cache file is invalid" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-@@ -2861,16 +3003,16 @@
-          $host_os_novers \
-          $host_vendor \
-          $host_cpu ; do
--  { echo "$as_me:$LINENO: checking for config $f" >&5
--echo $ECHO_N "checking for config $f... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for config $f" >&5
-+$as_echo_n "checking for config $f... " >&6; }
-   if test -f "$srcdir/config/$f"; then
-     host_config=$srcdir/config/$f
--    { echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: found" >&5
-+$as_echo "found" >&6; }
-     break
-   fi
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- done
- if test "X$host_config" != "Xnone"; then
-   CC_BASENAME="`echo $CC | cut -f1 -d' ' | xargs basename 2>/dev/null`"
-@@ -2880,16 +3022,16 @@
- hname="`hostname`"
- while test -n "$hname"; do
-   file=$srcdir/config/site-specific/host-$hname
--  { echo "$as_me:$LINENO: checking for config $file" >&5
--echo $ECHO_N "checking for config $file... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for config $file" >&5
-+$as_echo_n "checking for config $file... " >&6; }
-   if test -f "$file"; then
-     . $file
--    { echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: found" >&5
-+$as_echo "found" >&6; }
-     break
-   fi
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-   hname_tmp=$hname
-   hname="`echo $hname | cut -d. -f2-99`"
-   test "$hname_tmp" = "$hname" && break
-@@ -2907,10 +3049,10 @@
- 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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2923,7 +3065,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}gcc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -2934,11 +3076,11 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -2947,10 +3089,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -2963,7 +3105,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="gcc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -2974,11 +3116,11 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
-   if test "x$ac_ct_CC" = x; then
-@@ -2986,12 +3128,8 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     CC=$ac_ct_CC
-@@ -3004,10 +3142,10 @@
-           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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3020,7 +3158,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -3031,11 +3169,11 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -3044,10 +3182,10 @@
- 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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3065,7 +3203,7 @@
-        continue
-      fi
-     ac_cv_prog_CC="cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -3088,11 +3226,11 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -3103,10 +3241,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -3119,7 +3257,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -3130,11 +3268,11 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+$as_echo "$CC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -3147,10 +3285,10 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -3163,7 +3301,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -3174,11 +3312,11 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -3190,12 +3328,8 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     CC=$ac_ct_CC
-@@ -3205,44 +3339,50 @@
- fi
- 
- 
--test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
- See \`config.log' for more details." >&5
--echo "$as_me: error: no acceptable C compiler found in \$PATH
-+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- 
- # Provide some information about the compiler.
--echo "$as_me:$LINENO: checking for C compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
-+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
- { (ac_try="$ac_compiler --version >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -v >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -V >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
- cat >conftest.$ac_ext <<_ACEOF
-@@ -3261,27 +3401,22 @@
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.exe b.out"
-+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.
--{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
--echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
--ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--#
--# List of possible output files, starting from the most likely.
--# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
--# only as a last resort.  b.out is created by i960 compilers.
--ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
--#
--# The IRIX 6 linker writes into existing files which may not be
--# executable, retaining their permissions.  Remove them first so a
--# subsequent execution test works.
-+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-+
-+# The possible output files:
-+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 | *.o | *.obj ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-   esac
- done
-@@ -3292,10 +3427,11 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link_default") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
- # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-@@ -3306,7 +3442,7 @@
- do
-   test -f "$ac_file" || continue
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-+    *.$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
-@@ -3333,25 +3469,27 @@
-   ac_file=''
- fi
- 
--{ echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- if test -z "$ac_file"; then
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
- See \`config.log' for more details." >&5
--echo "$as_me: error: C compiler cannot create executables
-+$as_echo "$as_me: error: C compiler cannot create executables
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
- fi
- 
- ac_exeext=$ac_cv_exeext
- 
- # Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-@@ -3360,49 +3498,53 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
- 	cross_compiling=yes
-     else
--	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run C compiled programs.
-+$as_echo "$as_me: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
-     fi
-   fi
- fi
--{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 
--rm -f a.out a.exe conftest$ac_cv_exeext b.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
- # Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
--{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
--echo "${ECHO_T}$cross_compiling" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
- 
--{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+$as_echo_n "checking for suffix of executables... " >&6; }
- if { (ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # If both `conftest.exe' and `conftest' are `present' (well, observable)
- # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-@@ -3411,31 +3553,33 @@
- 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 | *.o | *.obj ) ;;
-+    *.$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
--  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- fi
- 
- rm -f conftest$ac_cv_exeext
--{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+$as_echo "$ac_cv_exeext" >&6; }
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
--echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+$as_echo_n "checking for suffix of object files... " >&6; }
- if test "${ac_cv_objext+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -3458,40 +3602,43 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   for ac_file in conftest.o conftest.obj conftest.*; do
-   test -f "$ac_file" || continue;
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-        break;;
-   esac
- done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute suffix of object files: cannot compile
-+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- fi
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--echo "${ECHO_T}$ac_cv_objext" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+$as_echo "$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -3517,20 +3664,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_compiler_gnu=no
-@@ -3540,15 +3688,19 @@
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
--GCC=`test $ac_compiler_gnu = yes && echo yes`
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GCC=yes
-+else
-+  GCC=
-+fi
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+$as_echo_n "checking whether $CC accepts -g... " >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_save_c_werror_flag=$ac_c_werror_flag
-    ac_c_werror_flag=yes
-@@ -3575,20 +3727,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_g=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	CFLAGS=""
-@@ -3613,20 +3766,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   :
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -3652,20 +3806,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_g=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
-@@ -3680,8 +3835,8 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+$as_echo "$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
-   CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-@@ -3697,10 +3852,10 @@
-     CFLAGS=
-   fi
- fi
--{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
--echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
- if test "${ac_cv_prog_cc_c89+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
-@@ -3771,20 +3926,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_c89=$ac_arg
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
-@@ -3800,15 +3956,15 @@
- # AC_CACHE_VAL
- case "x$ac_cv_prog_cc_c89" in
-   x)
--    { echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6; } ;;
-+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
-+$as_echo "none needed" >&6; } ;;
-   xno)
--    { echo "$as_me:$LINENO: result: unsupported" >&5
--echo "${ECHO_T}unsupported" >&6; } ;;
-+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-+$as_echo "unsupported" >&6; } ;;
-   *)
-     CC="$CC $ac_cv_prog_cc_c89"
--    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
- esac
- 
- 
-@@ -3829,8 +3985,8 @@
- .PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
--{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
--echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-+$as_echo_n "checking for style of include used by $am_make... " >&6; }
- am__include="#"
- am__quote=
- _am_result=none
-@@ -3857,8 +4013,8 @@
- fi
- 
- 
--{ echo "$as_me:$LINENO: result: $_am_result" >&5
--echo "${ECHO_T}$_am_result" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
-+$as_echo "$_am_result" >&6; }
- rm -f confinc confmf
- 
- # Check whether --enable-dependency-tracking was given.
-@@ -3882,10 +4038,10 @@
- 
- depcc="$CC"   am_compiler_list=
- 
--{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+$as_echo_n "checking dependency style of $depcc... " >&6; }
- if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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
-@@ -3973,8 +4129,8 @@
- fi
- 
- fi
--{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- 
-  if
-@@ -3991,8 +4147,8 @@
- CC_BASENAME="`echo $CC | cut -f1 -d' ' | xargs basename 2>/dev/null`"
- 
-  HDF5_INTERFACES=""
--{ echo "$as_me:$LINENO: checking if Fortran interface enabled" >&5
--echo $ECHO_N "checking if Fortran interface enabled... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if Fortran interface enabled" >&5
-+$as_echo_n "checking if Fortran interface enabled... " >&6; }
- # Check whether --enable-fortran was given.
- if test "${enable_fortran+set}" = set; then
-   enableval=$enable_fortran; HDF_FORTRAN=$enableval
-@@ -4028,10 +4184,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_FC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$FC"; then
-   ac_cv_prog_FC="$FC" # Let the user override the test.
-@@ -4044,7 +4200,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_FC="$ac_tool_prefix$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -4055,11 +4211,11 @@
- fi
- FC=$ac_cv_prog_FC
- if test -n "$FC"; then
--  { echo "$as_me:$LINENO: result: $FC" >&5
--echo "${ECHO_T}$FC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $FC" >&5
-+$as_echo "$FC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -4072,10 +4228,10 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_FC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_FC"; then
-   ac_cv_prog_ac_ct_FC="$ac_ct_FC" # Let the user override the test.
-@@ -4088,7 +4244,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_FC="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -4099,11 +4255,11 @@
- fi
- ac_ct_FC=$ac_cv_prog_ac_ct_FC
- if test -n "$ac_ct_FC"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_FC" >&5
--echo "${ECHO_T}$ac_ct_FC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_FC" >&5
-+$as_echo "$ac_ct_FC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -4115,12 +4271,8 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     FC=$ac_ct_FC
-@@ -4129,37 +4281,41 @@
- 
- 
- # Provide some information about the compiler.
--echo "$as_me:$LINENO: checking for Fortran compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
-+$as_echo "$as_me:$LINENO: checking for Fortran compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
- { (ac_try="$ac_compiler --version >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -v >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -V >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- rm -f a.out
- 
-@@ -4167,10 +4323,10 @@
- # input file.  (Note that this only needs to work for GNU compilers.)
- ac_save_ext=$ac_ext
- ac_ext=F
--{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU Fortran compiler... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran compiler" >&5
-+$as_echo_n "checking whether we are using the GNU Fortran compiler... " >&6; }
- if test "${ac_cv_fc_compiler_gnu+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-       program main
-@@ -4186,20 +4342,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_fc_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_compiler_gnu=no
-@@ -4209,16 +4366,16 @@
- ac_cv_fc_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_fc_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_fc_compiler_gnu" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_fc_compiler_gnu" >&5
-+$as_echo "$ac_cv_fc_compiler_gnu" >&6; }
- ac_ext=$ac_save_ext
- ac_test_FFLAGS=${FCFLAGS+set}
- ac_save_FFLAGS=$FCFLAGS
- FCFLAGS=
--{ echo "$as_me:$LINENO: checking whether $FC accepts -g" >&5
--echo $ECHO_N "checking whether $FC accepts -g... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether $FC accepts -g" >&5
-+$as_echo_n "checking whether $FC accepts -g... " >&6; }
- if test "${ac_cv_prog_fc_g+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   FCFLAGS=-g
- cat >conftest.$ac_ext <<_ACEOF
-@@ -4232,20 +4389,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_fc_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_fc_g=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_prog_fc_g=no
-@@ -4254,8 +4412,8 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_prog_fc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_fc_g" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_fc_g" >&5
-+$as_echo "$ac_cv_prog_fc_g" >&6; }
- if test "$ac_test_FFLAGS" = set; then
-   FCFLAGS=$ac_save_FFLAGS
- elif test $ac_cv_prog_fc_g = yes; then
-@@ -4282,10 +4440,10 @@
- ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
- ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_fc_compiler_gnu
--{ echo "$as_me:$LINENO: checking for Fortran flag to compile .f90 files" >&5
--echo $ECHO_N "checking for Fortran flag to compile .f90 files... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for Fortran flag to compile .f90 files" >&5
-+$as_echo_n "checking for Fortran flag to compile .f90 files... " >&6; }
- if test "${ac_cv_fc_srcext_f90+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_ext=f90
- ac_fcflags_srcext_save=$ac_fcflags_srcext
-@@ -4304,20 +4462,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_fc_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_fc_srcext_f90=$ac_flag; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
-@@ -4329,11 +4488,11 @@
- ac_fcflags_srcext=$ac_fcflags_srcext_save
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_fc_srcext_f90" >&5
--echo "${ECHO_T}$ac_cv_fc_srcext_f90" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_fc_srcext_f90" >&5
-+$as_echo "$ac_cv_fc_srcext_f90" >&6; }
- if test "x$ac_cv_fc_srcext_f90" = xunknown; then
--  { { echo "$as_me:$LINENO: error: Fortran could not compile .f90 files" >&5
--echo "$as_me: error: Fortran could not compile .f90 files" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: Fortran could not compile .f90 files" >&5
-+$as_echo "$as_me: error: Fortran could not compile .f90 files" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   ac_fc_srcext=f90
-@@ -4366,10 +4525,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_FC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$FC"; then
-   ac_cv_prog_FC="$FC" # Let the user override the test.
-@@ -4382,7 +4541,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_FC="$ac_tool_prefix$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -4393,11 +4552,11 @@
- fi
- FC=$ac_cv_prog_FC
- if test -n "$FC"; then
--  { echo "$as_me:$LINENO: result: $FC" >&5
--echo "${ECHO_T}$FC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $FC" >&5
-+$as_echo "$FC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -4410,10 +4569,10 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_FC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_FC"; then
-   ac_cv_prog_ac_ct_FC="$ac_ct_FC" # Let the user override the test.
-@@ -4426,7 +4585,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_FC="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -4437,11 +4596,11 @@
- fi
- ac_ct_FC=$ac_cv_prog_ac_ct_FC
- if test -n "$ac_ct_FC"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_FC" >&5
--echo "${ECHO_T}$ac_ct_FC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_FC" >&5
-+$as_echo "$ac_ct_FC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -4453,12 +4612,8 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     FC=$ac_ct_FC
-@@ -4467,37 +4622,41 @@
- 
- 
- # Provide some information about the compiler.
--echo "$as_me:$LINENO: checking for Fortran compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
-+$as_echo "$as_me:$LINENO: checking for Fortran compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
- { (ac_try="$ac_compiler --version >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -v >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -V >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- rm -f a.out
- 
-@@ -4505,10 +4664,10 @@
- # input file.  (Note that this only needs to work for GNU compilers.)
- ac_save_ext=$ac_ext
- ac_ext=F
--{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU Fortran compiler... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran compiler" >&5
-+$as_echo_n "checking whether we are using the GNU Fortran compiler... " >&6; }
- if test "${ac_cv_fc_compiler_gnu+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-       program main
-@@ -4524,20 +4683,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_fc_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_compiler_gnu=no
-@@ -4547,16 +4707,16 @@
- ac_cv_fc_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_fc_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_fc_compiler_gnu" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_fc_compiler_gnu" >&5
-+$as_echo "$ac_cv_fc_compiler_gnu" >&6; }
- ac_ext=$ac_save_ext
- ac_test_FFLAGS=${FCFLAGS+set}
- ac_save_FFLAGS=$FCFLAGS
- FCFLAGS=
--{ echo "$as_me:$LINENO: checking whether $FC accepts -g" >&5
--echo $ECHO_N "checking whether $FC accepts -g... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether $FC accepts -g" >&5
-+$as_echo_n "checking whether $FC accepts -g... " >&6; }
- if test "${ac_cv_prog_fc_g+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   FCFLAGS=-g
- cat >conftest.$ac_ext <<_ACEOF
-@@ -4570,20 +4730,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_fc_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_fc_g=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_prog_fc_g=no
-@@ -4592,8 +4753,8 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_prog_fc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_fc_g" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_fc_g" >&5
-+$as_echo "$ac_cv_prog_fc_g" >&6; }
- if test "$ac_test_FFLAGS" = set; then
-   FCFLAGS=$ac_save_FFLAGS
- elif test $ac_cv_prog_fc_g = yes; then
-@@ -4616,8 +4777,8 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--  { echo "$as_me:$LINENO: checking what $FC does with modules" >&5
--echo $ECHO_N "checking what $FC does with modules... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking what $FC does with modules" >&5
-+$as_echo_n "checking what $FC does with modules... " >&6; }
- ac_ext=${ac_fc_srcext-f}
- ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
- ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-@@ -4669,8 +4830,8 @@
- fi
- cd ..
- 
--{ echo "$as_me:$LINENO: checking how $FC finds modules" >&5
--echo $ECHO_N "checking how $FC finds modules... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking how $FC finds modules" >&5
-+$as_echo_n "checking how $FC finds modules... " >&6; }
- 
- for flag in "-I" "-M" "-p"; do
-   cat >conftest.$ac_ext <<EOF
-@@ -4684,7 +4845,7 @@
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-     F9XMODFLAG=$flag
-     break
-@@ -4720,10 +4881,10 @@
- ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
- ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_fc_compiler_gnu
--{ echo "$as_me:$LINENO: checking how to get verbose linking output from $FC" >&5
--echo $ECHO_N "checking how to get verbose linking output from $FC... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking how to get verbose linking output from $FC" >&5
-+$as_echo_n "checking how to get verbose linking output from $FC... " >&6; }
- if test "${ac_cv_prog_fc_v+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-       program main
-@@ -4736,13 +4897,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_fc_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -4764,19 +4926,22 @@
- FCFLAGS="$FCFLAGS $ac_verb"
- eval "set x $ac_link"
- shift
--echo "$as_me:$LINENO: $*" >&5
--ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
--echo "$ac_fc_v_output" >&5
-+$as_echo "$as_me:$LINENO: $*" >&5
-+# gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH,
-+# LIBRARY_PATH; skip all such settings.
-+ac_fc_v_output=`eval $ac_link 5>&1 2>&1 |
-+  grep -v 'Driving:' | grep -v "^[_$as_cr_Letters][_$as_cr_alnum]*="`
-+$as_echo "$ac_fc_v_output" >&5
- FCFLAGS=$ac_save_FFLAGS
- 
--rm -f conftest*
-+rm -rf conftest*
- 
- # On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where
- # /foo, /bar, and /baz are search directories for the Fortran linker.
- # Here, we change these into -L/foo -L/bar -L/baz (and put it first):
- ac_fc_v_output="`echo $ac_fc_v_output |
- 	grep 'LPATH is:' |
--	sed 's,.*LPATH is\(: *[^ ]*\).*,\1,;s,: */, -L/,g'` $ac_fc_v_output"
-+	sed 's|.*LPATH is\(: *[^ ]*\).*|\1|;s|: */| -L/|g'` $ac_fc_v_output"
- 
- # FIXME: we keep getting bitten by quoted arguments; a more general fix
- #        that detects unbalanced quotes in FLIBS should be implemented
-@@ -4816,26 +4981,26 @@
-   done
- done
- if test -z "$ac_cv_prog_fc_v"; then
--   { echo "$as_me:$LINENO: WARNING: cannot determine how to obtain linking information from $FC" >&5
--echo "$as_me: WARNING: cannot determine how to obtain linking information from $FC" >&2;}
-+   { $as_echo "$as_me:$LINENO: WARNING: cannot determine how to obtain linking information from $FC" >&5
-+$as_echo "$as_me: WARNING: cannot determine how to obtain linking information from $FC" >&2;}
- fi
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: WARNING: compilation failed" >&5
--echo "$as_me: WARNING: compilation failed" >&2;}
-+	{ $as_echo "$as_me:$LINENO: WARNING: compilation failed" >&5
-+$as_echo "$as_me: WARNING: compilation failed" >&2;}
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_prog_fc_v" >&5
--echo "${ECHO_T}$ac_cv_prog_fc_v" >&6; }
--{ echo "$as_me:$LINENO: checking for Fortran libraries of $FC" >&5
--echo $ECHO_N "checking for Fortran libraries of $FC... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_fc_v" >&5
-+$as_echo "$ac_cv_prog_fc_v" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for Fortran libraries of $FC" >&5
-+$as_echo_n "checking for Fortran libraries of $FC... " >&6; }
- if test "${ac_cv_fc_libs+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "x$FCLIBS" != "x"; then
-   ac_cv_fc_libs="$FCLIBS" # Let the user override the test.
-@@ -4855,19 +5020,22 @@
- FCFLAGS="$FCFLAGS $ac_cv_prog_fc_v"
- eval "set x $ac_link"
- shift
--echo "$as_me:$LINENO: $*" >&5
--ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
--echo "$ac_fc_v_output" >&5
-+$as_echo "$as_me:$LINENO: $*" >&5
-+# gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH,
-+# LIBRARY_PATH; skip all such settings.
-+ac_fc_v_output=`eval $ac_link 5>&1 2>&1 |
-+  grep -v 'Driving:' | grep -v "^[_$as_cr_Letters][_$as_cr_alnum]*="`
-+$as_echo "$ac_fc_v_output" >&5
- FCFLAGS=$ac_save_FFLAGS
- 
--rm -f conftest*
-+rm -rf conftest*
- 
- # On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where
- # /foo, /bar, and /baz are search directories for the Fortran linker.
- # Here, we change these into -L/foo -L/bar -L/baz (and put it first):
- ac_fc_v_output="`echo $ac_fc_v_output |
- 	grep 'LPATH is:' |
--	sed 's,.*LPATH is\(: *[^ ]*\).*,\1,;s,: */, -L/,g'` $ac_fc_v_output"
-+	sed 's|.*LPATH is\(: *[^ ]*\).*|\1|;s|: */| -L/|g'` $ac_fc_v_output"
- 
- # FIXME: we keep getting bitten by quoted arguments; a more general fix
- #        that detects unbalanced quotes in FLIBS should be implemented
-@@ -4966,7 +5134,7 @@
- 	  esac
-           ;;
-         -YP,*)
--          for ac_j in `echo $ac_arg | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do
-+          for ac_j in `$as_echo "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do
-               ac_exists=false
-   for ac_i in $ac_cv_fc_libs; do
-     if test x"$ac_j" = x"$ac_i"; then
-@@ -5014,7 +5182,7 @@
- # must begin with a "/").
- case `(uname -sr) 2>/dev/null` in
-    "SunOS 5"*)
--      ac_ld_run_path=`echo $ac_fc_v_output |
-+      ac_ld_run_path=`$as_echo "$ac_fc_v_output" |
-                         sed -n 's,^.*LD_RUN_PATH *= *\(/[^ ]*\).*$,-R\1,p'`
-       test "x$ac_ld_run_path" != x &&
-         if test "$ac_compiler_gnu" = yes; then
-@@ -5029,8 +5197,8 @@
- fi # test "x$[]_AC_LANG_PREFIX[]LIBS" = "x"
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_fc_libs" >&5
--echo "${ECHO_T}$ac_cv_fc_libs" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_fc_libs" >&5
-+$as_echo "$ac_cv_fc_libs" >&6; }
- FCLIBS="$ac_cv_fc_libs"
- 
- 
-@@ -5045,10 +5213,10 @@
- ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_fc_compiler_gnu
- 
--{ echo "$as_me:$LINENO: checking for dummy main to link with Fortran libraries" >&5
--echo $ECHO_N "checking for dummy main to link with Fortran libraries... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for dummy main to link with Fortran libraries" >&5
-+$as_echo_n "checking for dummy main to link with Fortran libraries... " >&6; }
- if test "${ac_cv_fc_dummy_main+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_fc_dm_save_LIBS=$LIBS
-  LIBS="$LIBS $FCLIBS"
-@@ -5089,26 +5257,30 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_fortran_dummy_main=none
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_fortran_dummy_main=unknown
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 
-@@ -5143,26 +5315,30 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_fortran_dummy_main=$ac_func; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-    done
-@@ -5172,12 +5348,12 @@
- ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_fc_compiler_gnu
-  ac_cv_fc_dummy_main=$ac_cv_fortran_dummy_main
-- rm -f conftest*
-+ rm -rf conftest*
-  LIBS=$ac_fc_dm_save_LIBS
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_fc_dummy_main" >&5
--echo "${ECHO_T}$ac_cv_fc_dummy_main" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_fc_dummy_main" >&5
-+$as_echo "$ac_cv_fc_dummy_main" >&6; }
- FC_DUMMY_MAIN=$ac_cv_fc_dummy_main
- if test "$FC_DUMMY_MAIN" != unknown; then
-   if test $FC_DUMMY_MAIN != none; then
-@@ -5195,11 +5371,13 @@
-   fi
- fi
- else
--  { { echo "$as_me:$LINENO: error: linking to Fortran libraries from C fails
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: linking to Fortran libraries from C fails
- See \`config.log' for more details." >&5
--echo "$as_me: error: linking to Fortran libraries from C fails
-+$as_echo "$as_me: error: linking to Fortran libraries from C fails
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- fi
- 
- 
-@@ -5212,10 +5390,10 @@
- ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
- ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_fc_compiler_gnu
--{ echo "$as_me:$LINENO: checking for Fortran name-mangling scheme" >&5
--echo $ECHO_N "checking for Fortran name-mangling scheme... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for Fortran name-mangling scheme" >&5
-+$as_echo_n "checking for Fortran name-mangling scheme... " >&6; }
- if test "${ac_cv_fc_mangling+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-       subroutine foobar()
-@@ -5231,13 +5409,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_fc_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -5292,26 +5471,30 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_success=yes; break 2
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-     done
-@@ -5377,26 +5560,30 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_success_extra=yes; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-      done
-@@ -5425,23 +5612,26 @@
-   fi
- 
-   LIBS=$ac_save_LIBS
--  rm -f cfortran_test* conftest*
-+  rm -rf conftest*
-+  rm -f cfortran_test*
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ { echo "$as_me:$LINENO: error: cannot compile a simple Fortran program
-+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compile a simple Fortran program
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compile a simple Fortran program
-+$as_echo "$as_me: error: cannot compile a simple Fortran program
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_fc_mangling" >&5
--echo "${ECHO_T}$ac_cv_fc_mangling" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_fc_mangling" >&5
-+$as_echo "$ac_cv_fc_mangling" >&6; }
- 
- ac_ext=${ac_fc_srcext-f}
- ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
-@@ -5528,8 +5718,8 @@
- _ACEOF
-  ;;
-   *)
--          { echo "$as_me:$LINENO: WARNING: unknown Fortran name-mangling scheme" >&5
--echo "$as_me: WARNING: unknown Fortran name-mangling scheme" >&2;}
-+          { $as_echo "$as_me:$LINENO: WARNING: unknown Fortran name-mangling scheme" >&5
-+$as_echo "$as_me: WARNING: unknown Fortran name-mangling scheme" >&2;}
-           ;;
- esac
- 
-@@ -5542,14 +5732,16 @@
- 
- 
- 
--  { echo "$as_me:$LINENO: checking if Fortran compiler supports intrinsic SIZEOF" >&5
--echo $ECHO_N "checking if Fortran compiler supports intrinsic SIZEOF... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking if Fortran compiler supports intrinsic SIZEOF" >&5
-+$as_echo_n "checking if Fortran compiler supports intrinsic SIZEOF... " >&6; }
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- 
-@@ -5564,32 +5756,35 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-      	HAVE_SIZEOF="yes"
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
--{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
-@@ -5598,15 +5793,17 @@
- 
- 
- 
--  { echo "$as_me:$LINENO: checking if Fortran default REAL is DOUBLE PRECISION" >&5
--echo $ECHO_N "checking if Fortran default REAL is DOUBLE PRECISION... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking if Fortran default REAL is DOUBLE PRECISION" >&5
-+$as_echo_n "checking if Fortran default REAL is DOUBLE PRECISION... " >&6; }
- 
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- 
-@@ -5638,32 +5835,35 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
--{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-        FORTRAN_DEFAULT_REALisDBLE="yes"
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
-@@ -5709,10 +5909,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$CXX"; then
-   ac_cv_prog_CXX="$CXX" # Let the user override the test.
-@@ -5725,7 +5925,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -5736,11 +5936,11 @@
- fi
- CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
--  { echo "$as_me:$LINENO: result: $CXX" >&5
--echo "${ECHO_T}$CXX" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
-+$as_echo "$CXX" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -5753,10 +5953,10 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -5769,7 +5969,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CXX="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -5780,11 +5980,11 @@
- fi
- ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
- if test -n "$ac_ct_CXX"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
--echo "${ECHO_T}$ac_ct_CXX" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-+$as_echo "$ac_ct_CXX" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -5796,12 +5996,8 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     CXX=$ac_ct_CXX
-@@ -5811,43 +6007,47 @@
-   fi
- fi
- # Provide some information about the compiler.
--echo "$as_me:$LINENO: checking for C++ compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
-+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
- { (ac_try="$ac_compiler --version >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -v >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -V >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
--{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
- if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -5881,20 +6081,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_compiler_gnu=no
-@@ -5904,15 +6105,19 @@
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
--GXX=`test $ac_compiler_gnu = yes && echo yes`
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GXX=yes
-+else
-+  GXX=
-+fi
- ac_test_CXXFLAGS=${CXXFLAGS+set}
- ac_save_CXXFLAGS=$CXXFLAGS
--{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
--echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
- if test "${ac_cv_prog_cxx_g+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-    ac_cxx_werror_flag=yes
-@@ -5947,20 +6152,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cxx_g=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	CXXFLAGS=""
-@@ -5993,20 +6199,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   :
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-@@ -6040,20 +6247,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cxx_g=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
-@@ -6068,8 +6276,8 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-+$as_echo "$ac_cv_prog_cxx_g" >&6; }
- if test "$ac_test_CXXFLAGS" = set; then
-   CXXFLAGS=$ac_save_CXXFLAGS
- elif test $ac_cv_prog_cxx_g = yes; then
-@@ -6093,10 +6301,10 @@
- 
- depcc="$CXX"  am_compiler_list=
- 
--{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+$as_echo_n "checking dependency style of $depcc... " >&6; }
- if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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
-@@ -6184,8 +6392,8 @@
- fi
- 
- fi
--{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
- CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- 
-  if
-@@ -6204,11 +6412,11 @@
- 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
--{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
--echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-       # Double quotes because CXXCPP needs to be expanded
-     for CXXCPP in "$CXX -E" "/lib/cpp"
-@@ -6240,20 +6448,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   :
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Broken: fails on valid input.
-@@ -6277,13 +6486,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -6291,7 +6501,7 @@
-   # Broken: success on invalid input.
- continue
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Passes both tests.
-@@ -6316,8 +6526,8 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
--echo "${ECHO_T}$CXXCPP" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
-+$as_echo "$CXXCPP" >&6; }
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
- do
-@@ -6345,20 +6555,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   :
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Broken: fails on valid input.
-@@ -6382,13 +6593,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -6396,7 +6608,7 @@
-   # Broken: success on invalid input.
- continue
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Passes both tests.
-@@ -6412,11 +6624,13 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
- See \`config.log' for more details." >&5
--echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-+$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- fi
- 
- ac_ext=c
-@@ -6425,8 +6639,8 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--{ echo "$as_me:$LINENO: checking if c++ interface enabled" >&5
--echo $ECHO_N "checking if c++ interface enabled... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if c++ interface enabled" >&5
-+$as_echo_n "checking if c++ interface enabled... " >&6; }
- 
- # Check whether --enable-cxx was given.
- if test "${enable_cxx+set}" = set; then
-@@ -6445,15 +6659,17 @@
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
- 
--  { echo "$as_me:$LINENO: checking if $CXX needs old style header files in includes" >&5
--echo $ECHO_N "checking if $CXX needs old style header files in includes... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking if $CXX needs old style header files in includes" >&5
-+$as_echo_n "checking if $CXX needs old style header files in includes... " >&6; }
- 
- if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -6473,26 +6689,28 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
-     echo no
- 
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
-@@ -6501,19 +6719,22 @@
-     CXXFLAGS="${CXXFLAGS} -DOLD_HEADER_FILENAME"
- 
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 
- 
--  { echo "$as_me:$LINENO: checking if $CXX can handle namespaces" >&5
--echo $ECHO_N "checking if $CXX can handle namespaces... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking if $CXX can handle namespaces" >&5
-+$as_echo_n "checking if $CXX can handle namespaces... " >&6; }
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -6539,26 +6760,28 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
-      echo yes
- 
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
-@@ -6567,19 +6790,22 @@
-      CXXFLAGS="${CXXFLAGS} -DH5_NO_NAMESPACE"
- 
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 
- 
--  { echo "$as_me:$LINENO: checking if $CXX supports std" >&5
--echo $ECHO_N "checking if $CXX supports std... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking if $CXX supports std" >&5
-+$as_echo_n "checking if $CXX supports std... " >&6; }
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -6604,26 +6830,28 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
-      echo yes
- 
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
-@@ -6632,19 +6860,22 @@
-      CXXFLAGS="${CXXFLAGS} -DH5_NO_STD"
- 
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 
- 
--  { echo "$as_me:$LINENO: checking if $CXX supports bool types" >&5
--echo $ECHO_N "checking if $CXX supports bool types... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking if $CXX supports bool types" >&5
-+$as_echo_n "checking if $CXX supports bool types... " >&6; }
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -6665,26 +6896,28 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
-      echo yes
- 
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
-@@ -6693,13 +6926,14 @@
-      CXXFLAGS="${CXXFLAGS} -DBOOL_NOTDEFINED"
- 
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 
- 
--  { echo "$as_me:$LINENO: checking if $CXX has offsetof extension" >&5
--echo $ECHO_N "checking if $CXX has offsetof extension... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking if $CXX has offsetof extension" >&5
-+$as_echo_n "checking if $CXX has offsetof extension... " >&6; }
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -6743,13 +6977,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -6759,26 +6994,28 @@
- #define CXX_HAVE_OFFSETOF 1
- _ACEOF
- 
--    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--  { echo "$as_me:$LINENO: checking if $CXX can handle static cast" >&5
--echo $ECHO_N "checking if $CXX can handle static cast... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking if $CXX can handle static cast" >&5
-+$as_echo_n "checking if $CXX can handle static cast... " >&6; }
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -6802,26 +7039,28 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
-     echo yes
- 
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
-@@ -6830,6 +7069,7 @@
-     CXXFLAGS="${CXXFLAGS} -DNO_STATIC_CAST"
- 
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
-@@ -6845,8 +7085,8 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
--{ echo "$as_me:$LINENO: checking if should build only statically linked executables" >&5
--echo $ECHO_N "checking if should build only statically linked executables... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if should build only statically linked executables" >&5
-+$as_echo_n "checking if should build only statically linked executables... " >&6; }
- # Check whether --enable-static_exec was given.
- if test "${enable_static_exec+set}" = set; then
-   enableval=$enable_static_exec; STATIC_EXEC=$enableval
-@@ -6868,10 +7108,10 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_PERL+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$PERL"; then
-   ac_cv_prog_PERL="$PERL" # Let the user override the test.
-@@ -6884,7 +7124,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_PERL="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -6895,11 +7135,11 @@
- fi
- PERL=$ac_cv_prog_PERL
- if test -n "$PERL"; then
--  { echo "$as_me:$LINENO: result: $PERL" >&5
--echo "${ECHO_T}$PERL" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $PERL" >&5
-+$as_echo "$PERL" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -6914,10 +7154,10 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_AR+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$AR"; then
-   ac_cv_prog_AR="$AR" # Let the user override the test.
-@@ -6930,7 +7170,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_AR="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -6941,11 +7181,11 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  { echo "$as_me:$LINENO: result: $AR" >&5
--echo "${ECHO_T}$AR" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
-+$as_echo "$AR" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -6958,11 +7198,12 @@
- 
- export AR
- 
--{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
--echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
--set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-+set x ${MAKE-make}
-+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
- if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.make <<\_ACEOF
- SHELL = /bin/sh
-@@ -6979,12 +7220,12 @@
- rm -f conftest.make
- fi
- if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-   SET_MAKE=
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
- 
-@@ -7001,11 +7242,12 @@
- # 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.
--{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-+# Reject install programs that cannot install multiple files.
-+{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+$as_echo_n "checking for a BSD-compatible install... " >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
-@@ -7034,17 +7276,29 @@
- 	    # program-specific install script used by HP pwplus--don't use.
- 	    :
- 	  else
--	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
--	    break 3
-+	    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
-@@ -7057,8 +7311,8 @@
-     INSTALL=$ac_install_sh
-   fi
- fi
--{ echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-+$as_echo "$INSTALL" >&6; }
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -7073,10 +7327,10 @@
- 
- # Extract the first word of "tr", so it can be a program name with args.
- set dummy tr; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_path_TR+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   case $TR in
-   [\\/]* | ?:[\\/]*)
-@@ -7091,7 +7345,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_TR="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -7103,36 +7357,36 @@
- fi
- TR=$ac_cv_path_TR
- if test -n "$TR"; then
--  { echo "$as_me:$LINENO: result: $TR" >&5
--echo "${ECHO_T}$TR" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $TR" >&5
-+$as_echo "$TR" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
- 
- TR_TEST=`echo Test | ${TR} ${as_cr_letters}"," ${as_cr_LETTERS}" "`
- if test "X${TR_TEST}" != "XTEST"; then
--  { { echo "$as_me:$LINENO: error: tr program doesn't work" >&5
--echo "$as_me: error: tr program doesn't work" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: tr program doesn't work" >&5
-+$as_echo "$as_me: error: tr program doesn't work" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- 
--{ echo "$as_me:$LINENO: checking if srcdir= and time commands work together" >&5
--echo $ECHO_N "checking if srcdir= and time commands work together... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if srcdir= and time commands work together" >&5
-+$as_echo_n "checking if srcdir= and time commands work together... " >&6; }
- 
- 
- TIME=time
- TIME_TEST=`foo="bar" ${TIME} echo 'baz' 2> /dev/null | grep baz`
- 
- if test "X${TIME_TEST}" = "Xbaz"; then
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-   TIME=
- fi
- 
-@@ -7145,8 +7399,8 @@
- case "$CC_BASENAME" in
-   mpicc)
-             PARALLEL=mpicc
--    { echo "$as_me:$LINENO: checking for mpirun" >&5
--echo $ECHO_N "checking for mpirun... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for mpirun" >&5
-+$as_echo_n "checking for mpirun... " >&6; }
- 
-         cmd="`echo $CC | cut -f1 -d' '`"
-     if (echo $cmd | grep / >/dev/null); then
-@@ -7160,23 +7414,23 @@
-     fi
- 
-         if test -x $path/mpirun; then
--      { echo "$as_me:$LINENO: result: $path/mpirun" >&5
--echo "${ECHO_T}$path/mpirun" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: $path/mpirun" >&5
-+$as_echo "$path/mpirun" >&6; }
-       RUNSERIAL="${RUNSERIAL:-none}"
- 
-       if test -z "$RUNPARALLEL"; then
-         RUNPARALLEL="$path/mpirun -np \$\${NPROCS:=3}"
-       fi
-     else
--      { echo "$as_me:$LINENO: result: none" >&5
--echo "${ECHO_T}none" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: none" >&5
-+$as_echo "none" >&6; }
-     fi
-     ;;
- 
-   hcc)
-             PARALLEL=hcc
--    { echo "$as_me:$LINENO: checking for mpirun_lam or mpirun" >&5
--echo $ECHO_N "checking for mpirun_lam or mpirun... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for mpirun_lam or mpirun" >&5
-+$as_echo_n "checking for mpirun_lam or mpirun... " >&6; }
- 
-         cmd="`echo $CC | cut -f1 -d' '`"
-     if (echo $cmd | grep / >/dev/null); then
-@@ -7195,15 +7449,15 @@
-       else
-         cmd=mpirun
-       fi
--      { echo "$as_me:$LINENO: result: $path/$cmd" >&5
--echo "${ECHO_T}$path/$cmd" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: $path/$cmd" >&5
-+$as_echo "$path/$cmd" >&6; }
-       RUNSERIAL="${RUNSERIAL:-none}"
-       if test -z "$RUNPARALLEL"; then
-         RUNPARALLEL="$path/$cmd -np \$\${NPROCS:=3}"
-       fi
-     else
--      { echo "$as_me:$LINENO: result: none" >&5
--echo "${ECHO_T}none" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: none" >&5
-+$as_echo "none" >&6; }
-     fi
-     ;;
- 
-@@ -7213,20 +7467,20 @@
- 
-   cmpicc)
-             PARALLEL=cmpicc
--    { echo "$as_me:$LINENO: checking for cmpirun" >&5
--echo $ECHO_N "checking for cmpirun... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for cmpirun" >&5
-+$as_echo_n "checking for cmpirun... " >&6; }
- 
-         if test -x cmpirun; then
--      { echo "$as_me:$LINENO: result: cmpirun" >&5
--echo "${ECHO_T}cmpirun" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: cmpirun" >&5
-+$as_echo "cmpirun" >&6; }
-       RUNSERIAL="${RUNSERIAL:-none}"
- 
-       if test -z "$RUNPARALLEL"; then
-         RUNPARALLEL="cmpirun -np \$\${NPROCS:=3}"
-       fi
-     else
--      { echo "$as_me:$LINENO: result: none" >&5
--echo "${ECHO_T}none" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: none" >&5
-+$as_echo "none" >&6; }
-     fi
-     ;;
- 
-@@ -7244,8 +7498,8 @@
-   case "$FC" in
-     *mpif90*)
-                   PARALLEL=mpif90
--      { echo "$as_me:$LINENO: checking for mpirun" >&5
--echo $ECHO_N "checking for mpirun... $ECHO_C" >&6; }
-+      { $as_echo "$as_me:$LINENO: checking for mpirun" >&5
-+$as_echo_n "checking for mpirun... " >&6; }
- 
-             cmd=`echo $FC |cut -f1 -d' '`
-       if (echo $cmd |grep / >/dev/null); then
-@@ -7259,16 +7513,16 @@
-       fi
- 
-             if test -x $path/mpirun; then
--        { echo "$as_me:$LINENO: result: $path/mpirun" >&5
--echo "${ECHO_T}$path/mpirun" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: $path/mpirun" >&5
-+$as_echo "$path/mpirun" >&6; }
-         RUNSERIAL="${RUNSERIAL:-none}"
- 
-         if test -z "$RUNPARALLEL"; then
-           RUNPARALLEL="$path/mpirun -np \$\${NPROCS:=2}"
-         fi
-       else
--        { echo "$as_me:$LINENO: result: none" >&5
--echo "${ECHO_T}none" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: none" >&5
-+$as_echo "none" >&6; }
-       fi
-       ;;
- 
-@@ -7330,13 +7584,13 @@
-   fi
- 
-   if test "X${enable_shared}" != "Xno" && test "X${H5_FORTRAN_SHARED}" = "Xno"; then
--    { echo "$as_me:$LINENO: WARNING: shared libraries are not supported; disabling shared Fortran libraries" >&5
--echo "$as_me: WARNING: shared libraries are not supported; disabling shared Fortran libraries" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: shared libraries are not supported; disabling shared Fortran libraries" >&5
-+$as_echo "$as_me: WARNING: shared libraries are not supported; disabling shared Fortran libraries" >&2;}
-   fi
- 
-   if test "X${enable_static}" = "Xno" && test "X${H5_FORTRAN_SHARED}" = "Xno"; then
--    { { echo "$as_me:$LINENO: error: both static and shared Fortran libraries are disabled" >&5
--echo "$as_me: error: both static and shared Fortran libraries are disabled" >&2;}
-+    { { $as_echo "$as_me:$LINENO: error: both static and shared Fortran libraries are disabled" >&5
-+$as_echo "$as_me: error: both static and shared Fortran libraries are disabled" >&2;}
-    { (exit 1); exit 1; }; }
-   fi
- fi
-@@ -7368,8 +7622,8 @@
-   fi
- 
-   if test "X${enable_static}" = "Xno" && test "X${H5_CXX_SHARED}" = "Xno"; then
--    { { echo "$as_me:$LINENO: error: both static and shared C++ libraries are disabled" >&5
--echo "$as_me: error: both static and shared C++ libraries are disabled" >&2;}
-+    { { $as_echo "$as_me:$LINENO: error: both static and shared C++ libraries are disabled" >&5
-+$as_echo "$as_me: error: both static and shared C++ libraries are disabled" >&2;}
-    { (exit 1); exit 1; }; }
-   fi
- fi
-@@ -7401,8 +7655,8 @@
- 
- case `pwd` in
-   *\ * | *\	*)
--    { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
--echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-+    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
- esac
- 
- 
-@@ -7424,48 +7678,43 @@
- 
- ltmain="$ac_aux_dir/ltmain.sh"
- 
--{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
--echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
- if test "${ac_cv_path_SED+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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" | sed 99q >conftest.sed
-+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-      $as_unset ac_script || ac_script=
--     # Extract the first word of "sed gsed" to use in msg output
--if test -z "$SED"; then
--set dummy sed gsed; ac_prog_name=$2
--if test "${ac_cv_path_SED+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+     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
-+  # 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"
--    { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
--    # Check for GNU ac_path_SED and select it if it is found.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-+# Check for GNU ac_path_SED and select it if it is found.
-   # Check for GNU $ac_path_SED
- case `"$ac_path_SED" --version 2>&1` in
- *GNU*)
-   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
- *)
-   ac_count=0
--  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+  $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"
-+    $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
-     ac_count=`expr $ac_count + 1`
-@@ -7480,31 +7729,23 @@
-   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
- esac
- 
--
--    $ac_path_SED_found && break 3
-+      $ac_path_SED_found && break 3
-+    done
-   done
- done
--
--done
- IFS=$as_save_IFS
--
--
--fi
--
--SED="$ac_cv_path_SED"
--if test -z "$SED"; then
--  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
--echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
-+  if test -z "$ac_cv_path_SED"; then
-+    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
-+$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
--fi
--
-+  fi
- else
-   ac_cv_path_SED=$SED
- fi
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
--echo "${ECHO_T}$ac_cv_path_SED" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
-+$as_echo "$ac_cv_path_SED" >&6; }
-  SED="$ac_cv_path_SED"
-   rm -f conftest.sed
- 
-@@ -7521,42 +7762,37 @@
- 
- 
- 
--{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
--echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
--if test "${ac_cv_path_GREP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  # Extract the first word of "grep ggrep" to use in msg output
--if test -z "$GREP"; then
--set dummy grep ggrep; ac_prog_name=$2
-+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
- if test "${ac_cv_path_GREP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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
-+  # 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"
--    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
--    # Check for GNU ac_path_GREP and select it if it is found.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-+# Check for GNU ac_path_GREP and select it if it is found.
-   # Check for GNU $ac_path_GREP
- case `"$ac_path_GREP" --version 2>&1` in
- *GNU*)
-   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
- *)
-   ac_count=0
--  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+  $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 'GREP' >> "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
-     ac_count=`expr $ac_count + 1`
-@@ -7571,74 +7807,60 @@
-   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
- esac
- 
--
--    $ac_path_GREP_found && break 3
-+      $ac_path_GREP_found && break 3
-+    done
-   done
- done
--
--done
- IFS=$as_save_IFS
--
--
--fi
--
--GREP="$ac_cv_path_GREP"
--if test -z "$GREP"; then
--  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
--echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+  if test -z "$ac_cv_path_GREP"; then
-+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-    { (exit 1); exit 1; }; }
--fi
--
-+  fi
- else
-   ac_cv_path_GREP=$GREP
- fi
- 
--
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
--echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+$as_echo "$ac_cv_path_GREP" >&6; }
-  GREP="$ac_cv_path_GREP"
- 
- 
--{ echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
-+$as_echo_n "checking for egrep... " >&6; }
- if test "${ac_cv_path_EGREP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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
--     # Extract the first word of "egrep" to use in msg output
--if test -z "$EGREP"; then
--set dummy egrep; ac_prog_name=$2
--if test "${ac_cv_path_EGREP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--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
-+  # 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"
--    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
--    # Check for GNU ac_path_EGREP and select it if it is found.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-+# Check for GNU ac_path_EGREP and select it if it is found.
-   # Check for GNU $ac_path_EGREP
- case `"$ac_path_EGREP" --version 2>&1` in
- *GNU*)
-   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
- *)
-   ac_count=0
--  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+  $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 'EGREP' >> "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
-     ac_count=`expr $ac_count + 1`
-@@ -7653,75 +7875,61 @@
-   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
- esac
- 
--
--    $ac_path_EGREP_found && break 3
-+      $ac_path_EGREP_found && break 3
-+    done
-   done
- done
--
--done
- IFS=$as_save_IFS
--
--
--fi
--
--EGREP="$ac_cv_path_EGREP"
--if test -z "$EGREP"; then
--  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
--echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+  if test -z "$ac_cv_path_EGREP"; then
-+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-    { (exit 1); exit 1; }; }
--fi
--
-+  fi
- else
-   ac_cv_path_EGREP=$EGREP
- fi
- 
--
-    fi
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
--echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+$as_echo "$ac_cv_path_EGREP" >&6; }
-  EGREP="$ac_cv_path_EGREP"
- 
- 
--{ echo "$as_me:$LINENO: checking for fgrep" >&5
--echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
-+$as_echo_n "checking for fgrep... " >&6; }
- if test "${ac_cv_path_FGREP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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
--     # Extract the first word of "fgrep" to use in msg output
--if test -z "$FGREP"; then
--set dummy fgrep; ac_prog_name=$2
--if test "${ac_cv_path_FGREP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--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
-+  # 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"
--    { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
--    # Check for GNU ac_path_FGREP and select it if it is found.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-+# Check for GNU ac_path_FGREP and select it if it is found.
-   # Check for GNU $ac_path_FGREP
- case `"$ac_path_FGREP" --version 2>&1` in
- *GNU*)
-   ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
- *)
-   ac_count=0
--  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+  $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 'FGREP' >> "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
-     ac_count=`expr $ac_count + 1`
-@@ -7736,33 +7944,24 @@
-   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
- esac
- 
--
--    $ac_path_FGREP_found && break 3
-+      $ac_path_FGREP_found && break 3
-+    done
-   done
- done
--
--done
- IFS=$as_save_IFS
--
--
--fi
--
--FGREP="$ac_cv_path_FGREP"
--if test -z "$FGREP"; then
--  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
--echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+  if test -z "$ac_cv_path_FGREP"; then
-+    { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-    { (exit 1); exit 1; }; }
--fi
--
-+  fi
- else
-   ac_cv_path_FGREP=$FGREP
- fi
- 
--
-    fi
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
--echo "${ECHO_T}$ac_cv_path_FGREP" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
-+$as_echo "$ac_cv_path_FGREP" >&6; }
-  FGREP="$ac_cv_path_FGREP"
- 
- 
-@@ -7796,8 +7995,8 @@
- ac_prog=ld
- if test "$GCC" = yes; then
-   # Check if gcc -print-prog-name=ld gives a path.
--  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+$as_echo_n "checking for ld used by $CC... " >&6; }
-   case $host in
-   *-*-mingw*)
-     # gcc leaves a trailing carriage return which upsets mingw
-@@ -7826,14 +8025,14 @@
-     ;;
-   esac
- elif test "$with_gnu_ld" = yes; then
--  { echo "$as_me:$LINENO: checking for GNU ld" >&5
--echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
-+$as_echo_n "checking for GNU ld... " >&6; }
- else
--  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+$as_echo_n "checking for non-GNU ld... " >&6; }
- fi
- if test "${lt_cv_path_LD+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -z "$LD"; then
-   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -7863,19 +8062,19 @@
- 
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
--  { echo "$as_me:$LINENO: result: $LD" >&5
--echo "${ECHO_T}$LD" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
-+$as_echo "$LD" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
--test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
--echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
--{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
--echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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
-@@ -7887,8 +8086,8 @@
-   ;;
- esac
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
- 
- 
-@@ -7899,10 +8098,10 @@
- 
- 
- 
--{ echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
--echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
-+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
- if test "${lt_cv_path_NM+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$NM"; then
-   # Let the user override the test.
-@@ -7948,8 +8147,8 @@
-   : ${lt_cv_path_NM=no}
- fi
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
--echo "${ECHO_T}$lt_cv_path_NM" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-+$as_echo "$lt_cv_path_NM" >&6; }
- if test "$lt_cv_path_NM" != "no"; then
-   NM="$lt_cv_path_NM"
- else
-@@ -7959,10 +8158,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_DUMPBIN+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$DUMPBIN"; then
-   ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-@@ -7975,7 +8174,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -7986,11 +8185,11 @@
- fi
- DUMPBIN=$ac_cv_prog_DUMPBIN
- if test -n "$DUMPBIN"; then
--  { echo "$as_me:$LINENO: result: $DUMPBIN" >&5
--echo "${ECHO_T}$DUMPBIN" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
-+$as_echo "$DUMPBIN" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -8003,10 +8202,10 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -8019,7 +8218,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -8030,11 +8229,11 @@
- fi
- ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
- if test -n "$ac_ct_DUMPBIN"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
--echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
-+$as_echo "$ac_ct_DUMPBIN" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -8046,12 +8245,8 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     DUMPBIN=$ac_ct_DUMPBIN
-@@ -8070,45 +8265,45 @@
- 
- 
- 
--{ echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
--echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
-+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
- if test "${lt_cv_nm_interface+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:8080: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:8275: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:8083: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:8278: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:8086: output\"" >&5)
-+  (eval echo "\"\$as_me:8281: 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
--{ echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
--echo "${ECHO_T}$lt_cv_nm_interface" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
-+$as_echo "$lt_cv_nm_interface" >&6; }
- 
--{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
--echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+$as_echo_n "checking whether ln -s works... " >&6; }
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--echo "${ECHO_T}no, using $LN_S" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+$as_echo "no, using $LN_S" >&6; }
- fi
- 
- # find the maximum length of command line arguments
--{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
--echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
- if test "${lt_cv_sys_max_cmd_len+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-     i=0
-   teststring="ABCD"
-@@ -8225,11 +8420,11 @@
- fi
- 
- if test -n $lt_cv_sys_max_cmd_len ; then
--  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
--echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
- else
--  { echo "$as_me:$LINENO: result: none" >&5
--echo "${ECHO_T}none" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: none" >&5
-+$as_echo "none" >&6; }
- fi
- max_cmd_len=$lt_cv_sys_max_cmd_len
- 
-@@ -8242,8 +8437,8 @@
- : ${MV="mv -f"}
- : ${RM="rm -f"}
- 
--{ echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
--echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
-+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
- # Try some XSI features
- xsi_shell=no
- ( _lt_dummy="a/b/c"
-@@ -8252,18 +8447,18 @@
-     && eval 'test $(( 1 + 1 )) -eq 2 \
-     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-   && xsi_shell=yes
--{ echo "$as_me:$LINENO: result: $xsi_shell" >&5
--echo "${ECHO_T}$xsi_shell" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
-+$as_echo "$xsi_shell" >&6; }
- 
- 
--{ echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
--echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
-+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
- lt_shell_append=no
- ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-     >/dev/null 2>&1 \
-   && lt_shell_append=yes
--{ echo "$as_me:$LINENO: result: $lt_shell_append" >&5
--echo "${ECHO_T}$lt_shell_append" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
-+$as_echo "$lt_shell_append" >&6; }
- 
- 
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -8297,15 +8492,15 @@
- 
- 
- 
--{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
--echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-+$as_echo_n "checking for $LD option to reload object files... " >&6; }
- if test "${lt_cv_ld_reload_flag+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_ld_reload_flag='-r'
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
--echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-+$as_echo "$lt_cv_ld_reload_flag" >&6; }
- reload_flag=$lt_cv_ld_reload_flag
- case $reload_flag in
- "" | " "*) ;;
-@@ -8333,10 +8528,10 @@
- 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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_OBJDUMP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$OBJDUMP"; then
-   ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-@@ -8349,7 +8544,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -8360,11 +8555,11 @@
- fi
- OBJDUMP=$ac_cv_prog_OBJDUMP
- if test -n "$OBJDUMP"; then
--  { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
--echo "${ECHO_T}$OBJDUMP" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-+$as_echo "$OBJDUMP" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -8373,10 +8568,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -8389,7 +8584,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_OBJDUMP="objdump"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -8400,11 +8595,11 @@
- fi
- ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
- if test -n "$ac_ct_OBJDUMP"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
--echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-+$as_echo "$ac_ct_OBJDUMP" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
-   if test "x$ac_ct_OBJDUMP" = x; then
-@@ -8412,12 +8607,8 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     OBJDUMP=$ac_ct_OBJDUMP
-@@ -8436,10 +8627,10 @@
- 
- 
- 
--{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
--echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
- if test "${lt_cv_deplibs_check_method+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_file_magic_cmd='$MAGIC_CMD'
- lt_cv_file_magic_test_file=
-@@ -8557,7 +8748,7 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
-   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
-@@ -8632,8 +8823,8 @@
- esac
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
--echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-+$as_echo "$lt_cv_deplibs_check_method" >&6; }
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -8652,10 +8843,10 @@
- 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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_AR+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$AR"; then
-   ac_cv_prog_AR="$AR" # Let the user override the test.
-@@ -8668,7 +8859,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_AR="${ac_tool_prefix}ar"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -8679,11 +8870,11 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  { echo "$as_me:$LINENO: result: $AR" >&5
--echo "${ECHO_T}$AR" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
-+$as_echo "$AR" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -8692,10 +8883,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -8708,7 +8899,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_AR="ar"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -8719,11 +8910,11 @@
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
--echo "${ECHO_T}$ac_ct_AR" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+$as_echo "$ac_ct_AR" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
-   if test "x$ac_ct_AR" = x; then
-@@ -8731,12 +8922,8 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     AR=$ac_ct_AR
-@@ -8761,10 +8948,10 @@
- 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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_STRIP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$STRIP"; then
-   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-@@ -8777,7 +8964,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -8788,11 +8975,11 @@
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
--  { echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-+$as_echo "$STRIP" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -8801,10 +8988,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -8817,7 +9004,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_STRIP="strip"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -8828,11 +9015,11 @@
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+$as_echo "$ac_ct_STRIP" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
-   if test "x$ac_ct_STRIP" = x; then
-@@ -8840,12 +9027,8 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     STRIP=$ac_ct_STRIP
-@@ -8864,10 +9047,10 @@
- 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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_RANLIB+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$RANLIB"; then
-   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-@@ -8880,7 +9063,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -8891,11 +9074,11 @@
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
--  { echo "$as_me:$LINENO: result: $RANLIB" >&5
--echo "${ECHO_T}$RANLIB" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
-+$as_echo "$RANLIB" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -8904,10 +9087,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -8920,7 +9103,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_RANLIB="ranlib"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -8931,11 +9114,11 @@
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
--echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+$as_echo "$ac_ct_RANLIB" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
-   if test "x$ac_ct_RANLIB" = x; then
-@@ -8943,12 +9126,8 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     RANLIB=$ac_ct_RANLIB
-@@ -9025,10 +9204,10 @@
- 
- 
- # Check for command to grab the raw symbol name followed by C symbol from nm.
--{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
--echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
- if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
- 
- # These are sane defaults that work on at least a few old systems.
-@@ -9146,14 +9325,14 @@
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-     # Now try to grab the symbols.
-     nlist=conftest.nm
-     if { (eval echo "$as_me:$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=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s "$nlist"; then
-       # Try sorting and uniquifying the output.
-       if sort "$nlist" | uniq > "$nlist"T; then
-@@ -9210,7 +9389,7 @@
- 	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext}; then
- 	    pipe_works=yes
- 	  fi
-@@ -9245,11 +9424,11 @@
-   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
--  { echo "$as_me:$LINENO: result: failed" >&5
--echo "${ECHO_T}failed" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: failed" >&5
-+$as_echo "failed" >&6; }
- else
--  { echo "$as_me:$LINENO: result: ok" >&5
--echo "${ECHO_T}ok" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: ok" >&5
-+$as_echo "ok" >&6; }
- fi
- 
- 
-@@ -9289,7 +9468,7 @@
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-     case `/usr/bin/file conftest.$ac_objext` in
-       *ELF-32*)
-@@ -9304,11 +9483,11 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 9307 "configure"' > conftest.$ac_ext
-+  echo '#line 9486 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-     if test "$lt_cv_prog_gnu_ld" = yes; then
-       case `/usr/bin/file conftest.$ac_objext` in
-@@ -9346,7 +9525,7 @@
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-     case `/usr/bin/file conftest.o` in
-       *32-bit*)
-@@ -9396,10 +9575,10 @@
-   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-   SAVE_CFLAGS="$CFLAGS"
-   CFLAGS="$CFLAGS -belf"
--  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
--echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
- if test "${lt_cv_cc_needs_belf+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -9436,26 +9615,30 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   lt_cv_cc_needs_belf=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	lt_cv_cc_needs_belf=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-      ac_ext=c
-@@ -9465,8 +9648,8 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
--echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-+$as_echo "$lt_cv_cc_needs_belf" >&6; }
-   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-     CFLAGS="$SAVE_CFLAGS"
-@@ -9478,7 +9661,7 @@
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-     case `/usr/bin/file conftest.o` in
-     *64-bit*)
-@@ -9505,10 +9688,10 @@
-     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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$DSYMUTIL"; then
-   ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-@@ -9521,7 +9704,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -9532,11 +9715,11 @@
- fi
- DSYMUTIL=$ac_cv_prog_DSYMUTIL
- if test -n "$DSYMUTIL"; then
--  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
--echo "${ECHO_T}$DSYMUTIL" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-+$as_echo "$DSYMUTIL" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -9545,10 +9728,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -9561,7 +9744,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -9572,11 +9755,11 @@
- fi
- ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
- if test -n "$ac_ct_DSYMUTIL"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
--echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-+$as_echo "$ac_ct_DSYMUTIL" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
-   if test "x$ac_ct_DSYMUTIL" = x; then
-@@ -9584,12 +9767,8 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     DSYMUTIL=$ac_ct_DSYMUTIL
-@@ -9601,10 +9780,10 @@
-     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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_NMEDIT+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$NMEDIT"; then
-   ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-@@ -9617,7 +9796,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -9628,11 +9807,11 @@
- fi
- NMEDIT=$ac_cv_prog_NMEDIT
- if test -n "$NMEDIT"; then
--  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
--echo "${ECHO_T}$NMEDIT" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
-+$as_echo "$NMEDIT" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -9641,10 +9820,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -9657,7 +9836,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_NMEDIT="nmedit"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -9668,11 +9847,11 @@
- fi
- ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
- if test -n "$ac_ct_NMEDIT"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
--echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-+$as_echo "$ac_ct_NMEDIT" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
-   if test "x$ac_ct_NMEDIT" = x; then
-@@ -9680,12 +9859,8 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     NMEDIT=$ac_ct_NMEDIT
-@@ -9697,10 +9872,10 @@
-     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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_LIPO+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$LIPO"; then
-   ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-@@ -9713,7 +9888,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -9724,11 +9899,11 @@
- fi
- LIPO=$ac_cv_prog_LIPO
- if test -n "$LIPO"; then
--  { echo "$as_me:$LINENO: result: $LIPO" >&5
--echo "${ECHO_T}$LIPO" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
-+$as_echo "$LIPO" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -9737,10 +9912,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -9753,7 +9928,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_LIPO="lipo"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -9764,11 +9939,11 @@
- fi
- ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
- if test -n "$ac_ct_LIPO"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
--echo "${ECHO_T}$ac_ct_LIPO" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
-+$as_echo "$ac_ct_LIPO" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
-   if test "x$ac_ct_LIPO" = x; then
-@@ -9776,12 +9951,8 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     LIPO=$ac_ct_LIPO
-@@ -9793,10 +9964,10 @@
-     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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_OTOOL+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$OTOOL"; then
-   ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-@@ -9809,7 +9980,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -9820,11 +9991,11 @@
- fi
- OTOOL=$ac_cv_prog_OTOOL
- if test -n "$OTOOL"; then
--  { echo "$as_me:$LINENO: result: $OTOOL" >&5
--echo "${ECHO_T}$OTOOL" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
-+$as_echo "$OTOOL" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -9833,10 +10004,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -9849,7 +10020,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_OTOOL="otool"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -9860,11 +10031,11 @@
- fi
- ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
- if test -n "$ac_ct_OTOOL"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
--echo "${ECHO_T}$ac_ct_OTOOL" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
-+$as_echo "$ac_ct_OTOOL" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
-   if test "x$ac_ct_OTOOL" = x; then
-@@ -9872,12 +10043,8 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     OTOOL=$ac_ct_OTOOL
-@@ -9889,10 +10056,10 @@
-     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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_OTOOL64+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$OTOOL64"; then
-   ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-@@ -9905,7 +10072,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -9916,11 +10083,11 @@
- fi
- OTOOL64=$ac_cv_prog_OTOOL64
- if test -n "$OTOOL64"; then
--  { echo "$as_me:$LINENO: result: $OTOOL64" >&5
--echo "${ECHO_T}$OTOOL64" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
-+$as_echo "$OTOOL64" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -9929,10 +10096,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -9945,7 +10112,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_OTOOL64="otool64"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -9956,11 +10123,11 @@
- fi
- ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
- if test -n "$ac_ct_OTOOL64"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
--echo "${ECHO_T}$ac_ct_OTOOL64" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
-+$as_echo "$ac_ct_OTOOL64" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
-   if test "x$ac_ct_OTOOL64" = x; then
-@@ -9968,12 +10135,8 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     OTOOL64=$ac_ct_OTOOL64
-@@ -10008,10 +10171,10 @@
- 
- 
- 
--    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
--echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-+$as_echo_n "checking for -single_module linker flag... " >&6; }
- if test "${lt_cv_apple_cc_single_mod+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_apple_cc_single_mod=no
-       if test -z "${LT_MULTI_MODULE}"; then
-@@ -10035,12 +10198,12 @@
- 	rm -f conftest.*
-       fi
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
--echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
--    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
--echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
- if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_ld_exported_symbols_list=no
-       save_LDFLAGS=$LDFLAGS
-@@ -10075,33 +10238,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   lt_cv_ld_exported_symbols_list=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	lt_cv_ld_exported_symbols_list=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 	LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
--echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-     case $host_os in
-     rhapsody* | darwin1.[012])
-       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -10142,15 +10309,15 @@
- 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
--{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
--echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+$as_echo_n "checking how to run the C preprocessor... " >&6; }
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
- fi
- if test -z "$CPP"; then
-   if test "${ac_cv_prog_CPP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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"
-@@ -10182,20 +10349,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   :
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Broken: fails on valid input.
-@@ -10219,13 +10387,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -10233,7 +10402,7 @@
-   # Broken: success on invalid input.
- continue
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Passes both tests.
-@@ -10258,8 +10427,8 @@
- else
-   ac_cv_prog_CPP=$CPP
- fi
--{ echo "$as_me:$LINENO: result: $CPP" >&5
--echo "${ECHO_T}$CPP" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
-+$as_echo "$CPP" >&6; }
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
- do
-@@ -10287,20 +10456,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   :
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Broken: fails on valid input.
-@@ -10324,13 +10494,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -10338,7 +10509,7 @@
-   # Broken: success on invalid input.
- continue
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Passes both tests.
-@@ -10354,11 +10525,13 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
- See \`config.log' for more details." >&5
--echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- fi
- 
- ac_ext=c
-@@ -10368,10 +10541,10 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
--{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+$as_echo_n "checking for ANSI C header files... " >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -10406,20 +10579,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_header_stdc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_header_stdc=no
-@@ -10511,37 +10685,40 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 
- fi
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+$as_echo "$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -10563,11 +10740,11 @@
- 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=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -10585,20 +10762,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   eval "$as_ac_Header=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
-@@ -10606,12 +10784,15 @@
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -10622,11 +10803,11 @@
- 
- for ac_header in dlfcn.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -10644,20 +10825,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   eval "$as_ac_Header=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_Header=no"
-@@ -10665,12 +10847,15 @@
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -10693,10 +10878,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$CXX"; then
-   ac_cv_prog_CXX="$CXX" # Let the user override the test.
-@@ -10709,7 +10894,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -10720,11 +10905,11 @@
- fi
- CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
--  { echo "$as_me:$LINENO: result: $CXX" >&5
--echo "${ECHO_T}$CXX" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
-+$as_echo "$CXX" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -10737,10 +10922,10 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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.
-@@ -10753,7 +10938,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CXX="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -10764,11 +10949,11 @@
- fi
- ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
- if test -n "$ac_ct_CXX"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
--echo "${ECHO_T}$ac_ct_CXX" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-+$as_echo "$ac_ct_CXX" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -10780,12 +10965,8 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     CXX=$ac_ct_CXX
-@@ -10795,43 +10976,47 @@
-   fi
- fi
- # Provide some information about the compiler.
--echo "$as_me:$LINENO: checking for C++ compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
-+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
- { (ac_try="$ac_compiler --version >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -v >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -V >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
--{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
- if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -10865,20 +11050,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_compiler_gnu=no
-@@ -10888,15 +11074,19 @@
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
--GXX=`test $ac_compiler_gnu = yes && echo yes`
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GXX=yes
-+else
-+  GXX=
-+fi
- ac_test_CXXFLAGS=${CXXFLAGS+set}
- ac_save_CXXFLAGS=$CXXFLAGS
--{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
--echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
- if test "${ac_cv_prog_cxx_g+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-    ac_cxx_werror_flag=yes
-@@ -10931,20 +11121,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cxx_g=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	CXXFLAGS=""
-@@ -10977,20 +11168,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   :
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-@@ -11024,20 +11216,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cxx_g=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
-@@ -11052,8 +11245,8 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-+$as_echo "$ac_cv_prog_cxx_g" >&6; }
- if test "$ac_test_CXXFLAGS" = set; then
-   CXXFLAGS=$ac_save_CXXFLAGS
- elif test $ac_cv_prog_cxx_g = yes; then
-@@ -11077,10 +11270,10 @@
- 
- depcc="$CXX"  am_compiler_list=
- 
--{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+$as_echo_n "checking dependency style of $depcc... " >&6; }
- if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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
-@@ -11168,8 +11361,8 @@
- fi
- 
- fi
--{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
- CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- 
-  if
-@@ -11191,11 +11384,11 @@
- 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
--{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
--echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
- if test -z "$CXXCPP"; then
-   if test "${ac_cv_prog_CXXCPP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-       # Double quotes because CXXCPP needs to be expanded
-     for CXXCPP in "$CXX -E" "/lib/cpp"
-@@ -11227,20 +11420,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   :
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Broken: fails on valid input.
-@@ -11264,13 +11458,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -11278,7 +11473,7 @@
-   # Broken: success on invalid input.
- continue
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Passes both tests.
-@@ -11303,8 +11498,8 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
--echo "${ECHO_T}$CXXCPP" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
-+$as_echo "$CXXCPP" >&6; }
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
- do
-@@ -11332,20 +11527,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   :
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Broken: fails on valid input.
-@@ -11369,13 +11565,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -11383,7 +11580,7 @@
-   # Broken: success on invalid input.
- continue
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   # Passes both tests.
-@@ -11399,7 +11596,9 @@
- if $ac_preproc_ok; then
-   :
- else
--  _lt_caught_CXX_error=yes
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+_lt_caught_CXX_error=yes; }
- fi
- 
- ac_ext=c
-@@ -11424,10 +11623,10 @@
-   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
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_FC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$FC"; then
-   ac_cv_prog_FC="$FC" # Let the user override the test.
-@@ -11440,7 +11639,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_FC="$ac_tool_prefix$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -11451,11 +11650,11 @@
- fi
- FC=$ac_cv_prog_FC
- if test -n "$FC"; then
--  { echo "$as_me:$LINENO: result: $FC" >&5
--echo "${ECHO_T}$FC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $FC" >&5
-+$as_echo "$FC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -11468,10 +11667,10 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
- if test "${ac_cv_prog_ac_ct_FC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_FC"; then
-   ac_cv_prog_ac_ct_FC="$ac_ct_FC" # Let the user override the test.
-@@ -11484,7 +11683,7 @@
-   for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_FC="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
-@@ -11495,11 +11694,11 @@
- fi
- ac_ct_FC=$ac_cv_prog_ac_ct_FC
- if test -n "$ac_ct_FC"; then
--  { echo "$as_me:$LINENO: result: $ac_ct_FC" >&5
--echo "${ECHO_T}$ac_ct_FC" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $ac_ct_FC" >&5
-+$as_echo "$ac_ct_FC" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -11511,12 +11710,8 @@
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-     FC=$ac_ct_FC
-@@ -11525,37 +11720,41 @@
- 
- 
- # Provide some information about the compiler.
--echo "$as_me:$LINENO: checking for Fortran compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
-+$as_echo "$as_me:$LINENO: checking for Fortran compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
- { (ac_try="$ac_compiler --version >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler --version >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -v >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler -v >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- { (ac_try="$ac_compiler -V >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compiler -V >&5") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
- rm -f a.out
- 
-@@ -11563,10 +11762,10 @@
- # input file.  (Note that this only needs to work for GNU compilers.)
- ac_save_ext=$ac_ext
- ac_ext=F
--{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU Fortran compiler... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran compiler" >&5
-+$as_echo_n "checking whether we are using the GNU Fortran compiler... " >&6; }
- if test "${ac_cv_fc_compiler_gnu+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-       program main
-@@ -11582,20 +11781,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_fc_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_compiler_gnu=no
-@@ -11605,16 +11805,16 @@
- ac_cv_fc_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_fc_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_fc_compiler_gnu" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_fc_compiler_gnu" >&5
-+$as_echo "$ac_cv_fc_compiler_gnu" >&6; }
- ac_ext=$ac_save_ext
- ac_test_FFLAGS=${FCFLAGS+set}
- ac_save_FFLAGS=$FCFLAGS
- FCFLAGS=
--{ echo "$as_me:$LINENO: checking whether $FC accepts -g" >&5
--echo $ECHO_N "checking whether $FC accepts -g... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether $FC accepts -g" >&5
-+$as_echo_n "checking whether $FC accepts -g... " >&6; }
- if test "${ac_cv_prog_fc_g+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   FCFLAGS=-g
- cat >conftest.$ac_ext <<_ACEOF
-@@ -11628,20 +11828,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_fc_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_prog_fc_g=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_prog_fc_g=no
-@@ -11650,8 +11851,8 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_prog_fc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_fc_g" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_fc_g" >&5
-+$as_echo "$ac_cv_prog_fc_g" >&6; }
- if test "$ac_test_FFLAGS" = set; then
-   FCFLAGS=$ac_save_FFLAGS
- elif test $ac_cv_prog_fc_g = yes; then
-@@ -11851,10 +12052,10 @@
-    setopt NO_GLOB_SUBST
- fi
- 
--{ echo "$as_me:$LINENO: checking for objdir" >&5
--echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
-+$as_echo_n "checking for objdir... " >&6; }
- if test "${lt_cv_objdir+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   rm -f .libs 2>/dev/null
- mkdir .libs 2>/dev/null
-@@ -11866,8 +12067,8 @@
- fi
- rmdir .libs 2>/dev/null
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
--echo "${ECHO_T}$lt_cv_objdir" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-+$as_echo "$lt_cv_objdir" >&6; }
- objdir=$lt_cv_objdir
- 
- 
-@@ -11959,10 +12160,10 @@
- case $deplibs_check_method in
- file_magic*)
-   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
--    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
--echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   case $MAGIC_CMD in
- [\\/*] |  ?:[\\/]*)
-@@ -12012,11 +12213,11 @@
- 
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
--  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--echo "${ECHO_T}$MAGIC_CMD" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+$as_echo "$MAGIC_CMD" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -12025,10 +12226,10 @@
- 
- if test -z "$lt_cv_path_MAGIC_CMD"; then
-   if test -n "$ac_tool_prefix"; then
--    { echo "$as_me:$LINENO: checking for file" >&5
--echo $ECHO_N "checking for file... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for file" >&5
-+$as_echo_n "checking for file... " >&6; }
- if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   case $MAGIC_CMD in
- [\\/*] |  ?:[\\/]*)
-@@ -12078,11 +12279,11 @@
- 
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
--  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--echo "${ECHO_T}$MAGIC_CMD" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+$as_echo "$MAGIC_CMD" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
-@@ -12158,10 +12359,10 @@
- if test "$GCC" = yes; then
-   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
- 
--  { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
--echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
- if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_rtti_exceptions=no
-    ac_outfile=conftest.$ac_objext
-@@ -12176,11 +12377,11 @@
-    -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:12179: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12380: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:12183: \$? = $ac_status" >&5
-+   echo "$as_me:12384: \$? = $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.
-@@ -12193,8 +12394,8 @@
-    $RM conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
- 
- if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -12213,8 +12414,8 @@
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
- 
--{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- 
-   if test "$GCC" = yes; then
-     lt_prog_compiler_wl='-Wl,'
-@@ -12485,8 +12686,8 @@
-     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-     ;;
- esac
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-+$as_echo "$lt_prog_compiler_pic" >&6; }
- 
- 
- 
-@@ -12497,10 +12698,10 @@
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic"; then
--  { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
- if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_pic_works=no
-    ac_outfile=conftest.$ac_objext
-@@ -12515,11 +12716,11 @@
-    -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:12518: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12719: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:12522: \$? = $ac_status" >&5
-+   echo "$as_me:12723: \$? = $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.
-@@ -12532,8 +12733,8 @@
-    $RM conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
- 
- if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-     case $lt_prog_compiler_pic in
-@@ -12556,10 +12757,10 @@
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
--{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
- if test "${lt_cv_prog_compiler_static_works+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_static_works=no
-    save_LDFLAGS="$LDFLAGS"
-@@ -12584,8 +12785,8 @@
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
- 
- if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-     :
-@@ -12599,10 +12800,10 @@
- 
- 
- 
--  { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
- if test "${lt_cv_prog_compiler_c_o+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o=no
-    $RM -r conftest 2>/dev/null
-@@ -12620,11 +12821,11 @@
-    -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:12623: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12824: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:12627: \$? = $ac_status" >&5
-+   echo "$as_me:12828: \$? = $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
-@@ -12646,18 +12847,18 @@
-    $RM conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
- 
- 
- 
- 
- 
- 
--  { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
- if test "${lt_cv_prog_compiler_c_o+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o=no
-    $RM -r conftest 2>/dev/null
-@@ -12675,11 +12876,11 @@
-    -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:12678: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12879: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:12682: \$? = $ac_status" >&5
-+   echo "$as_me:12883: \$? = $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
-@@ -12701,8 +12902,8 @@
-    $RM conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
- 
- 
- 
-@@ -12710,19 +12911,19 @@
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-   # do not overwrite the value of need_locks provided by the user
--  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+$as_echo_n "checking if we can lock with hard links... " >&6; }
-   hard_links=yes
-   $RM conftest*
-   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
--  { echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-+$as_echo "$hard_links" >&6; }
-   if test "$hard_links" = no; then
--    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-     need_locks=warn
-   fi
- else
-@@ -12734,8 +12935,8 @@
- 
- 
- 
--  { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
- 
-   runpath_var=
-   allow_undefined_flag=
-@@ -12794,6 +12995,9 @@
-   openbsd*)
-     with_gnu_ld=no
-     ;;
-+  linux* | k*bsd*-gnu)
-+    link_all_deplibs=no
-+    ;;
-   esac
- 
-   ld_shlibs=yes
-@@ -12976,7 +13180,7 @@
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -13151,6 +13355,7 @@
- 	if test "$aix_use_runtimelinking" = yes; then
- 	  shared_flag="$shared_flag "'${wl}-G'
- 	fi
-+	link_all_deplibs=no
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -13205,18 +13410,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -13231,12 +13439,13 @@
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13280,18 +13489,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -13306,12 +13518,13 @@
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13534,27 +13747,31 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
- 
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-         LDFLAGS="$save_LDFLAGS"
-@@ -13569,7 +13786,7 @@
-       link_all_deplibs=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -13812,8 +14029,8 @@
-     fi
-   fi
- 
--{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
--echo "${ECHO_T}$ld_shlibs" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-+$as_echo "$ld_shlibs" >&6; }
- test "$ld_shlibs" = no && can_build_shared=no
- 
- with_gnu_ld=$with_gnu_ld
-@@ -13849,15 +14066,15 @@
-       # 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.
--      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-       $RM conftest*
-       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
-       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-@@ -13875,7 +14092,7 @@
-         if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
-   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-         then
- 	  archive_cmds_need_lc=no
-@@ -13887,8 +14104,8 @@
-         cat conftest.err 1>&5
-       fi
-       $RM conftest*
--      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
--echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-+$as_echo "$archive_cmds_need_lc" >&6; }
-       ;;
-     esac
-   fi
-@@ -14051,8 +14268,8 @@
- 
- 
- 
--  { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
- 
- if test "$GCC" = yes; then
-   case $host_os in
-@@ -14502,29 +14719,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
-   shlibpath_overrides_runpath=yes
- fi
- 
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-   LDFLAGS=$save_LDFLAGS
-@@ -14550,6 +14771,18 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  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='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -14738,8 +14971,8 @@
-   dynamic_linker=no
-   ;;
- esac
--{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+$as_echo "$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -14840,8 +15073,8 @@
- 
- 
- 
--  { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
- hardcode_action=
- if test -n "$hardcode_libdir_flag_spec" ||
-    test -n "$runpath_var" ||
-@@ -14865,8 +15098,8 @@
-   # directories.
-   hardcode_action=unsupported
- fi
--{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
--echo "${ECHO_T}$hardcode_action" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
-+$as_echo "$hardcode_action" >&6; }
- 
- if test "$hardcode_action" = relink ||
-    test "$inherit_rpath" = yes; then
-@@ -14910,10 +15143,10 @@
- 
-   darwin*)
-   # if libdl is installed we need to link against it
--    { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
-@@ -14953,33 +15186,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_dl_dlopen=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_dl_dlopen=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
--if test $ac_cv_lib_dl_dlopen = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
- 
-@@ -14992,10 +15229,10 @@
-     ;;
- 
-   *)
--    { echo "$as_me:$LINENO: checking for shl_load" >&5
--echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-+$as_echo_n "checking for shl_load... " >&6; }
- if test "${ac_cv_func_shl_load+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -15056,38 +15293,42 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_func_shl_load=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_shl_load=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--echo "${ECHO_T}$ac_cv_func_shl_load" >&6; }
--if test $ac_cv_func_shl_load = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-+$as_echo "$ac_cv_func_shl_load" >&6; }
-+if test "x$ac_cv_func_shl_load" = x""yes; then
-   lt_cv_dlopen="shl_load"
- else
--  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-+$as_echo_n "checking for shl_load in -ldld... " >&6; }
- if test "${ac_cv_lib_dld_shl_load+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
-@@ -15127,39 +15368,43 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_dld_shl_load=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_dld_shl_load=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
--if test $ac_cv_lib_dld_shl_load = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
-   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
- else
--  { echo "$as_me:$LINENO: checking for dlopen" >&5
--echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-+$as_echo_n "checking for dlopen... " >&6; }
- if test "${ac_cv_func_dlopen+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -15220,38 +15465,42 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_func_dlopen=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_dlopen=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
--if test $ac_cv_func_dlopen = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-+$as_echo "$ac_cv_func_dlopen" >&6; }
-+if test "x$ac_cv_func_dlopen" = x""yes; then
-   lt_cv_dlopen="dlopen"
- else
--  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
-@@ -15291,39 +15540,43 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_dl_dlopen=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_dl_dlopen=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
--if test $ac_cv_lib_dl_dlopen = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
--  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
- if test "${ac_cv_lib_svld_dlopen+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsvld  $LIBS"
-@@ -15363,39 +15616,43 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_svld_dlopen=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_svld_dlopen=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
--if test $ac_cv_lib_svld_dlopen = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
- else
--  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
--echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-+$as_echo_n "checking for dld_link in -ldld... " >&6; }
- if test "${ac_cv_lib_dld_dld_link+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
-@@ -15435,33 +15692,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_dld_dld_link=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_dld_dld_link=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
--if test $ac_cv_lib_dld_dld_link = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
-   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
- fi
- 
-@@ -15500,10 +15761,10 @@
-     save_LIBS="$LIBS"
-     LIBS="$lt_cv_dlopen_libs $LIBS"
- 
--    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
- if test "${lt_cv_dlopen_self+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   	  if test "$cross_compiling" = yes; then :
-   lt_cv_dlopen_self=cross
-@@ -15511,7 +15772,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 15514 "configure"
-+#line 15775 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15573,7 +15834,7 @@
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-     (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-@@ -15591,15 +15852,15 @@
- 
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-+$as_echo "$lt_cv_dlopen_self" >&6; }
- 
-     if test "x$lt_cv_dlopen_self" = xyes; then
-       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
--      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
-+      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
- if test "${lt_cv_dlopen_self_static+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   	  if test "$cross_compiling" = yes; then :
-   lt_cv_dlopen_self_static=cross
-@@ -15607,7 +15868,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 15610 "configure"
-+#line 15871 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15669,7 +15930,7 @@
-   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-     (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-@@ -15687,8 +15948,8 @@
- 
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-+$as_echo "$lt_cv_dlopen_self_static" >&6; }
-     fi
- 
-     CPPFLAGS="$save_CPPFLAGS"
-@@ -15726,13 +15987,13 @@
- 
- striplib=
- old_striplib=
--{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
- if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
- # FIXME - insert some real tests, host_os isn't really good enough
-   case $host_os in
-@@ -15740,16 +16001,16 @@
-     if test -n "$STRIP" ; then
-       striplib="$STRIP -x"
-       old_striplib="$STRIP -S"
--      { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-     else
--      { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     fi
-     ;;
-   *)
--    { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     ;;
-   esac
- fi
-@@ -15766,13 +16027,13 @@
- 
- 
-   # Report which library types will actually be built
--  { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
--echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
--  { echo "$as_me:$LINENO: result: $can_build_shared" >&5
--echo "${ECHO_T}$can_build_shared" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
-+$as_echo "$can_build_shared" >&6; }
- 
--  { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+$as_echo_n "checking whether to build shared libraries... " >&6; }
-   test "$can_build_shared" = "no" && enable_shared=no
- 
-   # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -15792,15 +16053,15 @@
-     fi
-     ;;
-   esac
--  { echo "$as_me:$LINENO: result: $enable_shared" >&5
--echo "${ECHO_T}$enable_shared" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-+$as_echo "$enable_shared" >&6; }
- 
--  { echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+$as_echo_n "checking whether to build static libraries... " >&6; }
-   # Make sure either enable_shared or enable_static is yes.
-   test "$enable_shared" = yes || enable_static=yes
--  { echo "$as_me:$LINENO: result: $enable_static" >&5
--echo "${ECHO_T}$enable_static" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-+$as_echo "$enable_static" >&6; }
- 
- 
- 
-@@ -15949,8 +16210,8 @@
- ac_prog=ld
- if test "$GCC" = yes; then
-   # Check if gcc -print-prog-name=ld gives a path.
--  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+$as_echo_n "checking for ld used by $CC... " >&6; }
-   case $host in
-   *-*-mingw*)
-     # gcc leaves a trailing carriage return which upsets mingw
-@@ -15979,14 +16240,14 @@
-     ;;
-   esac
- elif test "$with_gnu_ld" = yes; then
--  { echo "$as_me:$LINENO: checking for GNU ld" >&5
--echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
-+$as_echo_n "checking for GNU ld... " >&6; }
- else
--  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+$as_echo_n "checking for non-GNU ld... " >&6; }
- fi
- if test "${lt_cv_path_LD+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test -z "$LD"; then
-   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -16016,19 +16277,19 @@
- 
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
--  { echo "$as_me:$LINENO: result: $LD" >&5
--echo "${ECHO_T}$LD" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $LD" >&5
-+$as_echo "$LD" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
--test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
--echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-+test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-+$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
--{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
--echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
- if test "${lt_cv_prog_gnu_ld+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $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
-@@ -16040,8 +16301,8 @@
-   ;;
- esac
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
- 
- 
-@@ -16095,8 +16356,8 @@
-     fi
- 
-     # PORTME: fill in a description of your system's C++ link characteristics
--    { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-     ld_shlibs_CXX=yes
-     case $host_os in
-       aix3*)
-@@ -16225,18 +16486,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -16251,12 +16515,13 @@
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16301,18 +16566,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -16327,12 +16595,13 @@
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -17078,8 +17347,8 @@
-         ;;
-     esac
- 
--    { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
--echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+$as_echo "$ld_shlibs_CXX" >&6; }
-     test "$ld_shlibs_CXX" = no && can_build_shared=no
- 
-     GCC_CXX="$GXX"
-@@ -17109,7 +17378,7 @@
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # Parse the compiler output and extract the necessary
-   # objects, libraries and library flags.
-@@ -17291,8 +17560,8 @@
- lt_prog_compiler_pic_CXX=
- lt_prog_compiler_static_CXX=
- 
--{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- 
-   # C++ specific cases for pic, static, wl, etc.
-   if test "$GXX" = yes; then
-@@ -17511,7 +17780,7 @@
- 	    ;;
- 	esac
- 	;;
--      netbsd*)
-+      netbsd* | netbsdelf*-gnu)
- 	;;
-       *qnx* | *nto*)
-         # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -17608,8 +17877,8 @@
-     lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-     ;;
- esac
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
- 
- 
- 
-@@ -17617,10 +17886,10 @@
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_CXX"; then
--  { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
- if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_pic_works_CXX=no
-    ac_outfile=conftest.$ac_objext
-@@ -17635,11 +17904,11 @@
-    -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:17638: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17907: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:17642: \$? = $ac_status" >&5
-+   echo "$as_me:17911: \$? = $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.
-@@ -17652,8 +17921,8 @@
-    $RM conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
- 
- if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-     case $lt_prog_compiler_pic_CXX in
-@@ -17673,10 +17942,10 @@
- # 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\"
--{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
- if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_static_works_CXX=no
-    save_LDFLAGS="$LDFLAGS"
-@@ -17701,8 +17970,8 @@
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
- 
- if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-     :
-@@ -17713,10 +17982,10 @@
- 
- 
- 
--    { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
- if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o_CXX=no
-    $RM -r conftest 2>/dev/null
-@@ -17734,11 +18003,11 @@
-    -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:17737: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18006: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:17741: \$? = $ac_status" >&5
-+   echo "$as_me:18010: \$? = $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
-@@ -17760,15 +18029,15 @@
-    $RM conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
- 
- 
- 
--    { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
- if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o_CXX=no
-    $RM -r conftest 2>/dev/null
-@@ -17786,11 +18055,11 @@
-    -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:17789: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18058: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:17793: \$? = $ac_status" >&5
-+   echo "$as_me:18062: \$? = $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
-@@ -17812,8 +18081,8 @@
-    $RM conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
- 
- 
- 
-@@ -17821,19 +18090,19 @@
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-   # do not overwrite the value of need_locks provided by the user
--  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+$as_echo_n "checking if we can lock with hard links... " >&6; }
-   hard_links=yes
-   $RM conftest*
-   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
--  { echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-+$as_echo "$hard_links" >&6; }
-   if test "$hard_links" = no; then
--    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-     need_locks=warn
-   fi
- else
-@@ -17842,8 +18111,8 @@
- 
- 
- 
--    { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
- 
-   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   case $host_os in
-@@ -17862,14 +18131,17 @@
-   cygwin* | mingw* | cegcc*)
-     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-+  linux* | k*bsd*-gnu)
-+    link_all_deplibs_CXX=no
-+  ;;
-   *)
-     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-   esac
-   exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- 
--{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
--echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-+$as_echo "$ld_shlibs_CXX" >&6; }
- test "$ld_shlibs_CXX" = no && can_build_shared=no
- 
- with_gnu_ld_CXX=$with_gnu_ld
-@@ -17896,15 +18168,15 @@
-       # 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.
--      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-       $RM conftest*
-       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
-       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-@@ -17922,7 +18194,7 @@
-         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
-   (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-         then
- 	  archive_cmds_need_lc_CXX=no
-@@ -17934,8 +18206,8 @@
-         cat conftest.err 1>&5
-       fi
-       $RM conftest*
--      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
--echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
-       ;;
-     esac
-   fi
-@@ -18005,8 +18277,8 @@
- 
- 
- 
--    { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
- 
- library_names_spec=
- libname_spec='lib$name'
-@@ -18404,29 +18676,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_cxx_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
-   shlibpath_overrides_runpath=yes
- fi
- 
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-   LDFLAGS=$save_LDFLAGS
-@@ -18452,6 +18728,18 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  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='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -18640,8 +18928,8 @@
-   dynamic_linker=no
-   ;;
- esac
--{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+$as_echo "$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -18691,8 +18979,8 @@
- 
- 
- 
--    { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
- hardcode_action_CXX=
- if test -n "$hardcode_libdir_flag_spec_CXX" ||
-    test -n "$runpath_var_CXX" ||
-@@ -18716,8 +19004,8 @@
-   # directories.
-   hardcode_action_CXX=unsupported
- fi
--{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
--echo "${ECHO_T}$hardcode_action_CXX" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-+$as_echo "$hardcode_action_CXX" >&6; }
- 
- if test "$hardcode_action_CXX" = relink ||
-    test "$inherit_rpath_CXX" = yes; then
-@@ -18861,13 +19149,13 @@
- 
- 
-   if test -n "$compiler"; then
--    { echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
--echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
--    { echo "$as_me:$LINENO: result: $can_build_shared" >&5
--echo "${ECHO_T}$can_build_shared" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-+    { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
-+$as_echo "$can_build_shared" >&6; }
- 
--    { echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+$as_echo_n "checking whether to build shared libraries... " >&6; }
-     test "$can_build_shared" = "no" && enable_shared=no
- 
-     # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -18886,15 +19174,15 @@
- 	fi
-         ;;
-     esac
--    { echo "$as_me:$LINENO: result: $enable_shared" >&5
--echo "${ECHO_T}$enable_shared" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-+$as_echo "$enable_shared" >&6; }
- 
--    { echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+$as_echo_n "checking whether to build static libraries... " >&6; }
-     # Make sure either enable_shared or enable_static is yes.
-     test "$enable_shared" = yes || enable_static=yes
--    { echo "$as_me:$LINENO: result: $enable_static" >&5
--echo "${ECHO_T}$enable_static" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-+$as_echo "$enable_static" >&6; }
- 
-     GCC_FC="$ac_cv_fc_compiler_gnu"
-     LD_FC="$LD"
-@@ -18922,7 +19210,7 @@
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # Parse the compiler output and extract the necessary
-   # objects, libraries and library flags.
-@@ -19032,8 +19320,8 @@
- lt_prog_compiler_pic_FC=
- lt_prog_compiler_static_FC=
- 
--{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- 
-   if test "$GCC" = yes; then
-     lt_prog_compiler_wl_FC='-Wl,'
-@@ -19304,8 +19592,8 @@
-     lt_prog_compiler_pic_FC="$lt_prog_compiler_pic_FC"
-     ;;
- esac
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_FC" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_FC" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_FC" >&5
-+$as_echo "$lt_prog_compiler_pic_FC" >&6; }
- 
- 
- 
-@@ -19313,10 +19601,10 @@
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_FC"; then
--  { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_FC works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_FC works... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_FC works" >&5
-+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_FC works... " >&6; }
- if test "${lt_cv_prog_compiler_pic_works_FC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_pic_works_FC=no
-    ac_outfile=conftest.$ac_objext
-@@ -19331,11 +19619,11 @@
-    -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:19334: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19622: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:19338: \$? = $ac_status" >&5
-+   echo "$as_me:19626: \$? = $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.
-@@ -19348,8 +19636,8 @@
-    $RM conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_FC" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_FC" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_FC" >&5
-+$as_echo "$lt_cv_prog_compiler_pic_works_FC" >&6; }
- 
- if test x"$lt_cv_prog_compiler_pic_works_FC" = xyes; then
-     case $lt_prog_compiler_pic_FC in
-@@ -19369,10 +19657,10 @@
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl_FC eval lt_tmp_static_flag=\"$lt_prog_compiler_static_FC\"
--{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
- if test "${lt_cv_prog_compiler_static_works_FC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_static_works_FC=no
-    save_LDFLAGS="$LDFLAGS"
-@@ -19397,8 +19685,8 @@
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_FC" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_static_works_FC" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_FC" >&5
-+$as_echo "$lt_cv_prog_compiler_static_works_FC" >&6; }
- 
- if test x"$lt_cv_prog_compiler_static_works_FC" = xyes; then
-     :
-@@ -19409,10 +19697,10 @@
- 
- 
- 
--    { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
- if test "${lt_cv_prog_compiler_c_o_FC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o_FC=no
-    $RM -r conftest 2>/dev/null
-@@ -19430,11 +19718,11 @@
-    -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:19433: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19721: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:19437: \$? = $ac_status" >&5
-+   echo "$as_me:19725: \$? = $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
-@@ -19456,15 +19744,15 @@
-    $RM conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_FC" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o_FC" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_FC" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o_FC" >&6; }
- 
- 
- 
--    { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
- if test "${lt_cv_prog_compiler_c_o_FC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o_FC=no
-    $RM -r conftest 2>/dev/null
-@@ -19482,11 +19770,11 @@
-    -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:19485: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19773: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:19489: \$? = $ac_status" >&5
-+   echo "$as_me:19777: \$? = $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
-@@ -19508,8 +19796,8 @@
-    $RM conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_FC" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o_FC" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_FC" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o_FC" >&6; }
- 
- 
- 
-@@ -19517,19 +19805,19 @@
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o_FC" = no && test "$need_locks" != no; then
-   # do not overwrite the value of need_locks provided by the user
--  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+$as_echo_n "checking if we can lock with hard links... " >&6; }
-   hard_links=yes
-   $RM conftest*
-   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
--  { echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-+$as_echo "$hard_links" >&6; }
-   if test "$hard_links" = no; then
--    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-     need_locks=warn
-   fi
- else
-@@ -19538,8 +19826,8 @@
- 
- 
- 
--    { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
- 
-   runpath_var=
-   allow_undefined_flag_FC=
-@@ -19598,6 +19886,9 @@
-   openbsd*)
-     with_gnu_ld=no
-     ;;
-+  linux* | k*bsd*-gnu)
-+    link_all_deplibs_FC=no
-+    ;;
-   esac
- 
-   ld_shlibs_FC=yes
-@@ -19780,7 +20071,7 @@
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -19955,6 +20246,7 @@
- 	if test "$aix_use_runtimelinking" = yes; then
- 	  shared_flag="$shared_flag "'${wl}-G'
- 	fi
-+	link_all_deplibs_FC=no
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -19991,18 +20283,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_fc_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -20017,12 +20312,13 @@
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -20048,18 +20344,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_fc_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -20074,12 +20373,13 @@
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -20302,27 +20602,31 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_fc_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
- 
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-         LDFLAGS="$save_LDFLAGS"
-@@ -20337,7 +20641,7 @@
-       link_all_deplibs_FC=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -20580,8 +20884,8 @@
-     fi
-   fi
- 
--{ echo "$as_me:$LINENO: result: $ld_shlibs_FC" >&5
--echo "${ECHO_T}$ld_shlibs_FC" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_FC" >&5
-+$as_echo "$ld_shlibs_FC" >&6; }
- test "$ld_shlibs_FC" = no && can_build_shared=no
- 
- with_gnu_ld_FC=$with_gnu_ld
-@@ -20608,15 +20912,15 @@
-       # 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.
--      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
-+      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-       $RM conftest*
-       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
-       if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-@@ -20634,7 +20938,7 @@
-         if { (eval echo "$as_me:$LINENO: \"$archive_cmds_FC 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
-   (eval $archive_cmds_FC 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }
-         then
- 	  archive_cmds_need_lc_FC=no
-@@ -20646,8 +20950,8 @@
-         cat conftest.err 1>&5
-       fi
-       $RM conftest*
--      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_FC" >&5
--echo "${ECHO_T}$archive_cmds_need_lc_FC" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_FC" >&5
-+$as_echo "$archive_cmds_need_lc_FC" >&6; }
-       ;;
-     esac
-   fi
-@@ -20717,8 +21021,8 @@
- 
- 
- 
--    { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
- 
- library_names_spec=
- libname_spec='lib$name'
-@@ -21098,29 +21402,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_fc_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
-   shlibpath_overrides_runpath=yes
- fi
- 
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-   LDFLAGS=$save_LDFLAGS
-@@ -21146,6 +21454,18 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  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='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -21334,8 +21654,8 @@
-   dynamic_linker=no
-   ;;
- esac
--{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+$as_echo "$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -21385,8 +21705,8 @@
- 
- 
- 
--    { echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
- hardcode_action_FC=
- if test -n "$hardcode_libdir_flag_spec_FC" ||
-    test -n "$runpath_var_FC" ||
-@@ -21410,8 +21730,8 @@
-   # directories.
-   hardcode_action_FC=unsupported
- fi
--{ echo "$as_me:$LINENO: result: $hardcode_action_FC" >&5
--echo "${ECHO_T}$hardcode_action_FC" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $hardcode_action_FC" >&5
-+$as_echo "$hardcode_action_FC" >&6; }
- 
- if test "$hardcode_action_FC" = relink ||
-    test "$inherit_rpath_FC" = yes; then
-@@ -21480,8 +21800,8 @@
-     ;;
- esac
- 
--{ echo "$as_me:$LINENO: checking if -Wl,-rpath should be used to link shared libs in nondefault directories" >&5
--echo $ECHO_N "checking if -Wl,-rpath should be used to link shared libs in nondefault directories... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if -Wl,-rpath should be used to link shared libs in nondefault directories" >&5
-+$as_echo_n "checking if -Wl,-rpath should be used to link shared libs in nondefault directories... " >&6; }
- # Check whether --enable-sharedlib-rpath was given.
- if test "${enable_sharedlib_rpath+set}" = set; then
-   enableval=$enable_sharedlib_rpath; RPATH=$enableval
-@@ -21490,30 +21810,30 @@
- 
- case "X-$RPATH" in
-   X-no)
--    { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     runpath_var=
-     hardcode_libdir_flag_spec=
-     hardcode_libdir_flag_spec_ld=
-     ;;
-   X-|X-yes)
--    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-     ;;
-   *)
--    { echo "$as_me:$LINENO: result: error" >&5
--echo "${ECHO_T}error" >&6; }
--    { { echo "$as_me:$LINENO: error: \'$enableval\' is not a valid rpath type" >&5
--echo "$as_me: error: \'$enableval\' is not a valid rpath type" >&2;}
-+    { $as_echo "$as_me:$LINENO: result: error" >&5
-+$as_echo "error" >&6; }
-+    { { $as_echo "$as_me:$LINENO: error: \'$enableval\' is not a valid rpath type" >&5
-+$as_echo "$as_me: error: \'$enableval\' is not a valid rpath type" >&2;}
-    { (exit 1); exit 1; }; }
-     ;;
- esac
- 
--{ echo "$as_me:$LINENO: checking make" >&5
--echo $ECHO_N "checking make... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking make" >&5
-+$as_echo_n "checking make... " >&6; }
- 
--{ echo "$as_me:$LINENO: checking how make searches directories" >&5
--echo $ECHO_N "checking how make searches directories... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking how make searches directories" >&5
-+$as_echo_n "checking how make searches directories... " >&6; }
- while true; do #for break
-   # The most common method is `VPATH=DIR1 DIR2 ...'
-   cat >maketest <<EOF
-@@ -21529,8 +21849,8 @@
-   if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
-     SEARCH_RULE='VPATH='
-     SEARCH_SEP=' '
--    { echo "$as_me:$LINENO: result: VPATH=DIR1 DIR2 ..." >&5
--echo "${ECHO_T}VPATH=DIR1 DIR2 ..." >&6; }
-+    { $as_echo "$as_me:$LINENO: result: VPATH=DIR1 DIR2 ..." >&5
-+$as_echo "VPATH=DIR1 DIR2 ..." >&6; }
-     break
-   fi
- 
-@@ -21547,8 +21867,8 @@
-   if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
-     SEARCH_RULE='VPATH='
-     SEARCH_SEP=':'
--    { echo "$as_me:$LINENO: result: VPATH=DIR1:DIR2:..." >&5
--echo "${ECHO_T}VPATH=DIR1:DIR2:..." >&6; }
-+    { $as_echo "$as_me:$LINENO: result: VPATH=DIR1:DIR2:..." >&5
-+$as_echo "VPATH=DIR1:DIR2:..." >&6; }
-     break
-   fi
- 
-@@ -21565,18 +21885,18 @@
-   if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
-     SEARCH_RULE='.PATH: '
-     SEARCH_SEP=' '
--    { echo "$as_me:$LINENO: result: .PATH: DIR1 DIR2 ..." >&5
--echo "${ECHO_T}.PATH: DIR1 DIR2 ..." >&6; }
-+    { $as_echo "$as_me:$LINENO: result: .PATH: DIR1 DIR2 ..." >&5
-+$as_echo ".PATH: DIR1 DIR2 ..." >&6; }
-     break
-   fi
- 
-     SEARCH_RULE='## SEARCH DISABLED: '
-   SEARCH_SEP=' '
--  { echo "$as_me:$LINENO: result: it doesn't" >&5
--echo "${ECHO_T}it doesn't" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: it doesn't" >&5
-+$as_echo "it doesn't" >&6; }
-   if test ! -f configure; then
--    { { echo "$as_me:$LINENO: error: ${MAKE-make} requires the build and source directories to be the same" >&5
--echo "$as_me: error: ${MAKE-make} requires the build and source directories to be the same" >&2;}
-+    { { $as_echo "$as_me:$LINENO: error: ${MAKE-make} requires the build and source directories to be the same" >&5
-+$as_echo "$as_me: error: ${MAKE-make} requires the build and source directories to be the same" >&2;}
-    { (exit 1); exit 1; }; }
-   fi
-   break
-@@ -21587,8 +21907,8 @@
- 
- if test -n "${MAKE-make}"; then
- 
--  { echo "$as_me:$LINENO: checking whether make will build with undefined variables" >&5
--echo $ECHO_N "checking whether make will build with undefined variables... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking whether make will build with undefined variables" >&5
-+$as_echo_n "checking whether make will build with undefined variables... " >&6; }
- 
-   cat >maketest <<EOF
- foo: \$(UNDEFINED) \$(UNDEFINED2)
-@@ -21596,19 +21916,19 @@
- EOF
- 
-   if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then
--    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-   else
--    { echo "$as_me:$LINENO: result: no, setting -V flag" >&5
--echo "${ECHO_T}no, setting -V flag" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: no, setting -V flag" >&5
-+$as_echo "no, setting -V flag" >&6; }
-     AM_MAKEFLAGS="\-V"
-   fi
- 
-   rm maketest
- fi
- 
--{ echo "$as_me:$LINENO: checking for production mode" >&5
--echo $ECHO_N "checking for production mode... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for production mode" >&5
-+$as_echo_n "checking for production mode... " >&6; }
- # Check whether --enable-production was given.
- if test "${enable_production+set}" = set; then
-   enableval=$enable_production;
-@@ -21618,8 +21938,8 @@
- case "X-$enable_production" in
-   X-|X-yes)
-     enable_production="yes"
--    { echo "$as_me:$LINENO: result: production" >&5
--echo "${ECHO_T}production" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: production" >&5
-+$as_echo "production" >&6; }
-     CONFIG_MODE=production
-     H5_CFLAGS="$H5_CFLAGS $PROD_CFLAGS"
-     H5_CPPFLAGS="$H5_CPPFLAGS $PROD_CPPFLAGS"
-@@ -21628,8 +21948,8 @@
-     ;;
-   X-no)
-     enable_production="no"
--    { echo "$as_me:$LINENO: result: development" >&5
--echo "${ECHO_T}development" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: development" >&5
-+$as_echo "development" >&6; }
-     CONFIG_MODE=development
-     H5_CFLAGS="$H5_CFLAGS $DEBUG_CFLAGS"
-     H5_CPPFLAGS="$H5_CPPFLAGS $DEBUG_CPPFLAGS"
-@@ -21638,8 +21958,8 @@
-     ;;
-   X-pg|X-profile)
-     enable_production="profile"
--    { echo "$as_me:$LINENO: result: profile" >&5
--echo "${ECHO_T}profile" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: profile" >&5
-+$as_echo "profile" >&6; }
-     CONFIG_MODE=profile
-     H5_CFLAGS="$H5_CFLAGS $PROFILE_CFLAGS"
-     H5_CPPFLAGS="$H5_CPPFLAGS $PROFILE_CPPFLAGS"
-@@ -21648,17 +21968,17 @@
-     ;;
-   *)
-     enable_production="user-defined"
--    { echo "$as_me:$LINENO: result: user-defined" >&5
--echo "${ECHO_T}user-defined" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: user-defined" >&5
-+$as_echo "user-defined" >&6; }
-     CONFIG_MODE="$X-enableval"
-     ;;
- esac
- 
- 
--{ echo "$as_me:$LINENO: checking for ceil in -lm" >&5
--echo $ECHO_N "checking for ceil in -lm... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for ceil in -lm" >&5
-+$as_echo_n "checking for ceil in -lm... " >&6; }
- if test "${ac_cv_lib_m_ceil+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lm  $LIBS"
-@@ -21698,33 +22018,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_m_ceil=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_m_ceil=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_ceil" >&5
--echo "${ECHO_T}$ac_cv_lib_m_ceil" >&6; }
--if test $ac_cv_lib_m_ceil = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_ceil" >&5
-+$as_echo "$ac_cv_lib_m_ceil" >&6; }
-+if test "x$ac_cv_lib_m_ceil" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBM 1
- _ACEOF
-@@ -21736,10 +22060,10 @@
- 
- if test "`uname`" = "SunOS" -o "`uname -sr`" = "HP-UX B.11.00"; then
- 
--{ echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
--echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
-+$as_echo_n "checking for socket in -lsocket... " >&6; }
- if test "${ac_cv_lib_socket_socket+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsocket  $LIBS"
-@@ -21779,33 +22103,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_socket_socket=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_socket_socket=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6; }
--if test $ac_cv_lib_socket_socket = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
-+$as_echo "$ac_cv_lib_socket_socket" >&6; }
-+if test "x$ac_cv_lib_socket_socket" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSOCKET 1
- _ACEOF
-@@ -21815,10 +22143,10 @@
- fi
- 
- 
--{ echo "$as_me:$LINENO: checking for xdr_int in -lnsl" >&5
--echo $ECHO_N "checking for xdr_int in -lnsl... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for xdr_int in -lnsl" >&5
-+$as_echo_n "checking for xdr_int in -lnsl... " >&6; }
- if test "${ac_cv_lib_nsl_xdr_int+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl  $LIBS"
-@@ -21858,33 +22186,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_nsl_xdr_int=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_nsl_xdr_int=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_xdr_int" >&5
--echo "${ECHO_T}$ac_cv_lib_nsl_xdr_int" >&6; }
--if test $ac_cv_lib_nsl_xdr_int = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_xdr_int" >&5
-+$as_echo "$ac_cv_lib_nsl_xdr_int" >&6; }
-+if test "x$ac_cv_lib_nsl_xdr_int" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBNSL 1
- _ACEOF
-@@ -21896,10 +22228,10 @@
- fi
- 
- 
--{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+$as_echo_n "checking for ANSI C header files... " >&6; }
- if test "${ac_cv_header_stdc+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -21934,20 +22266,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_header_stdc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_header_stdc=no
-@@ -22039,37 +22372,40 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- ac_cv_header_stdc=no
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 
- fi
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-+$as_echo "$ac_cv_header_stdc" >&6; }
- if test $ac_cv_header_stdc = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -22078,10 +22414,10 @@
- 
- fi
- 
--{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
--echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
- if test "${ac_cv_header_time+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -22116,20 +22452,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_header_time=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_header_time=no
-@@ -22137,8 +22474,8 @@
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
--echo "${ECHO_T}$ac_cv_header_time" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-+$as_echo "$ac_cv_header_time" >&6; }
- if test $ac_cv_header_time = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -22151,11 +22488,11 @@
- 
- for ac_func in difftime
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-+$as_echo_n "checking for $ac_func... " >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -22216,35 +22553,42 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_var=no"
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -22253,11 +22597,11 @@
- 
- for ac_func in gettimeofday
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-+$as_echo_n "checking for $ac_func... " >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -22318,35 +22662,42 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_var=no"
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-  have_gettime="yes"
- else
-@@ -22362,20 +22713,21 @@
- 
- for ac_header in sys/resource.h sys/time.h unistd.h sys/ioctl.h sys/stat.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -22391,32 +22743,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -22430,51 +22783,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -22483,21 +22837,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -22508,20 +22865,21 @@
- 
- for ac_header in sys/socket.h sys/types.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -22537,32 +22895,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -22576,51 +22935,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -22629,21 +22989,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -22655,20 +23018,21 @@
- 
- for ac_header in stddef.h setjmp.h features.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -22684,32 +23048,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -22723,51 +23088,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -22776,21 +23142,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -22800,20 +23169,21 @@
- 
- for ac_header in stdint.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -22829,32 +23199,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -22868,51 +23239,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -22921,21 +23293,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-  C9x=yes
- fi
-@@ -22949,20 +23324,21 @@
- 
- for ac_header in io.h sys/timeb.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -22978,32 +23354,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23017,51 +23394,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -23070,21 +23448,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -23098,20 +23479,21 @@
- 
- for ac_header in io.h winsock.h sys/timeb.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23127,32 +23509,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23166,51 +23549,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -23219,21 +23603,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -23249,20 +23636,21 @@
- 
- for ac_header in sys/sysinfo.h sys/proc.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23278,32 +23666,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23317,51 +23706,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -23370,21 +23760,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -23396,20 +23789,21 @@
- 
- for ac_header in sys/fpu.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23425,32 +23819,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -23464,51 +23859,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -23517,21 +23913,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -23541,11 +23940,11 @@
- 
- for ac_func in get_fpc_csr
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-+$as_echo_n "checking for $ac_func... " >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -23606,35 +24005,42 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_var=no"
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -23668,15 +24074,15 @@
-         ;;
-     esac
- 
--    { echo "$as_me:$LINENO: checking for large file support mode on Linux" >&5
--echo $ECHO_N "checking for large file support mode on Linux... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for large file support mode on Linux" >&5
-+$as_echo_n "checking for large file support mode on Linux... " >&6; }
-     if test "X$LINUX_LFS" = "Xyes"; then
--      { echo "$as_me:$LINENO: result: enabled" >&5
--echo "${ECHO_T}enabled" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: enabled" >&5
-+$as_echo "enabled" >&6; }
-       CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $CPPFLAGS"
-     else
--      { echo "$as_me:$LINENO: result: disabled" >&5
--echo "${ECHO_T}disabled" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: disabled" >&5
-+$as_echo "disabled" >&6; }
-     fi
- 
-                 CPPFLAGS="-D_POSIX_SOURCE $CPPFLAGS"
-@@ -23714,13 +24120,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -23732,11 +24139,11 @@
- 
- for ac_func in lseek64 fseek64 ftruncate64 fseeko ftello
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-+$as_echo_n "checking for $ac_func... " >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -23797,46 +24204,53 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_var=no"
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
- done
- 
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: skipping test for lseek64(), fseek64(), ftruncate64(), fseeko(), and ftello()" >&5
--echo "${ECHO_T}skipping test for lseek64(), fseek64(), ftruncate64(), fseeko(), and ftello()" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: skipping test for lseek64(), fseek64(), ftruncate64(), fseeko(), and ftello()" >&5
-+$as_echo "skipping test for lseek64(), fseek64(), ftruncate64(), fseeko(), and ftello()" >&6; }
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-@@ -23871,13 +24285,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -23886,11 +24301,11 @@
- 
- for ac_func in stat64 fstat64
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-+$as_echo_n "checking for $ac_func... " >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -23951,63 +24366,70 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_var=no"
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
- done
- 
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: skipping test for stat64() and fstat64()" >&5
--echo "${ECHO_T}skipping test for stat64() and fstat64()" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: skipping test for stat64() and fstat64()" >&5
-+$as_echo "skipping test for stat64() and fstat64()" >&6; }
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--{ echo "$as_me:$LINENO: checking for off_t" >&5
--echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
-+$as_echo_n "checking for off_t... " >&6; }
- if test "${ac_cv_type_off_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
-+  ac_cv_type_off_t=no
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--typedef off_t ac__type_new_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -24019,10 +24441,50 @@
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
-+if (sizeof (off_t))
-+       return 0;
-+  ;
-   return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#ifdef FC_DUMMY_MAIN
-+#ifndef FC_DUMMY_MAIN_EQ_F77
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int FC_DUMMY_MAIN() { return 1; }
-+#endif
-+#endif
-+int
-+main ()
-+{
-+if (sizeof ((off_t)))
-+	  return 0;
-   ;
-   return 0;
- }
-@@ -24033,30 +24495,39 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
--  ac_cv_type_off_t=yes
-+  :
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_type_off_t=yes
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_type_off_t=no
-+
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
--echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
--if test $ac_cv_type_off_t = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-+$as_echo "$ac_cv_type_off_t" >&6; }
-+if test "x$ac_cv_type_off_t" = x""yes; then
-   :
- else
- 
-@@ -24066,19 +24537,19 @@
- 
- fi
- 
--{ echo "$as_me:$LINENO: checking for size_t" >&5
--echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
-+$as_echo_n "checking for size_t... " >&6; }
- if test "${ac_cv_type_size_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
-+  ac_cv_type_size_t=no
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--typedef size_t ac__type_new_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -24090,10 +24561,50 @@
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
-+if (sizeof (size_t))
-+       return 0;
-+  ;
-   return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#ifdef FC_DUMMY_MAIN
-+#ifndef FC_DUMMY_MAIN_EQ_F77
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int FC_DUMMY_MAIN() { return 1; }
-+#endif
-+#endif
-+int
-+main ()
-+{
-+if (sizeof ((size_t)))
-+	  return 0;
-   ;
-   return 0;
- }
-@@ -24104,30 +24615,39 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
--  ac_cv_type_size_t=yes
-+  :
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_type_size_t=yes
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_type_size_t=no
-+
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
--echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
--if test $ac_cv_type_size_t = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-+$as_echo "$ac_cv_type_size_t" >&6; }
-+if test "x$ac_cv_type_size_t" = x""yes; then
-   :
- else
- 
-@@ -24137,19 +24657,19 @@
- 
- fi
- 
--{ echo "$as_me:$LINENO: checking for ssize_t" >&5
--echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for ssize_t" >&5
-+$as_echo_n "checking for ssize_t... " >&6; }
- if test "${ac_cv_type_ssize_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
-+  ac_cv_type_ssize_t=no
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--typedef ssize_t ac__type_new_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -24161,10 +24681,50 @@
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
-+if (sizeof (ssize_t))
-+       return 0;
-+  ;
-   return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#ifdef FC_DUMMY_MAIN
-+#ifndef FC_DUMMY_MAIN_EQ_F77
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int FC_DUMMY_MAIN() { return 1; }
-+#endif
-+#endif
-+int
-+main ()
-+{
-+if (sizeof ((ssize_t)))
-+	  return 0;
-   ;
-   return 0;
- }
-@@ -24175,30 +24735,39 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
--  ac_cv_type_ssize_t=yes
-+  :
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_type_ssize_t=yes
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_type_ssize_t=no
-+
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
--echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; }
--if test $ac_cv_type_ssize_t = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
-+$as_echo "$ac_cv_type_ssize_t" >&6; }
-+if test "x$ac_cv_type_ssize_t" = x""yes; then
-   :
- else
- 
-@@ -24208,20 +24777,69 @@
- 
- fi
- 
--{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
--echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
-+
-+ { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
- if test "${ac_cv_c_bigendian+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
--  # See if sys/param.h defines the BYTE_ORDER macro.
--cat >conftest.$ac_ext <<_ACEOF
-+  ac_cv_c_bigendian=unknown
-+    # See if we're dealing with a universal compiler.
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#ifndef __APPLE_CC__
-+	       not a universal capable compiler
-+	     #endif
-+	     typedef int dummy;
-+
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+
-+	# Check for potential -arch flags.  It is not universal unless
-+	# there are some -arch flags.  Note that *ppc* also matches
-+	# ppc64.  This check is also rather less than ideal.
-+	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
-+	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
-+	esac
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+    if test $ac_cv_c_bigendian = unknown; then
-+      # See if sys/param.h defines the BYTE_ORDER macro.
-+      cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <sys/types.h>
--#include <sys/param.h>
-+	     #include <sys/param.h>
- 
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
-@@ -24234,10 +24852,11 @@
- int
- main ()
- {
--#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
--	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
-- bogus endian macros
--#endif
-+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-+		     && LITTLE_ENDIAN)
-+	      bogus endian macros
-+	     #endif
- 
-   ;
-   return 0;
-@@ -24249,26 +24868,27 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   # It does; now see whether it defined to BIG_ENDIAN or not.
--cat >conftest.$ac_ext <<_ACEOF
-+	 cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <sys/types.h>
--#include <sys/param.h>
-+		#include <sys/param.h>
- 
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
-@@ -24282,8 +24902,8 @@
- main ()
- {
- #if BYTE_ORDER != BIG_ENDIAN
-- not big endian
--#endif
-+		 not big endian
-+		#endif
- 
-   ;
-   return 0;
-@@ -24295,20 +24915,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_c_bigendian=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_c_bigendian=no
-@@ -24316,25 +24937,24 @@
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	# It does not; compile a test program.
--if test "$cross_compiling" = yes; then
--  # try to guess the endianness by grepping values into an object file
--  ac_cv_c_bigendian=unknown
--  cat >conftest.$ac_ext <<_ACEOF
-+
-+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 >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
--short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
--void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
--short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
--short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
--void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
-+#include <limits.h>
-+
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -24346,7 +24966,10 @@
- int
- main ()
- {
-- _ascii (); _ebcdic ();
-+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-+	      bogus endian macros
-+	     #endif
-+
-   ;
-   return 0;
- }
-@@ -24357,44 +24980,27 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
--  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
--  ac_cv_c_bigendian=yes
--fi
--if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
--  if test "$ac_cv_c_bigendian" = unknown; then
--    ac_cv_c_bigendian=no
--  else
--    # finding both strings is unlikely to happen, but who knows?
--    ac_cv_c_bigendian=unknown
--  fi
--fi
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
--  cat >conftest.$ac_ext <<_ACEOF
-+  # It does; now see whether it defined to _BIG_ENDIAN or not.
-+	 cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--$ac_includes_default
-+#include <limits.h>
-+
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -24406,89 +25012,76 @@
- 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;
-+#ifndef _BIG_ENDIAN
-+		 not big endian
-+		#endif
- 
-   ;
-   return 0;
- }
- _ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
-+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 "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_c_bigendian=no
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_cv_c_bigendian=yes
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--( exit $ac_status )
--ac_cv_c_bigendian=yes
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+	ac_cv_c_bigendian=no
- fi
- 
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
--fi
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
--echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
--case $ac_cv_c_bigendian in
--  yes)
--
--cat >>confdefs.h <<\_ACEOF
--#define WORDS_BIGENDIAN 1
--_ACEOF
-- ;;
--  no)
--     ;;
--  *)
--    { { echo "$as_me:$LINENO: error: unknown endianness
--presetting ac_cv_c_bigendian=no (or yes) will help" >&5
--echo "$as_me: error: unknown endianness
--presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
--   { (exit 1); exit 1; }; } ;;
--esac
- 
--{ echo "$as_me:$LINENO: checking for char" >&5
--echo $ECHO_N "checking for char... $ECHO_C" >&6; }
--if test "${ac_cv_type_char+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+    fi
-+    if test $ac_cv_c_bigendian = unknown; then
-+      # Compile a test program.
-+      if test "$cross_compiling" = yes; then
-+  # Try to guess by grepping values from an object file.
-+	 cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--$ac_includes_default
--typedef char ac__type_new_;
-+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;
-+
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -24500,10 +25093,7 @@
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
-+return use_ascii (foo) == use_ebcdic (foo);
-   ;
-   return 0;
- }
-@@ -24514,38 +25104,141 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
--  ac_cv_type_char=yes
-+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
-+	      ac_cv_c_bigendian=yes
-+	    fi
-+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-+	      if test "$ac_cv_c_bigendian" = unknown; then
-+		ac_cv_c_bigendian=no
-+	      else
-+		# finding both strings is unlikely to happen, but who knows?
-+		ac_cv_c_bigendian=unknown
-+	      fi
-+	    fi
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_cv_type_char=no
-+
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#ifdef FC_DUMMY_MAIN
-+#ifndef FC_DUMMY_MAIN_EQ_F77
-+#  ifdef __cplusplus
-+     extern "C"
-+#  endif
-+   int FC_DUMMY_MAIN() { return 1; }
-+#endif
-+#endif
-+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
-+rm -f conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_c_bigendian=no
-+else
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+ac_cv_c_bigendian=yes
-+fi
-+rm -rf conftest.dSYM
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+
-+    fi
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
--echo "${ECHO_T}$ac_cv_type_char" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-+$as_echo "$ac_cv_c_bigendian" >&6; }
-+ case $ac_cv_c_bigendian in #(
-+   yes)
-+     cat >>confdefs.h <<\_ACEOF
-+#define WORDS_BIGENDIAN 1
-+_ACEOF
-+;; #(
-+   no)
-+      ;; #(
-+   universal)
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define AC_APPLE_UNIVERSAL_BUILD 1
-+_ACEOF
-+
-+     ;; #(
-+   *)
-+     { { $as_echo "$as_me:$LINENO: error: unknown endianness
-+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-+$as_echo "$as_me: error: unknown endianness
-+ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-+   { (exit 1); exit 1; }; } ;;
-+ esac
- 
- # 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.
--{ echo "$as_me:$LINENO: checking size of char" >&5
--echo $ECHO_N "checking size of char... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of char" >&5
-+$as_echo_n "checking size of char... " >&6; }
- if test "${ac_cv_sizeof_char+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -24556,7 +25249,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef char ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -24568,7 +25260,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -24581,13 +25273,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -24601,7 +25294,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef char ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -24613,7 +25305,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -24626,20 +25318,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -24653,7 +25346,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -24663,7 +25356,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef char ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -24675,7 +25367,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (char))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -24688,13 +25380,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -24708,7 +25401,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef char ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -24720,7 +25412,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -24733,20 +25425,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -24760,7 +25453,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -24780,7 +25473,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef char ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -24792,7 +25484,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -24805,20 +25497,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -24829,11 +25522,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_char=$ac_lo;;
- '') if test "$ac_cv_type_char" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (char)
-+$as_echo "$as_me: error: cannot compute sizeof (char)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_char=0
-    fi ;;
-@@ -24846,9 +25541,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef char ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (char)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (char)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -24866,20 +25560,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (char))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (char))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (char))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -24892,43 +25588,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_char=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_char" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (char)
-+$as_echo "$as_me: error: cannot compute sizeof (char)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_char=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
--echo "${ECHO_T}$ac_cv_sizeof_char" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
-+$as_echo "$ac_cv_sizeof_char" >&6; }
- 
- 
- 
-@@ -24937,19 +25638,24 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for short" >&5
--echo $ECHO_N "checking for short... $ECHO_C" >&6; }
--if test "${ac_cv_type_short+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:$LINENO: checking size of short" >&5
-+$as_echo_n "checking size of short... " >&6; }
-+if test "${ac_cv_sizeof_short+set}" = set; then
-+  $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--typedef short ac__type_new_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -24961,10 +25667,9 @@
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
-+static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
-+test_array [0] = 0
-+
-   ;
-   return 0;
- }
-@@ -24975,49 +25680,27 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
--  ac_cv_type_short=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_short=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
--echo "${ECHO_T}$ac_cv_type_short" >&6; }
--
--# 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.
--{ echo "$as_me:$LINENO: checking size of short" >&5
--echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
--if test "${ac_cv_sizeof_short+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test "$cross_compiling" = yes; then
--  # Depending upon the size, compute the lo and hi bounds.
--cat >conftest.$ac_ext <<_ACEOF
-+  ac_lo=0 ac_mid=0
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef short ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -25029,7 +25712,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25042,65 +25725,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_lo=0 ac_mid=0
--  while :; do
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--   typedef short ac__type_sizeof_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -25114,7 +25753,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -25124,7 +25763,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef short ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -25136,7 +25774,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -25149,13 +25787,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -25169,7 +25808,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef short ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -25181,7 +25819,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25194,20 +25832,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -25221,7 +25860,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -25241,7 +25880,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef short ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -25253,7 +25891,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25266,20 +25904,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -25290,11 +25929,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_short=$ac_lo;;
- '') if test "$ac_cv_type_short" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (short)
-+$as_echo "$as_me: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_short=0
-    fi ;;
-@@ -25307,9 +25948,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef short ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (short)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (short)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -25327,20 +25967,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (short))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (short))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (short))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -25353,43 +25995,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_short=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_short" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (short)
-+$as_echo "$as_me: error: cannot compute sizeof (short)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_short=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
--echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-+$as_echo "$ac_cv_sizeof_short" >&6; }
- 
- 
- 
-@@ -25398,76 +26045,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for int" >&5
--echo $ECHO_N "checking for int... $ECHO_C" >&6; }
--if test "${ac_cv_type_int+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef int ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_int=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_int=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
--echo "${ECHO_T}$ac_cv_type_int" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of int" >&5
--echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of int" >&5
-+$as_echo_n "checking size of int... " >&6; }
- if test "${ac_cv_sizeof_int+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -25478,7 +26063,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -25490,7 +26074,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -25503,13 +26087,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -25523,7 +26108,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -25535,7 +26119,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25548,20 +26132,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -25575,7 +26160,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -25585,7 +26170,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -25597,7 +26181,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -25610,13 +26194,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -25630,7 +26215,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -25642,7 +26226,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25655,20 +26239,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -25682,7 +26267,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -25702,7 +26287,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -25714,7 +26298,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -25727,20 +26311,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -25751,11 +26336,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_int=$ac_lo;;
- '') if test "$ac_cv_type_int" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int)
-+$as_echo "$as_me: error: cannot compute sizeof (int)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int=0
-    fi ;;
-@@ -25768,9 +26355,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (int)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (int)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -25788,20 +26374,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (int))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -25814,43 +26402,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_int=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_int" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int)
-+$as_echo "$as_me: error: cannot compute sizeof (int)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-+$as_echo "$ac_cv_sizeof_int" >&6; }
- 
- 
- 
-@@ -25859,76 +26452,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for long" >&5
--echo $ECHO_N "checking for long... $ECHO_C" >&6; }
--if test "${ac_cv_type_long+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef long ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_long=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_long=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
--echo "${ECHO_T}$ac_cv_type_long" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of long" >&5
--echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of long" >&5
-+$as_echo_n "checking size of long... " >&6; }
- if test "${ac_cv_sizeof_long+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -25939,7 +26470,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef long ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -25951,7 +26481,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -25964,13 +26494,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -25984,7 +26515,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef long ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -25996,7 +26526,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26009,20 +26539,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -26036,7 +26567,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -26046,7 +26577,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef long ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -26058,7 +26588,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -26071,13 +26601,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -26091,7 +26622,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef long ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -26103,7 +26633,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26116,20 +26646,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -26143,7 +26674,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -26163,7 +26694,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef long ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -26175,7 +26705,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26188,20 +26718,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -26212,11 +26743,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_long=$ac_lo;;
- '') if test "$ac_cv_type_long" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long)
-+$as_echo "$as_me: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_long=0
-    fi ;;
-@@ -26229,9 +26762,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef long ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (long)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (long)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -26249,20 +26781,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (long))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (long))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (long))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -26275,43 +26809,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_long=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_long" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long)
-+$as_echo "$as_me: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_long=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
--echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-+$as_echo "$ac_cv_sizeof_long" >&6; }
- 
- 
- 
-@@ -26320,76 +26859,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for long long" >&5
--echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
--if test "${ac_cv_type_long_long+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef long long ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_long_long=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_long_long=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
--echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of long long" >&5
--echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of long long" >&5
-+$as_echo_n "checking size of long long... " >&6; }
- if test "${ac_cv_sizeof_long_long+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -26400,7 +26877,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef long long ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -26412,7 +26888,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -26425,13 +26901,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -26445,7 +26922,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef long long ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -26457,7 +26933,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26470,20 +26946,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -26497,7 +26974,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -26507,7 +26984,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef long long ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -26519,7 +26995,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -26532,13 +27008,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -26552,7 +27029,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef long long ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -26564,7 +27040,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26577,20 +27053,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -26604,7 +27081,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -26624,7 +27101,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef long long ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -26636,7 +27112,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26649,20 +27125,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -26673,11 +27150,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_long_long=$ac_lo;;
- '') if test "$ac_cv_type_long_long" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long long)
-+$as_echo "$as_me: error: cannot compute sizeof (long long)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_long_long=0
-    fi ;;
-@@ -26690,9 +27169,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef long long ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (long long)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (long long)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -26710,20 +27188,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (long long))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (long long))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (long long))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -26736,43 +27216,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_long_long=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_long_long" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long long)
-+$as_echo "$as_me: error: cannot compute sizeof (long long)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_long_long=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
--echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-+$as_echo "$ac_cv_sizeof_long_long" >&6; }
- 
- 
- 
-@@ -26781,76 +27266,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for __int64" >&5
--echo $ECHO_N "checking for __int64... $ECHO_C" >&6; }
--if test "${ac_cv_type___int64+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef __int64 ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type___int64=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type___int64=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type___int64" >&5
--echo "${ECHO_T}$ac_cv_type___int64" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of __int64" >&5
--echo $ECHO_N "checking size of __int64... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of __int64" >&5
-+$as_echo_n "checking size of __int64... " >&6; }
- if test "${ac_cv_sizeof___int64+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -26861,7 +27284,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef __int64 ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -26873,7 +27295,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (__int64))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -26886,13 +27308,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -26906,7 +27329,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef __int64 ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -26918,7 +27340,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (__int64))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -26931,20 +27353,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -26958,7 +27381,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -26968,7 +27391,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef __int64 ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -26980,7 +27402,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (__int64))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -26993,13 +27415,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -27013,7 +27436,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef __int64 ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -27025,7 +27447,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (__int64))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -27038,20 +27460,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -27065,7 +27488,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -27085,7 +27508,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef __int64 ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -27097,7 +27519,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (__int64))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -27110,20 +27532,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -27134,11 +27557,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof___int64=$ac_lo;;
- '') if test "$ac_cv_type___int64" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (__int64)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (__int64)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (__int64)
-+$as_echo "$as_me: error: cannot compute sizeof (__int64)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof___int64=0
-    fi ;;
-@@ -27151,9 +27576,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef __int64 ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (__int64)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (__int64)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -27171,20 +27595,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (__int64))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (__int64))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (__int64))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -27197,43 +27623,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof___int64=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type___int64" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (__int64)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (__int64)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (__int64)
-+$as_echo "$as_me: error: cannot compute sizeof (__int64)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof___int64=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof___int64" >&5
--echo "${ECHO_T}$ac_cv_sizeof___int64" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof___int64" >&5
-+$as_echo "$ac_cv_sizeof___int64" >&6; }
- 
- 
- 
-@@ -27242,76 +27673,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for float" >&5
--echo $ECHO_N "checking for float... $ECHO_C" >&6; }
--if test "${ac_cv_type_float+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef float ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_float=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_float=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_float" >&5
--echo "${ECHO_T}$ac_cv_type_float" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of float" >&5
--echo $ECHO_N "checking size of float... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of float" >&5
-+$as_echo_n "checking size of float... " >&6; }
- if test "${ac_cv_sizeof_float+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -27322,7 +27691,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef float ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -27334,7 +27702,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (float))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -27347,13 +27715,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -27367,7 +27736,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef float ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -27379,7 +27747,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (float))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -27392,20 +27760,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -27419,7 +27788,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -27429,7 +27798,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef float ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -27441,7 +27809,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (float))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -27454,13 +27822,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -27474,7 +27843,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef float ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -27486,7 +27854,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (float))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -27499,20 +27867,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -27526,7 +27895,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -27546,7 +27915,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef float ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -27558,7 +27926,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (float))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -27571,20 +27939,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -27595,11 +27964,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_float=$ac_lo;;
- '') if test "$ac_cv_type_float" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (float)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (float)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (float)
-+$as_echo "$as_me: error: cannot compute sizeof (float)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_float=0
-    fi ;;
-@@ -27612,9 +27983,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef float ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (float)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (float)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -27632,20 +28002,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (float))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (float))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (float))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -27658,43 +28030,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_float=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_float" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (float)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (float)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (float)
-+$as_echo "$as_me: error: cannot compute sizeof (float)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_float=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5
--echo "${ECHO_T}$ac_cv_sizeof_float" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5
-+$as_echo "$ac_cv_sizeof_float" >&6; }
- 
- 
- 
-@@ -27703,76 +28080,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for double" >&5
--echo $ECHO_N "checking for double... $ECHO_C" >&6; }
--if test "${ac_cv_type_double+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef double ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_double=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_double=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5
--echo "${ECHO_T}$ac_cv_type_double" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of double" >&5
--echo $ECHO_N "checking size of double... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of double" >&5
-+$as_echo_n "checking size of double... " >&6; }
- if test "${ac_cv_sizeof_double+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -27783,7 +28098,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef double ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -27795,7 +28109,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (double))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -27808,13 +28122,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -27828,7 +28143,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef double ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -27840,7 +28154,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (double))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -27853,20 +28167,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -27880,7 +28195,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -27890,7 +28205,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef double ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -27902,7 +28216,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (double))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -27915,13 +28229,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -27935,7 +28250,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef double ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -27947,7 +28261,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (double))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -27960,20 +28274,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -27987,7 +28302,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -28007,7 +28322,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef double ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -28019,7 +28333,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (double))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -28032,20 +28346,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -28056,11 +28371,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_double=$ac_lo;;
- '') if test "$ac_cv_type_double" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (double)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (double)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (double)
-+$as_echo "$as_me: error: cannot compute sizeof (double)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_double=0
-    fi ;;
-@@ -28073,9 +28390,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef double ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (double)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (double)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -28093,20 +28409,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (double))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (double))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (double))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -28119,43 +28437,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_double=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_double" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (double)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (double)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (double)
-+$as_echo "$as_me: error: cannot compute sizeof (double)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_double=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
--echo "${ECHO_T}$ac_cv_sizeof_double" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
-+$as_echo "$ac_cv_sizeof_double" >&6; }
- 
- 
- 
-@@ -28164,76 +28487,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for long double" >&5
--echo $ECHO_N "checking for long double... $ECHO_C" >&6; }
--if test "${ac_cv_type_long_double+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef long double ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_long_double=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_long_double=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_long_double" >&5
--echo "${ECHO_T}$ac_cv_type_long_double" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of long double" >&5
--echo $ECHO_N "checking size of long double... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of long double" >&5
-+$as_echo_n "checking size of long double... " >&6; }
- if test "${ac_cv_sizeof_long_double+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -28244,7 +28505,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef long double ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -28256,7 +28516,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long double))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -28269,13 +28529,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -28289,7 +28550,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef long double ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -28301,7 +28561,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long double))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -28314,20 +28574,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -28341,7 +28602,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -28351,7 +28612,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef long double ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -28363,7 +28623,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long double))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -28376,13 +28636,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -28396,7 +28657,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef long double ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -28408,7 +28668,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long double))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -28421,20 +28681,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -28448,7 +28709,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -28468,7 +28729,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef long double ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -28480,7 +28740,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long double))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -28493,20 +28753,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -28517,11 +28778,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_long_double=$ac_lo;;
- '') if test "$ac_cv_type_long_double" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long double)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long double)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long double)
-+$as_echo "$as_me: error: cannot compute sizeof (long double)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_long_double=0
-    fi ;;
-@@ -28534,9 +28797,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef long double ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (long double)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (long double)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -28554,20 +28816,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (long double))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (long double))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (long double))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -28580,43 +28844,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_long_double=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_long_double" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long double)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long double)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long double)
-+$as_echo "$as_me: error: cannot compute sizeof (long double)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_long_double=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_double" >&5
--echo "${ECHO_T}$ac_cv_sizeof_long_double" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_double" >&5
-+$as_echo "$ac_cv_sizeof_long_double" >&6; }
- 
- 
- 
-@@ -28653,11 +28922,12 @@
-     case $ac_val in #(
-     *${as_nl}*)
-       case $ac_var in #(
--      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
--echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-       esac
-       case $ac_var in #(
-       _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-       *) $as_unset $ac_var ;;
-       esac ;;
-     esac
-@@ -28690,12 +28960,12 @@
- if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-   if test -w "$cache_file"; then
-     test "x$cache_file" != "x/dev/null" &&
--      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
--echo "$as_me: updating cache $cache_file" >&6;}
-+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
--echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -28710,76 +28980,14 @@
- EOF
- fi
- 
--{ echo "$as_me:$LINENO: checking for int8_t" >&5
--echo $ECHO_N "checking for int8_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_int8_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef int8_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_int8_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_int8_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_int8_t" >&5
--echo "${ECHO_T}$ac_cv_type_int8_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of int8_t" >&5
--echo $ECHO_N "checking size of int8_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of int8_t" >&5
-+$as_echo_n "checking size of int8_t... " >&6; }
- if test "${ac_cv_sizeof_int8_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -28790,7 +28998,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -28802,7 +29009,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int8_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -28815,13 +29022,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -28835,7 +29043,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -28847,7 +29054,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int8_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -28860,20 +29067,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -28887,7 +29095,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -28897,7 +29105,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -28909,7 +29116,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int8_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -28922,13 +29129,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -28942,7 +29150,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -28954,7 +29161,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int8_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -28967,20 +29174,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -28994,7 +29202,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -29014,7 +29222,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -29026,7 +29233,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int8_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -29039,20 +29246,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -29063,11 +29271,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_int8_t=$ac_lo;;
- '') if test "$ac_cv_type_int8_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int8_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int8_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int8_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int8_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int8_t=0
-    fi ;;
-@@ -29080,9 +29290,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int8_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (int8_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (int8_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -29100,20 +29309,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (int8_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int8_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int8_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -29126,43 +29337,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_int8_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_int8_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int8_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int8_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int8_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int8_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int8_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int8_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int8_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int8_t" >&5
-+$as_echo "$ac_cv_sizeof_int8_t" >&6; }
- 
- 
- 
-@@ -29171,76 +29387,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for uint8_t" >&5
--echo $ECHO_N "checking for uint8_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_uint8_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef uint8_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_uint8_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_uint8_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5
--echo "${ECHO_T}$ac_cv_type_uint8_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of uint8_t" >&5
--echo $ECHO_N "checking size of uint8_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of uint8_t" >&5
-+$as_echo_n "checking size of uint8_t... " >&6; }
- if test "${ac_cv_sizeof_uint8_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -29251,7 +29405,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -29263,7 +29416,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint8_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -29276,13 +29429,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -29296,7 +29450,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -29308,7 +29461,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint8_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -29321,20 +29474,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -29348,7 +29502,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -29358,7 +29512,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -29370,7 +29523,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint8_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -29383,13 +29536,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -29403,7 +29557,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -29415,7 +29568,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint8_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -29428,20 +29581,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -29455,7 +29609,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -29475,7 +29629,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -29487,7 +29640,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint8_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -29500,20 +29653,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -29524,11 +29678,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_uint8_t=$ac_lo;;
- '') if test "$ac_cv_type_uint8_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint8_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint8_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint8_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint8_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint8_t=0
-    fi ;;
-@@ -29541,9 +29697,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint8_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (uint8_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (uint8_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -29561,20 +29716,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (uint8_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint8_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint8_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -29587,43 +29744,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_uint8_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_uint8_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint8_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint8_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint8_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint8_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint8_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint8_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_uint8_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint8_t" >&5
-+$as_echo "$ac_cv_sizeof_uint8_t" >&6; }
- 
- 
- 
-@@ -29632,19 +29794,24 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for int_least8_t" >&5
--echo $ECHO_N "checking for int_least8_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_int_least8_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ $as_echo "$as_me:$LINENO: checking size of int_least8_t" >&5
-+$as_echo_n "checking size of int_least8_t... " >&6; }
-+if test "${ac_cv_sizeof_int_least8_t+set}" = set; then
-+  $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--typedef int_least8_t ac__type_new_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -29656,10 +29823,9 @@
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least8_t))) >= 0)];
-+test_array [0] = 0
-+
-   ;
-   return 0;
- }
-@@ -29670,49 +29836,27 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
--  ac_cv_type_int_least8_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_int_least8_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_int_least8_t" >&5
--echo "${ECHO_T}$ac_cv_type_int_least8_t" >&6; }
--
--# 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.
--{ echo "$as_me:$LINENO: checking size of int_least8_t" >&5
--echo $ECHO_N "checking size of int_least8_t... $ECHO_C" >&6; }
--if test "${ac_cv_sizeof_int_least8_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test "$cross_compiling" = yes; then
--  # Depending upon the size, compute the lo and hi bounds.
--cat >conftest.$ac_ext <<_ACEOF
-+  ac_lo=0 ac_mid=0
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -29724,7 +29868,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least8_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -29737,65 +29881,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_lo=0 ac_mid=0
--  while :; do
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--   typedef int_least8_t ac__type_sizeof_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
--test_array [0] = 0
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -29809,7 +29909,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -29819,7 +29919,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -29831,7 +29930,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least8_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -29844,13 +29943,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -29864,7 +29964,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -29876,7 +29975,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least8_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -29889,20 +29988,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -29916,7 +30016,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -29936,7 +30036,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -29948,7 +30047,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least8_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -29961,20 +30060,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -29985,11 +30085,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_int_least8_t=$ac_lo;;
- '') if test "$ac_cv_type_int_least8_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int_least8_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int_least8_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int_least8_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int_least8_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int_least8_t=0
-    fi ;;
-@@ -30002,9 +30104,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least8_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (int_least8_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (int_least8_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -30022,20 +30123,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (int_least8_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int_least8_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int_least8_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -30048,43 +30151,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_int_least8_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_int_least8_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int_least8_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int_least8_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int_least8_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int_least8_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int_least8_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int_least8_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int_least8_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int_least8_t" >&5
-+$as_echo "$ac_cv_sizeof_int_least8_t" >&6; }
- 
- 
- 
-@@ -30093,76 +30201,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for uint_least8_t" >&5
--echo $ECHO_N "checking for uint_least8_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_uint_least8_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef uint_least8_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_uint_least8_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_uint_least8_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_uint_least8_t" >&5
--echo "${ECHO_T}$ac_cv_type_uint_least8_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of uint_least8_t" >&5
--echo $ECHO_N "checking size of uint_least8_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of uint_least8_t" >&5
-+$as_echo_n "checking size of uint_least8_t... " >&6; }
- if test "${ac_cv_sizeof_uint_least8_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -30173,7 +30219,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -30185,7 +30230,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least8_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -30198,13 +30243,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -30218,7 +30264,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -30230,7 +30275,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least8_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -30243,20 +30288,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -30270,7 +30316,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -30280,7 +30326,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -30292,7 +30337,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least8_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -30305,13 +30350,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -30325,7 +30371,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -30337,7 +30382,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least8_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -30350,20 +30395,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -30377,7 +30423,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -30397,7 +30443,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -30409,7 +30454,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least8_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -30422,20 +30467,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -30446,11 +30492,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_uint_least8_t=$ac_lo;;
- '') if test "$ac_cv_type_uint_least8_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint_least8_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint_least8_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint_least8_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint_least8_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint_least8_t=0
-    fi ;;
-@@ -30463,9 +30511,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least8_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (uint_least8_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (uint_least8_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -30483,20 +30530,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (uint_least8_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint_least8_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint_least8_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -30509,43 +30558,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_uint_least8_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_uint_least8_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint_least8_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint_least8_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint_least8_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint_least8_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint_least8_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint_least8_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_uint_least8_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint_least8_t" >&5
-+$as_echo "$ac_cv_sizeof_uint_least8_t" >&6; }
- 
- 
- 
-@@ -30554,76 +30608,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for int_fast8_t" >&5
--echo $ECHO_N "checking for int_fast8_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_int_fast8_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef int_fast8_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_int_fast8_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_int_fast8_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_int_fast8_t" >&5
--echo "${ECHO_T}$ac_cv_type_int_fast8_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of int_fast8_t" >&5
--echo $ECHO_N "checking size of int_fast8_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of int_fast8_t" >&5
-+$as_echo_n "checking size of int_fast8_t... " >&6; }
- if test "${ac_cv_sizeof_int_fast8_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -30634,7 +30626,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -30646,7 +30637,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast8_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -30659,13 +30650,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -30679,7 +30671,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -30691,7 +30682,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast8_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -30704,20 +30695,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -30731,7 +30723,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -30741,7 +30733,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -30753,7 +30744,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast8_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -30766,13 +30757,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -30786,7 +30778,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -30798,7 +30789,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast8_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -30811,20 +30802,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -30838,7 +30830,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -30858,7 +30850,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -30870,7 +30861,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast8_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -30883,20 +30874,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -30907,11 +30899,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_int_fast8_t=$ac_lo;;
- '') if test "$ac_cv_type_int_fast8_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int_fast8_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int_fast8_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int_fast8_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int_fast8_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int_fast8_t=0
-    fi ;;
-@@ -30924,9 +30918,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast8_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (int_fast8_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (int_fast8_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -30944,20 +30937,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (int_fast8_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int_fast8_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int_fast8_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -30970,43 +30965,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_int_fast8_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_int_fast8_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int_fast8_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int_fast8_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int_fast8_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int_fast8_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int_fast8_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int_fast8_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int_fast8_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int_fast8_t" >&5
-+$as_echo "$ac_cv_sizeof_int_fast8_t" >&6; }
- 
- 
- 
-@@ -31015,76 +31015,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for uint_fast8_t" >&5
--echo $ECHO_N "checking for uint_fast8_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_uint_fast8_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef uint_fast8_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_uint_fast8_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_uint_fast8_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_uint_fast8_t" >&5
--echo "${ECHO_T}$ac_cv_type_uint_fast8_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of uint_fast8_t" >&5
--echo $ECHO_N "checking size of uint_fast8_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of uint_fast8_t" >&5
-+$as_echo_n "checking size of uint_fast8_t... " >&6; }
- if test "${ac_cv_sizeof_uint_fast8_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -31095,7 +31033,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -31107,7 +31044,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast8_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -31120,13 +31057,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -31140,7 +31078,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -31152,7 +31089,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast8_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -31165,20 +31102,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -31192,7 +31130,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -31202,7 +31140,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -31214,7 +31151,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast8_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -31227,13 +31164,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -31247,7 +31185,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -31259,7 +31196,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast8_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -31272,20 +31209,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -31299,7 +31237,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -31319,7 +31257,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast8_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -31331,7 +31268,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast8_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -31344,20 +31281,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -31368,11 +31306,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_uint_fast8_t=$ac_lo;;
- '') if test "$ac_cv_type_uint_fast8_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint_fast8_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint_fast8_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint_fast8_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint_fast8_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint_fast8_t=0
-    fi ;;
-@@ -31385,9 +31325,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast8_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (uint_fast8_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (uint_fast8_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -31405,20 +31344,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (uint_fast8_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint_fast8_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint_fast8_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -31431,43 +31372,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_uint_fast8_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_uint_fast8_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint_fast8_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint_fast8_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint_fast8_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint_fast8_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint_fast8_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint_fast8_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_uint_fast8_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint_fast8_t" >&5
-+$as_echo "$ac_cv_sizeof_uint_fast8_t" >&6; }
- 
- 
- 
-@@ -31477,76 +31423,14 @@
- 
- 
- 
--{ echo "$as_me:$LINENO: checking for int16_t" >&5
--echo $ECHO_N "checking for int16_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_int16_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef int16_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_int16_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_int16_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5
--echo "${ECHO_T}$ac_cv_type_int16_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of int16_t" >&5
--echo $ECHO_N "checking size of int16_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of int16_t" >&5
-+$as_echo_n "checking size of int16_t... " >&6; }
- if test "${ac_cv_sizeof_int16_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -31557,7 +31441,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -31569,7 +31452,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int16_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -31582,13 +31465,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -31602,7 +31486,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -31614,7 +31497,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int16_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -31627,20 +31510,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -31654,7 +31538,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -31664,7 +31548,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -31676,7 +31559,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int16_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -31689,13 +31572,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -31709,7 +31593,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -31721,7 +31604,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int16_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -31734,20 +31617,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -31761,7 +31645,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -31781,7 +31665,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -31793,7 +31676,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int16_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -31806,20 +31689,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -31830,11 +31714,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_int16_t=$ac_lo;;
- '') if test "$ac_cv_type_int16_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int16_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int16_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int16_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int16_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int16_t=0
-    fi ;;
-@@ -31847,9 +31733,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int16_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (int16_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (int16_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -31867,20 +31752,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (int16_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int16_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int16_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -31893,43 +31780,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_int16_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_int16_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int16_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int16_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int16_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int16_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int16_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int16_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int16_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int16_t" >&5
-+$as_echo "$ac_cv_sizeof_int16_t" >&6; }
- 
- 
- 
-@@ -31938,76 +31830,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for uint16_t" >&5
--echo $ECHO_N "checking for uint16_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_uint16_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef uint16_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_uint16_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_uint16_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
--echo "${ECHO_T}$ac_cv_type_uint16_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of uint16_t" >&5
--echo $ECHO_N "checking size of uint16_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of uint16_t" >&5
-+$as_echo_n "checking size of uint16_t... " >&6; }
- if test "${ac_cv_sizeof_uint16_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -32018,7 +31848,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -32030,7 +31859,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint16_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -32043,13 +31872,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -32063,7 +31893,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -32075,7 +31904,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint16_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -32088,20 +31917,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -32115,7 +31945,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -32125,7 +31955,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -32137,7 +31966,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint16_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -32150,13 +31979,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -32170,7 +32000,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -32182,7 +32011,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint16_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -32195,20 +32024,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -32222,7 +32052,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -32242,7 +32072,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -32254,7 +32083,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint16_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -32267,20 +32096,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -32291,11 +32121,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_uint16_t=$ac_lo;;
- '') if test "$ac_cv_type_uint16_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint16_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint16_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint16_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint16_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint16_t=0
-    fi ;;
-@@ -32308,9 +32140,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint16_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (uint16_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (uint16_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -32328,20 +32159,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (uint16_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint16_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint16_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -32354,43 +32187,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_uint16_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_uint16_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint16_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint16_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint16_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint16_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint16_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint16_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_uint16_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint16_t" >&5
-+$as_echo "$ac_cv_sizeof_uint16_t" >&6; }
- 
- 
- 
-@@ -32399,76 +32237,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for int_least16_t" >&5
--echo $ECHO_N "checking for int_least16_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_int_least16_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef int_least16_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_int_least16_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_int_least16_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_int_least16_t" >&5
--echo "${ECHO_T}$ac_cv_type_int_least16_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of int_least16_t" >&5
--echo $ECHO_N "checking size of int_least16_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of int_least16_t" >&5
-+$as_echo_n "checking size of int_least16_t... " >&6; }
- if test "${ac_cv_sizeof_int_least16_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -32479,7 +32255,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -32491,7 +32266,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least16_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -32504,13 +32279,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -32524,7 +32300,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -32536,7 +32311,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least16_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -32549,20 +32324,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -32576,7 +32352,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -32586,7 +32362,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -32598,7 +32373,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least16_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -32611,13 +32386,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -32631,7 +32407,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -32643,7 +32418,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least16_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -32656,20 +32431,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -32683,7 +32459,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -32703,7 +32479,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -32715,7 +32490,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least16_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -32728,20 +32503,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -32752,11 +32528,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_int_least16_t=$ac_lo;;
- '') if test "$ac_cv_type_int_least16_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int_least16_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int_least16_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int_least16_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int_least16_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int_least16_t=0
-    fi ;;
-@@ -32769,9 +32547,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least16_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (int_least16_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (int_least16_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -32789,20 +32566,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (int_least16_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int_least16_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int_least16_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -32815,43 +32594,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_int_least16_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_int_least16_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int_least16_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int_least16_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int_least16_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int_least16_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int_least16_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int_least16_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int_least16_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int_least16_t" >&5
-+$as_echo "$ac_cv_sizeof_int_least16_t" >&6; }
- 
- 
- 
-@@ -32860,76 +32644,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for uint_least16_t" >&5
--echo $ECHO_N "checking for uint_least16_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_uint_least16_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef uint_least16_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_uint_least16_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_uint_least16_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_uint_least16_t" >&5
--echo "${ECHO_T}$ac_cv_type_uint_least16_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of uint_least16_t" >&5
--echo $ECHO_N "checking size of uint_least16_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of uint_least16_t" >&5
-+$as_echo_n "checking size of uint_least16_t... " >&6; }
- if test "${ac_cv_sizeof_uint_least16_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -32940,7 +32662,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -32952,7 +32673,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least16_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -32965,13 +32686,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -32985,7 +32707,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -32997,7 +32718,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least16_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -33010,20 +32731,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -33037,7 +32759,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -33047,7 +32769,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -33059,7 +32780,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least16_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -33072,13 +32793,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -33092,7 +32814,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -33104,7 +32825,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least16_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -33117,20 +32838,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -33144,7 +32866,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -33164,7 +32886,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -33176,7 +32897,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least16_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -33189,20 +32910,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -33213,11 +32935,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_uint_least16_t=$ac_lo;;
- '') if test "$ac_cv_type_uint_least16_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint_least16_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint_least16_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint_least16_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint_least16_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint_least16_t=0
-    fi ;;
-@@ -33230,9 +32954,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least16_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (uint_least16_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (uint_least16_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -33250,20 +32973,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (uint_least16_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint_least16_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint_least16_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -33276,43 +33001,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_uint_least16_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_uint_least16_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint_least16_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint_least16_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint_least16_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint_least16_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint_least16_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint_least16_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_uint_least16_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint_least16_t" >&5
-+$as_echo "$ac_cv_sizeof_uint_least16_t" >&6; }
- 
- 
- 
-@@ -33321,76 +33051,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for int_fast16_t" >&5
--echo $ECHO_N "checking for int_fast16_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_int_fast16_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef int_fast16_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_int_fast16_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_int_fast16_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_int_fast16_t" >&5
--echo "${ECHO_T}$ac_cv_type_int_fast16_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of int_fast16_t" >&5
--echo $ECHO_N "checking size of int_fast16_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of int_fast16_t" >&5
-+$as_echo_n "checking size of int_fast16_t... " >&6; }
- if test "${ac_cv_sizeof_int_fast16_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -33401,7 +33069,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -33413,7 +33080,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast16_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -33426,13 +33093,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -33446,7 +33114,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -33458,7 +33125,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast16_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -33471,20 +33138,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -33498,7 +33166,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -33508,7 +33176,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -33520,7 +33187,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast16_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -33533,13 +33200,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -33553,7 +33221,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -33565,7 +33232,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast16_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -33578,20 +33245,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -33605,7 +33273,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -33625,7 +33293,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -33637,7 +33304,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast16_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -33650,20 +33317,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -33674,11 +33342,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_int_fast16_t=$ac_lo;;
- '') if test "$ac_cv_type_int_fast16_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int_fast16_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int_fast16_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int_fast16_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int_fast16_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int_fast16_t=0
-    fi ;;
-@@ -33691,9 +33361,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast16_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (int_fast16_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (int_fast16_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -33711,20 +33380,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (int_fast16_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int_fast16_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int_fast16_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -33737,43 +33408,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_int_fast16_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_int_fast16_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int_fast16_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int_fast16_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int_fast16_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int_fast16_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int_fast16_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int_fast16_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int_fast16_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int_fast16_t" >&5
-+$as_echo "$ac_cv_sizeof_int_fast16_t" >&6; }
- 
- 
- 
-@@ -33782,76 +33458,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for uint_fast16_t" >&5
--echo $ECHO_N "checking for uint_fast16_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_uint_fast16_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef uint_fast16_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_uint_fast16_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_uint_fast16_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_uint_fast16_t" >&5
--echo "${ECHO_T}$ac_cv_type_uint_fast16_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of uint_fast16_t" >&5
--echo $ECHO_N "checking size of uint_fast16_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of uint_fast16_t" >&5
-+$as_echo_n "checking size of uint_fast16_t... " >&6; }
- if test "${ac_cv_sizeof_uint_fast16_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -33862,7 +33476,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -33874,7 +33487,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast16_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -33887,13 +33500,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -33907,7 +33521,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -33919,7 +33532,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast16_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -33932,20 +33545,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -33959,7 +33573,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -33969,7 +33583,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -33981,7 +33594,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast16_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -33994,13 +33607,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -34014,7 +33628,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -34026,7 +33639,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast16_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -34039,20 +33652,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -34066,7 +33680,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -34086,7 +33700,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast16_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -34098,7 +33711,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast16_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -34111,20 +33724,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -34135,11 +33749,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_uint_fast16_t=$ac_lo;;
- '') if test "$ac_cv_type_uint_fast16_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint_fast16_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint_fast16_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint_fast16_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint_fast16_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint_fast16_t=0
-    fi ;;
-@@ -34152,9 +33768,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast16_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (uint_fast16_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (uint_fast16_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -34172,20 +33787,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (uint_fast16_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint_fast16_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint_fast16_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -34198,43 +33815,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_uint_fast16_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_uint_fast16_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint_fast16_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint_fast16_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint_fast16_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint_fast16_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint_fast16_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint_fast16_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_uint_fast16_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint_fast16_t" >&5
-+$as_echo "$ac_cv_sizeof_uint_fast16_t" >&6; }
- 
- 
- 
-@@ -34244,76 +33866,14 @@
- 
- 
- 
--{ echo "$as_me:$LINENO: checking for int32_t" >&5
--echo $ECHO_N "checking for int32_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_int32_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef int32_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_int32_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_int32_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
--echo "${ECHO_T}$ac_cv_type_int32_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of int32_t" >&5
--echo $ECHO_N "checking size of int32_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of int32_t" >&5
-+$as_echo_n "checking size of int32_t... " >&6; }
- if test "${ac_cv_sizeof_int32_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -34324,7 +33884,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -34336,7 +33895,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int32_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -34349,13 +33908,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -34369,7 +33929,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -34381,7 +33940,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int32_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -34394,20 +33953,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -34421,7 +33981,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -34431,7 +33991,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -34443,7 +34002,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int32_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -34456,13 +34015,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -34476,7 +34036,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -34488,7 +34047,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int32_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -34501,20 +34060,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -34528,7 +34088,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -34548,7 +34108,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -34560,7 +34119,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int32_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -34573,20 +34132,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -34597,11 +34157,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_int32_t=$ac_lo;;
- '') if test "$ac_cv_type_int32_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int32_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int32_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int32_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int32_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int32_t=0
-    fi ;;
-@@ -34614,9 +34176,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int32_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (int32_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (int32_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -34634,20 +34195,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (int32_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int32_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int32_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -34660,43 +34223,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_int32_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_int32_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int32_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int32_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int32_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int32_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int32_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int32_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int32_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int32_t" >&5
-+$as_echo "$ac_cv_sizeof_int32_t" >&6; }
- 
- 
- 
-@@ -34705,76 +34273,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for uint32_t" >&5
--echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_uint32_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef uint32_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_uint32_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_uint32_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
--echo "${ECHO_T}$ac_cv_type_uint32_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of uint32_t" >&5
--echo $ECHO_N "checking size of uint32_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of uint32_t" >&5
-+$as_echo_n "checking size of uint32_t... " >&6; }
- if test "${ac_cv_sizeof_uint32_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -34785,7 +34291,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -34797,7 +34302,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint32_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -34810,13 +34315,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -34830,7 +34336,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -34842,7 +34347,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint32_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -34855,20 +34360,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -34882,7 +34388,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -34892,7 +34398,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -34904,7 +34409,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint32_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -34917,13 +34422,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -34937,7 +34443,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -34949,7 +34454,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint32_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -34962,20 +34467,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -34989,7 +34495,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -35009,7 +34515,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -35021,7 +34526,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint32_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -35034,20 +34539,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -35058,11 +34564,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_uint32_t=$ac_lo;;
- '') if test "$ac_cv_type_uint32_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint32_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint32_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint32_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint32_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint32_t=0
-    fi ;;
-@@ -35075,9 +34583,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint32_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (uint32_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (uint32_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -35095,20 +34602,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (uint32_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint32_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint32_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -35121,43 +34630,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_uint32_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_uint32_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint32_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint32_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint32_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint32_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint32_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint32_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_uint32_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint32_t" >&5
-+$as_echo "$ac_cv_sizeof_uint32_t" >&6; }
- 
- 
- 
-@@ -35166,76 +34680,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for int_least32_t" >&5
--echo $ECHO_N "checking for int_least32_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_int_least32_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef int_least32_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_int_least32_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_int_least32_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_int_least32_t" >&5
--echo "${ECHO_T}$ac_cv_type_int_least32_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of int_least32_t" >&5
--echo $ECHO_N "checking size of int_least32_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of int_least32_t" >&5
-+$as_echo_n "checking size of int_least32_t... " >&6; }
- if test "${ac_cv_sizeof_int_least32_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -35246,7 +34698,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -35258,7 +34709,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least32_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -35271,13 +34722,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -35291,7 +34743,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -35303,7 +34754,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least32_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -35316,20 +34767,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -35343,7 +34795,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -35353,7 +34805,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -35365,7 +34816,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least32_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -35378,13 +34829,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -35398,7 +34850,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -35410,7 +34861,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least32_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -35423,20 +34874,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -35450,7 +34902,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -35470,7 +34922,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -35482,7 +34933,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least32_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -35495,20 +34946,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -35519,11 +34971,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_int_least32_t=$ac_lo;;
- '') if test "$ac_cv_type_int_least32_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int_least32_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int_least32_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int_least32_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int_least32_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int_least32_t=0
-    fi ;;
-@@ -35536,9 +34990,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least32_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (int_least32_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (int_least32_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -35556,20 +35009,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (int_least32_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int_least32_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int_least32_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -35582,43 +35037,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_int_least32_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_int_least32_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int_least32_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int_least32_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int_least32_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int_least32_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int_least32_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int_least32_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int_least32_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int_least32_t" >&5
-+$as_echo "$ac_cv_sizeof_int_least32_t" >&6; }
- 
- 
- 
-@@ -35627,76 +35087,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for uint_least32_t" >&5
--echo $ECHO_N "checking for uint_least32_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_uint_least32_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef uint_least32_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_uint_least32_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_uint_least32_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_uint_least32_t" >&5
--echo "${ECHO_T}$ac_cv_type_uint_least32_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of uint_least32_t" >&5
--echo $ECHO_N "checking size of uint_least32_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of uint_least32_t" >&5
-+$as_echo_n "checking size of uint_least32_t... " >&6; }
- if test "${ac_cv_sizeof_uint_least32_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -35707,7 +35105,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -35719,7 +35116,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least32_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -35732,13 +35129,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -35752,7 +35150,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -35764,7 +35161,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least32_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -35777,20 +35174,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -35804,7 +35202,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -35814,7 +35212,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -35826,7 +35223,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least32_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -35839,13 +35236,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -35859,7 +35257,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -35871,7 +35268,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least32_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -35884,20 +35281,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -35911,7 +35309,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -35931,7 +35329,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -35943,7 +35340,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least32_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -35956,20 +35353,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -35980,11 +35378,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_uint_least32_t=$ac_lo;;
- '') if test "$ac_cv_type_uint_least32_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint_least32_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint_least32_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint_least32_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint_least32_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint_least32_t=0
-    fi ;;
-@@ -35997,9 +35397,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least32_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (uint_least32_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (uint_least32_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -36017,20 +35416,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (uint_least32_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint_least32_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint_least32_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -36043,43 +35444,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_uint_least32_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_uint_least32_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint_least32_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint_least32_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint_least32_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint_least32_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint_least32_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint_least32_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_uint_least32_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint_least32_t" >&5
-+$as_echo "$ac_cv_sizeof_uint_least32_t" >&6; }
- 
- 
- 
-@@ -36088,76 +35494,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for int_fast32_t" >&5
--echo $ECHO_N "checking for int_fast32_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_int_fast32_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef int_fast32_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_int_fast32_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_int_fast32_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_int_fast32_t" >&5
--echo "${ECHO_T}$ac_cv_type_int_fast32_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of int_fast32_t" >&5
--echo $ECHO_N "checking size of int_fast32_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of int_fast32_t" >&5
-+$as_echo_n "checking size of int_fast32_t... " >&6; }
- if test "${ac_cv_sizeof_int_fast32_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -36168,7 +35512,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -36180,7 +35523,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast32_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -36193,13 +35536,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -36213,7 +35557,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -36225,7 +35568,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast32_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -36238,20 +35581,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -36265,7 +35609,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -36275,7 +35619,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -36287,7 +35630,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast32_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -36300,13 +35643,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -36320,7 +35664,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -36332,7 +35675,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast32_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -36345,20 +35688,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -36372,7 +35716,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -36392,7 +35736,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -36404,7 +35747,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast32_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -36417,20 +35760,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -36441,11 +35785,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_int_fast32_t=$ac_lo;;
- '') if test "$ac_cv_type_int_fast32_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int_fast32_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int_fast32_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int_fast32_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int_fast32_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int_fast32_t=0
-    fi ;;
-@@ -36458,9 +35804,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast32_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (int_fast32_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (int_fast32_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -36478,20 +35823,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (int_fast32_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int_fast32_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int_fast32_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -36504,43 +35851,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_int_fast32_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_int_fast32_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int_fast32_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int_fast32_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int_fast32_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int_fast32_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int_fast32_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int_fast32_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int_fast32_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int_fast32_t" >&5
-+$as_echo "$ac_cv_sizeof_int_fast32_t" >&6; }
- 
- 
- 
-@@ -36549,76 +35901,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for uint_fast32_t" >&5
--echo $ECHO_N "checking for uint_fast32_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_uint_fast32_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef uint_fast32_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_uint_fast32_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_uint_fast32_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_uint_fast32_t" >&5
--echo "${ECHO_T}$ac_cv_type_uint_fast32_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of uint_fast32_t" >&5
--echo $ECHO_N "checking size of uint_fast32_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of uint_fast32_t" >&5
-+$as_echo_n "checking size of uint_fast32_t... " >&6; }
- if test "${ac_cv_sizeof_uint_fast32_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -36629,7 +35919,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -36641,7 +35930,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast32_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -36654,13 +35943,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -36674,7 +35964,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -36686,7 +35975,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast32_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -36699,20 +35988,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -36726,7 +36016,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -36736,7 +36026,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -36748,7 +36037,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast32_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -36761,13 +36050,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -36781,7 +36071,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -36793,7 +36082,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast32_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -36806,20 +36095,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -36833,7 +36123,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -36853,7 +36143,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast32_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -36865,7 +36154,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast32_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -36878,20 +36167,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -36902,11 +36192,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_uint_fast32_t=$ac_lo;;
- '') if test "$ac_cv_type_uint_fast32_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint_fast32_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint_fast32_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint_fast32_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint_fast32_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint_fast32_t=0
-    fi ;;
-@@ -36919,9 +36211,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast32_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (uint_fast32_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (uint_fast32_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -36939,20 +36230,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (uint_fast32_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint_fast32_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint_fast32_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -36965,43 +36258,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_uint_fast32_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_uint_fast32_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint_fast32_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint_fast32_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint_fast32_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint_fast32_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint_fast32_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint_fast32_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_uint_fast32_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint_fast32_t" >&5
-+$as_echo "$ac_cv_sizeof_uint_fast32_t" >&6; }
- 
- 
- 
-@@ -37011,76 +36309,14 @@
- 
- 
- 
--{ echo "$as_me:$LINENO: checking for int64_t" >&5
--echo $ECHO_N "checking for int64_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_int64_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef int64_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_int64_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_int64_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5
--echo "${ECHO_T}$ac_cv_type_int64_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of int64_t" >&5
--echo $ECHO_N "checking size of int64_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of int64_t" >&5
-+$as_echo_n "checking size of int64_t... " >&6; }
- if test "${ac_cv_sizeof_int64_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -37091,7 +36327,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -37103,7 +36338,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int64_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -37116,13 +36351,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -37136,7 +36372,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -37148,7 +36383,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int64_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -37161,20 +36396,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -37188,7 +36424,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -37198,7 +36434,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -37210,7 +36445,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int64_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -37223,13 +36458,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -37243,7 +36479,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -37255,7 +36490,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int64_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -37268,20 +36503,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -37295,7 +36531,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -37315,7 +36551,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -37327,7 +36562,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int64_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -37340,20 +36575,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -37364,11 +36600,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_int64_t=$ac_lo;;
- '') if test "$ac_cv_type_int64_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int64_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int64_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int64_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int64_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int64_t=0
-    fi ;;
-@@ -37381,9 +36619,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int64_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (int64_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (int64_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -37401,20 +36638,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (int64_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int64_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int64_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -37427,43 +36666,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_int64_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_int64_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int64_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int64_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int64_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int64_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int64_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int64_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int64_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int64_t" >&5
-+$as_echo "$ac_cv_sizeof_int64_t" >&6; }
- 
- 
- 
-@@ -37472,76 +36716,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for uint64_t" >&5
--echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_uint64_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef uint64_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_uint64_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_uint64_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5
--echo "${ECHO_T}$ac_cv_type_uint64_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of uint64_t" >&5
--echo $ECHO_N "checking size of uint64_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of uint64_t" >&5
-+$as_echo_n "checking size of uint64_t... " >&6; }
- if test "${ac_cv_sizeof_uint64_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -37552,7 +36734,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -37564,7 +36745,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint64_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -37577,13 +36758,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -37597,7 +36779,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -37609,7 +36790,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint64_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -37622,20 +36803,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -37649,7 +36831,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -37659,7 +36841,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -37671,7 +36852,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint64_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -37684,13 +36865,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -37704,7 +36886,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -37716,7 +36897,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint64_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -37729,20 +36910,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -37756,7 +36938,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -37776,7 +36958,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -37788,7 +36969,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint64_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -37801,20 +36982,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -37825,11 +37007,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_uint64_t=$ac_lo;;
- '') if test "$ac_cv_type_uint64_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint64_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint64_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint64_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint64_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint64_t=0
-    fi ;;
-@@ -37842,9 +37026,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint64_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (uint64_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (uint64_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -37862,20 +37045,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (uint64_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint64_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint64_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -37888,43 +37073,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_uint64_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_uint64_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint64_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint64_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint64_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint64_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint64_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint64_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_uint64_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint64_t" >&5
-+$as_echo "$ac_cv_sizeof_uint64_t" >&6; }
- 
- 
- 
-@@ -37933,76 +37123,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for int_least64_t" >&5
--echo $ECHO_N "checking for int_least64_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_int_least64_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef int_least64_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_int_least64_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_int_least64_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_int_least64_t" >&5
--echo "${ECHO_T}$ac_cv_type_int_least64_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of int_least64_t" >&5
--echo $ECHO_N "checking size of int_least64_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of int_least64_t" >&5
-+$as_echo_n "checking size of int_least64_t... " >&6; }
- if test "${ac_cv_sizeof_int_least64_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -38013,7 +37141,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -38025,7 +37152,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least64_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -38038,13 +37165,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -38058,7 +37186,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -38070,7 +37197,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least64_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -38083,20 +37210,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -38110,7 +37238,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -38120,7 +37248,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -38132,7 +37259,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least64_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -38145,13 +37272,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -38165,7 +37293,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -38177,7 +37304,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least64_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -38190,20 +37317,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -38217,7 +37345,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -38237,7 +37365,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -38249,7 +37376,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_least64_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -38262,20 +37389,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -38286,11 +37414,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_int_least64_t=$ac_lo;;
- '') if test "$ac_cv_type_int_least64_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int_least64_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int_least64_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int_least64_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int_least64_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int_least64_t=0
-    fi ;;
-@@ -38303,9 +37433,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_least64_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (int_least64_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (int_least64_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -38323,20 +37452,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (int_least64_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int_least64_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int_least64_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -38349,121 +37480,64 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_sizeof_int_least64_t=`cat conftest.val`
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--if test "$ac_cv_type_int_least64_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int_least64_t)
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int_least64_t)
--See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
--   else
--     ac_cv_sizeof_int_least64_t=0
--   fi
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--rm -f conftest.val
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int_least64_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int_least64_t" >&6; }
--
--
--
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_INT_LEAST64_T $ac_cv_sizeof_int_least64_t
--_ACEOF
--
--
--{ echo "$as_me:$LINENO: checking for uint_least64_t" >&5
--echo $ECHO_N "checking for uint_least64_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_uint_least64_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef uint_least64_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_uint_least64_t=yes
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_sizeof_int_least64_t=`cat conftest.val`
- else
--  echo "$as_me: failed program was:" >&5
-+  $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_cv_type_uint_least64_t=no
-+( exit $ac_status )
-+if test "$ac_cv_type_int_least64_t" = yes; then
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int_least64_t)
-+See \`config.log' for more details." >&5
-+$as_echo "$as_me: error: cannot compute sizeof (int_least64_t)
-+See \`config.log' for more details." >&2;}
-+   { (exit 77); exit 77; }; }; }
-+   else
-+     ac_cv_sizeof_int_least64_t=0
-+   fi
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -rf conftest.dSYM
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_uint_least64_t" >&5
--echo "${ECHO_T}$ac_cv_type_uint_least64_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int_least64_t" >&5
-+$as_echo "$ac_cv_sizeof_int_least64_t" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_INT_LEAST64_T $ac_cv_sizeof_int_least64_t
-+_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.
--{ echo "$as_me:$LINENO: checking size of uint_least64_t" >&5
--echo $ECHO_N "checking size of uint_least64_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of uint_least64_t" >&5
-+$as_echo_n "checking size of uint_least64_t... " >&6; }
- if test "${ac_cv_sizeof_uint_least64_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -38474,7 +37548,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -38486,7 +37559,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least64_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -38499,13 +37572,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -38519,7 +37593,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -38531,7 +37604,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least64_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -38544,20 +37617,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -38571,7 +37645,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -38581,7 +37655,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -38593,7 +37666,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least64_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -38606,13 +37679,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -38626,7 +37700,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -38638,7 +37711,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least64_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -38651,20 +37724,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -38678,7 +37752,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -38698,7 +37772,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -38710,7 +37783,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_least64_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -38723,20 +37796,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -38747,11 +37821,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_uint_least64_t=$ac_lo;;
- '') if test "$ac_cv_type_uint_least64_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint_least64_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint_least64_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint_least64_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint_least64_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint_least64_t=0
-    fi ;;
-@@ -38764,9 +37840,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_least64_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (uint_least64_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (uint_least64_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -38784,20 +37859,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (uint_least64_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint_least64_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint_least64_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -38810,43 +37887,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_uint_least64_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_uint_least64_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint_least64_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint_least64_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint_least64_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint_least64_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint_least64_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint_least64_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_uint_least64_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint_least64_t" >&5
-+$as_echo "$ac_cv_sizeof_uint_least64_t" >&6; }
- 
- 
- 
-@@ -38855,76 +37937,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for int_fast64_t" >&5
--echo $ECHO_N "checking for int_fast64_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_int_fast64_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef int_fast64_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_int_fast64_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_int_fast64_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_int_fast64_t" >&5
--echo "${ECHO_T}$ac_cv_type_int_fast64_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of int_fast64_t" >&5
--echo $ECHO_N "checking size of int_fast64_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of int_fast64_t" >&5
-+$as_echo_n "checking size of int_fast64_t... " >&6; }
- if test "${ac_cv_sizeof_int_fast64_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -38935,7 +37955,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -38947,7 +37966,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast64_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -38960,13 +37979,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -38980,7 +38000,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -38992,7 +38011,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast64_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -39005,20 +38024,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -39032,7 +38052,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -39042,7 +38062,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -39054,7 +38073,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast64_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -39067,13 +38086,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -39087,7 +38107,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -39099,7 +38118,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast64_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -39112,20 +38131,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -39139,7 +38159,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -39159,7 +38179,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -39171,7 +38190,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (int_fast64_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -39184,20 +38203,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -39208,11 +38228,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_int_fast64_t=$ac_lo;;
- '') if test "$ac_cv_type_int_fast64_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int_fast64_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int_fast64_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int_fast64_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int_fast64_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int_fast64_t=0
-    fi ;;
-@@ -39225,9 +38247,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef int_fast64_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (int_fast64_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (int_fast64_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -39245,20 +38266,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (int_fast64_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int_fast64_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (int_fast64_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -39271,43 +38294,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_int_fast64_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_int_fast64_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int_fast64_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int_fast64_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int_fast64_t)
-+$as_echo "$as_me: error: cannot compute sizeof (int_fast64_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_int_fast64_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int_fast64_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int_fast64_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int_fast64_t" >&5
-+$as_echo "$ac_cv_sizeof_int_fast64_t" >&6; }
- 
- 
- 
-@@ -39316,76 +38344,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for uint_fast64_t" >&5
--echo $ECHO_N "checking for uint_fast64_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_uint_fast64_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef uint_fast64_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_uint_fast64_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_uint_fast64_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_uint_fast64_t" >&5
--echo "${ECHO_T}$ac_cv_type_uint_fast64_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of uint_fast64_t" >&5
--echo $ECHO_N "checking size of uint_fast64_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of uint_fast64_t" >&5
-+$as_echo_n "checking size of uint_fast64_t... " >&6; }
- if test "${ac_cv_sizeof_uint_fast64_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -39396,7 +38362,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -39408,7 +38373,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast64_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -39421,13 +38386,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -39441,7 +38407,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -39453,7 +38418,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast64_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -39466,20 +38431,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -39493,7 +38459,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -39503,7 +38469,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -39515,7 +38480,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast64_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -39528,13 +38493,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -39548,7 +38514,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -39560,7 +38525,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast64_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -39573,20 +38538,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -39600,7 +38566,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -39620,7 +38586,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -39632,7 +38597,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (uint_fast64_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -39645,20 +38610,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -39669,11 +38635,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_uint_fast64_t=$ac_lo;;
- '') if test "$ac_cv_type_uint_fast64_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint_fast64_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint_fast64_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint_fast64_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint_fast64_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint_fast64_t=0
-    fi ;;
-@@ -39686,9 +38654,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef uint_fast64_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (uint_fast64_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (uint_fast64_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -39706,20 +38673,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (uint_fast64_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint_fast64_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (uint_fast64_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -39732,43 +38701,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_uint_fast64_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_uint_fast64_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (uint_fast64_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (uint_fast64_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (uint_fast64_t)
-+$as_echo "$as_me: error: cannot compute sizeof (uint_fast64_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_uint_fast64_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint_fast64_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_uint_fast64_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_uint_fast64_t" >&5
-+$as_echo "$ac_cv_sizeof_uint_fast64_t" >&6; }
- 
- 
- 
-@@ -39778,76 +38752,14 @@
- 
- 
- 
--{ echo "$as_me:$LINENO: checking for size_t" >&5
--echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_size_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef size_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_size_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_size_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
--echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of size_t" >&5
--echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of size_t" >&5
-+$as_echo_n "checking size of size_t... " >&6; }
- if test "${ac_cv_sizeof_size_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -39858,7 +38770,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef size_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -39870,7 +38781,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -39883,13 +38794,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -39903,7 +38815,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef size_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -39915,7 +38826,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -39928,20 +38839,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -39955,7 +38867,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -39965,7 +38877,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef size_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -39977,7 +38888,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -39990,13 +38901,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -40010,7 +38922,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef size_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -40022,7 +38933,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -40035,20 +38946,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -40062,7 +38974,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -40082,7 +38994,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef size_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -40094,7 +39005,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -40107,20 +39018,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -40131,11 +39043,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_size_t=$ac_lo;;
- '') if test "$ac_cv_type_size_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (size_t)
-+$as_echo "$as_me: error: cannot compute sizeof (size_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_size_t=0
-    fi ;;
-@@ -40148,9 +39062,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef size_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (size_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (size_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -40168,20 +39081,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (size_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (size_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (size_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -40194,43 +39109,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_size_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_size_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (size_t)
-+$as_echo "$as_me: error: cannot compute sizeof (size_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_size_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
-+$as_echo "$ac_cv_sizeof_size_t" >&6; }
- 
- 
- 
-@@ -40239,76 +39159,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for ssize_t" >&5
--echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_ssize_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef ssize_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_ssize_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_ssize_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
--echo "${ECHO_T}$ac_cv_type_ssize_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of ssize_t" >&5
--echo $ECHO_N "checking size of ssize_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of ssize_t" >&5
-+$as_echo_n "checking size of ssize_t... " >&6; }
- if test "${ac_cv_sizeof_ssize_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -40319,7 +39177,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef ssize_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -40331,7 +39188,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ssize_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -40344,13 +39201,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -40364,7 +39222,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef ssize_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -40376,7 +39233,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ssize_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -40389,20 +39246,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -40416,7 +39274,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -40426,7 +39284,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef ssize_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -40438,7 +39295,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ssize_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -40451,13 +39308,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -40471,7 +39329,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef ssize_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -40483,7 +39340,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ssize_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -40496,20 +39353,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -40523,7 +39381,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -40543,7 +39401,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef ssize_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -40555,7 +39412,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ssize_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -40568,20 +39425,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -40592,11 +39450,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_ssize_t=$ac_lo;;
- '') if test "$ac_cv_type_ssize_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (ssize_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (ssize_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (ssize_t)
-+$as_echo "$as_me: error: cannot compute sizeof (ssize_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_ssize_t=0
-    fi ;;
-@@ -40609,9 +39469,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef ssize_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (ssize_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ssize_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -40629,20 +39488,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (ssize_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (ssize_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (ssize_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -40655,43 +39516,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_ssize_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_ssize_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (ssize_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (ssize_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (ssize_t)
-+$as_echo "$as_me: error: cannot compute sizeof (ssize_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_ssize_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_ssize_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_ssize_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_ssize_t" >&5
-+$as_echo "$ac_cv_sizeof_ssize_t" >&6; }
- 
- 
- 
-@@ -40704,76 +39570,14 @@
- cat >>confdefs.h <<\EOF
- #include <sys/types.h> /*for off_t definition*/
- EOF
--{ echo "$as_me:$LINENO: checking for off_t" >&5
--echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_off_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef off_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_off_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_off_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
--echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of off_t" >&5
--echo $ECHO_N "checking size of off_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of off_t" >&5
-+$as_echo_n "checking size of off_t... " >&6; }
- if test "${ac_cv_sizeof_off_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -40784,7 +39588,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef off_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -40796,7 +39599,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -40809,13 +39612,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -40829,7 +39633,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef off_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -40841,7 +39644,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -40854,20 +39657,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -40881,7 +39685,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -40891,7 +39695,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef off_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -40903,7 +39706,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -40916,13 +39719,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -40936,7 +39740,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef off_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -40948,7 +39751,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -40961,20 +39764,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -40988,7 +39792,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -41008,7 +39812,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef off_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -41020,7 +39823,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -41033,20 +39836,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -41057,11 +39861,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_off_t=$ac_lo;;
- '') if test "$ac_cv_type_off_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (off_t)
-+$as_echo "$as_me: error: cannot compute sizeof (off_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_off_t=0
-    fi ;;
-@@ -41074,9 +39880,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef off_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (off_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (off_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -41094,20 +39899,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (off_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (off_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (off_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -41120,43 +39927,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_off_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_off_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (off_t)
-+$as_echo "$as_me: error: cannot compute sizeof (off_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_off_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
-+$as_echo "$ac_cv_sizeof_off_t" >&6; }
- 
- 
- 
-@@ -41165,76 +39977,14 @@
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking for off64_t" >&5
--echo $ECHO_N "checking for off64_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_off64_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--typedef off64_t ac__type_new_;
--#ifdef FC_DUMMY_MAIN
--#ifndef FC_DUMMY_MAIN_EQ_F77
--#  ifdef __cplusplus
--     extern "C"
--#  endif
--   int FC_DUMMY_MAIN() { return 1; }
--#endif
--#endif
--int
--main ()
--{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_type_off64_t=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_off64_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_off64_t" >&5
--echo "${ECHO_T}$ac_cv_type_off64_t" >&6; }
--
- # 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.
--{ echo "$as_me:$LINENO: checking size of off64_t" >&5
--echo $ECHO_N "checking size of off64_t... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of off64_t" >&5
-+$as_echo_n "checking size of off64_t... " >&6; }
- if test "${ac_cv_sizeof_off64_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -41245,7 +39995,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef off64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -41257,7 +40006,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (off64_t))) >= 0)];
- test_array [0] = 0
- 
-   ;
-@@ -41270,13 +40019,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -41290,7 +40040,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef off64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -41302,7 +40051,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (off64_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -41315,20 +40064,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr $ac_mid + 1`
-@@ -41342,7 +40092,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -41352,7 +40102,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef off64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -41364,7 +40113,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (off64_t))) < 0)];
- test_array [0] = 0
- 
-   ;
-@@ -41377,13 +40126,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -41397,7 +40147,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef off64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -41409,7 +40158,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (off64_t))) >= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -41422,20 +40171,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_lo=$ac_mid; break
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -41449,7 +40199,7 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo= ac_hi=
-@@ -41469,7 +40219,6 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef off64_t ac__type_sizeof_;
- #ifdef FC_DUMMY_MAIN
- #ifndef FC_DUMMY_MAIN_EQ_F77
- #  ifdef __cplusplus
-@@ -41481,7 +40230,7 @@
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (off64_t))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -41494,20 +40243,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_hi=$ac_mid
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -41518,11 +40268,13 @@
- case $ac_lo in
- ?*) ac_cv_sizeof_off64_t=$ac_lo;;
- '') if test "$ac_cv_type_off64_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (off64_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off64_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (off64_t)
-+$as_echo "$as_me: error: cannot compute sizeof (off64_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_off64_t=0
-    fi ;;
-@@ -41535,9 +40287,8 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--   typedef off64_t ac__type_sizeof_;
--static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
--static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static long int longval () { return (long int) (sizeof (off64_t)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (off64_t)); }
- #include <stdio.h>
- #include <stdlib.h>
- #ifdef FC_DUMMY_MAIN
-@@ -41555,20 +40306,22 @@
-   FILE *f = fopen ("conftest.val", "w");
-   if (! f)
-     return 1;
--  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+  if (((long int) (sizeof (off64_t))) < 0)
-     {
-       long int i = longval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (off64_t))))
- 	return 1;
--      fprintf (f, "%ld\n", i);
-+      fprintf (f, "%ld", i);
-     }
-   else
-     {
-       unsigned long int i = ulongval ();
--      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+      if (i != ((long int) (sizeof (off64_t))))
- 	return 1;
--      fprintf (f, "%lu\n", i);
-+      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;
- 
-   ;
-@@ -41581,43 +40334,48 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_off64_t=`cat conftest.val`
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- if test "$ac_cv_type_off64_t" = yes; then
--     { { echo "$as_me:$LINENO: error: cannot compute sizeof (off64_t)
-+     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off64_t)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (off64_t)
-+$as_echo "$as_me: error: cannot compute sizeof (off64_t)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+   { (exit 77); exit 77; }; }; }
-    else
-      ac_cv_sizeof_off64_t=0
-    fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_off64_t" >&5
--echo "${ECHO_T}$ac_cv_sizeof_off64_t" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_off64_t" >&5
-+$as_echo "$ac_cv_sizeof_off64_t" >&6; }
- 
- 
- 
-@@ -41654,11 +40412,12 @@
-     case $ac_val in #(
-     *${as_nl}*)
-       case $ac_var in #(
--      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
--echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-       esac
-       case $ac_var in #(
-       _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-       *) $as_unset $ac_var ;;
-       esac ;;
-     esac
-@@ -41691,18 +40450,18 @@
- if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-   if test -w "$cache_file"; then
-     test "x$cache_file" != "x/dev/null" &&
--      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
--echo "$as_me: updating cache $cache_file" >&6;}
-+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
--echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
- 
--{ echo "$as_me:$LINENO: checking if dev_t is scalar" >&5
--echo $ECHO_N "checking if dev_t is scalar... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if dev_t is scalar" >&5
-+$as_echo_n "checking if dev_t is scalar... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -41736,13 +40495,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -41752,14 +40512,14 @@
- #define DEV_T_IS_SCALAR 1
- _ACEOF
- 
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- 
- fi
- 
-@@ -41787,20 +40547,21 @@
- 
- for ac_header in dmalloc.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -41816,32 +40577,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -41855,51 +40617,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -41908,21 +40671,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -41930,10 +40696,10 @@
- done
- 
- 
--{ echo "$as_me:$LINENO: checking for dmalloc_shutdown in -ldmalloc" >&5
--echo $ECHO_N "checking for dmalloc_shutdown in -ldmalloc... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for dmalloc_shutdown in -ldmalloc" >&5
-+$as_echo_n "checking for dmalloc_shutdown in -ldmalloc... " >&6; }
- if test "${ac_cv_lib_dmalloc_dmalloc_shutdown+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
-@@ -41973,33 +40739,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_dmalloc_dmalloc_shutdown=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_dmalloc_dmalloc_shutdown=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_dmalloc_dmalloc_shutdown" >&5
--echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_shutdown" >&6; }
--if test $ac_cv_lib_dmalloc_dmalloc_shutdown = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dmalloc_dmalloc_shutdown" >&5
-+$as_echo "$ac_cv_lib_dmalloc_dmalloc_shutdown" >&6; }
-+if test "x$ac_cv_lib_dmalloc_dmalloc_shutdown" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBDMALLOC 1
- _ACEOF
-@@ -42012,17 +40782,17 @@
- 
- 
-     if test -z "$HAVE_DMALLOC" -a -n "$HDF5_CONFIG_ABORT"; then
--      { { echo "$as_me:$LINENO: error: couldn't find dmalloc library" >&5
--echo "$as_me: error: couldn't find dmalloc library" >&2;}
-+      { { $as_echo "$as_me:$LINENO: error: couldn't find dmalloc library" >&5
-+$as_echo "$as_me: error: couldn't find dmalloc library" >&2;}
-    { (exit 1); exit 1; }; }
-     fi
-     ;;
-   no)
-     HAVE_DMALLOC="no"
--    { echo "$as_me:$LINENO: checking for dmalloc library" >&5
--echo $ECHO_N "checking for dmalloc library... $ECHO_C" >&6; }
--    { echo "$as_me:$LINENO: result: suppressed" >&5
--echo "${ECHO_T}suppressed" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for dmalloc library" >&5
-+$as_echo_n "checking for dmalloc library... " >&6; }
-+    { $as_echo "$as_me:$LINENO: result: suppressed" >&5
-+$as_echo "suppressed" >&6; }
-     ;;
-   *)
-     HAVE_DMALLOC="yes"
-@@ -42056,20 +40826,21 @@
- 
- for ac_header in dmalloc.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -42085,32 +40856,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -42124,51 +40896,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -42177,21 +40950,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- else
-@@ -42206,10 +40982,10 @@
-     fi
- 
- 
--{ echo "$as_me:$LINENO: checking for dmalloc_shutdown in -ldmalloc" >&5
--echo $ECHO_N "checking for dmalloc_shutdown in -ldmalloc... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for dmalloc_shutdown in -ldmalloc" >&5
-+$as_echo_n "checking for dmalloc_shutdown in -ldmalloc... " >&6; }
- if test "${ac_cv_lib_dmalloc_dmalloc_shutdown+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
-@@ -42249,33 +41025,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_dmalloc_dmalloc_shutdown=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_dmalloc_dmalloc_shutdown=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_dmalloc_dmalloc_shutdown" >&5
--echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_shutdown" >&6; }
--if test $ac_cv_lib_dmalloc_dmalloc_shutdown = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dmalloc_dmalloc_shutdown" >&5
-+$as_echo "$ac_cv_lib_dmalloc_dmalloc_shutdown" >&6; }
-+if test "x$ac_cv_lib_dmalloc_dmalloc_shutdown" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBDMALLOC 1
- _ACEOF
-@@ -42288,8 +41068,8 @@
- 
- 
-     if test -z "$HAVE_DMALLOC" -a -n "$HDF5_CONFIG_ABORT"; then
--      { { echo "$as_me:$LINENO: error: couldn't find dmalloc library" >&5
--echo "$as_me: error: couldn't find dmalloc library" >&2;}
-+      { { $as_echo "$as_me:$LINENO: error: couldn't find dmalloc library" >&5
-+$as_echo "$as_me: error: couldn't find dmalloc library" >&2;}
-    { (exit 1); exit 1; }; }
-     fi
-     ;;
-@@ -42311,20 +41091,21 @@
- 
- for ac_header in zlib.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -42340,32 +41121,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -42379,51 +41161,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -42432,21 +41215,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-  HAVE_ZLIB_H="yes"
- fi
-@@ -42454,10 +41240,10 @@
- done
- 
- 
--{ echo "$as_me:$LINENO: checking for compress2 in -lz" >&5
--echo $ECHO_N "checking for compress2 in -lz... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for compress2 in -lz" >&5
-+$as_echo_n "checking for compress2 in -lz... " >&6; }
- if test "${ac_cv_lib_z_compress2+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lz  $LIBS"
-@@ -42497,33 +41283,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_z_compress2=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_z_compress2=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress2" >&5
--echo "${ECHO_T}$ac_cv_lib_z_compress2" >&6; }
--if test $ac_cv_lib_z_compress2 = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress2" >&5
-+$as_echo "$ac_cv_lib_z_compress2" >&6; }
-+if test "x$ac_cv_lib_z_compress2" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBZ 1
- _ACEOF
-@@ -42534,10 +41324,10 @@
-   unset HAVE_ZLIB
- fi
- 
--    { echo "$as_me:$LINENO: checking for compress2" >&5
--echo $ECHO_N "checking for compress2... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for compress2" >&5
-+$as_echo_n "checking for compress2... " >&6; }
- if test "${ac_cv_func_compress2+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -42598,48 +41388,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_func_compress2=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_compress2=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_func_compress2" >&5
--echo "${ECHO_T}$ac_cv_func_compress2" >&6; }
--if test $ac_cv_func_compress2 = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_compress2" >&5
-+$as_echo "$ac_cv_func_compress2" >&6; }
-+if test "x$ac_cv_func_compress2" = x""yes; then
-   HAVE_COMPRESS2="yes"
- fi
- 
- 
-     if test -z "$HAVE_ZLIB" -a -n "$HDF5_CONFIG_ABORT"; then
--      { { echo "$as_me:$LINENO: error: couldn't find zlib library" >&5
--echo "$as_me: error: couldn't find zlib library" >&2;}
-+      { { $as_echo "$as_me:$LINENO: error: couldn't find zlib library" >&5
-+$as_echo "$as_me: error: couldn't find zlib library" >&2;}
-    { (exit 1); exit 1; }; }
-     fi
-     ;;
-   no)
-     HAVE_ZLIB="no"
--    { echo "$as_me:$LINENO: checking for GNU zlib" >&5
--echo $ECHO_N "checking for GNU zlib... $ECHO_C" >&6; }
--    { echo "$as_me:$LINENO: result: suppressed" >&5
--echo "${ECHO_T}suppressed" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for GNU zlib" >&5
-+$as_echo_n "checking for GNU zlib... " >&6; }
-+    { $as_echo "$as_me:$LINENO: result: suppressed" >&5
-+$as_echo "suppressed" >&6; }
-     ;;
-   *)
-     HAVE_ZLIB="yes"
-@@ -42673,20 +41467,21 @@
- 
- for ac_header in zlib.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -42702,32 +41497,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -42741,51 +41537,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -42794,21 +41591,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-  HAVE_ZLIB_H="yes"
- else
-@@ -42823,10 +41623,10 @@
-     fi
- 
- 
--{ echo "$as_me:$LINENO: checking for compress2 in -lz" >&5
--echo $ECHO_N "checking for compress2 in -lz... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for compress2 in -lz" >&5
-+$as_echo_n "checking for compress2 in -lz... " >&6; }
- if test "${ac_cv_lib_z_compress2+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lz  $LIBS"
-@@ -42866,33 +41666,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_z_compress2=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_z_compress2=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress2" >&5
--echo "${ECHO_T}$ac_cv_lib_z_compress2" >&6; }
--if test $ac_cv_lib_z_compress2 = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress2" >&5
-+$as_echo "$ac_cv_lib_z_compress2" >&6; }
-+if test "x$ac_cv_lib_z_compress2" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBZ 1
- _ACEOF
-@@ -42903,10 +41707,10 @@
-   LDFLAGS="$saved_LDFLAGS"; unset HAVE_ZLIB
- fi
- 
--    { echo "$as_me:$LINENO: checking for compress2" >&5
--echo $ECHO_N "checking for compress2... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for compress2" >&5
-+$as_echo_n "checking for compress2... " >&6; }
- if test "${ac_cv_func_compress2+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -42967,39 +41771,43 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_func_compress2=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_func_compress2=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_func_compress2" >&5
--echo "${ECHO_T}$ac_cv_func_compress2" >&6; }
--if test $ac_cv_func_compress2 = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_compress2" >&5
-+$as_echo "$ac_cv_func_compress2" >&6; }
-+if test "x$ac_cv_func_compress2" = x""yes; then
-   HAVE_COMPRESS2="yes"
- fi
- 
- 
-     if test -z "$HAVE_ZLIB" -a -n "$HDF5_CONFIG_ABORT"; then
--      { { echo "$as_me:$LINENO: error: couldn't find zlib library" >&5
--echo "$as_me: error: couldn't find zlib library" >&2;}
-+      { { $as_echo "$as_me:$LINENO: error: couldn't find zlib library" >&5
-+$as_echo "$as_me: error: couldn't find zlib library" >&2;}
-    { (exit 1); exit 1; }; }
-     fi
-     ;;
-@@ -43036,20 +41844,21 @@
- 
- for ac_header in szlib.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -43065,32 +41874,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -43104,51 +41914,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -43157,21 +41968,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-  HAVE_SZLIB_H="yes"
- fi
-@@ -43179,10 +41993,10 @@
- done
- 
- 
--{ echo "$as_me:$LINENO: checking for SZ_BufftoBuffCompress in -lsz" >&5
--echo $ECHO_N "checking for SZ_BufftoBuffCompress in -lsz... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for SZ_BufftoBuffCompress in -lsz" >&5
-+$as_echo_n "checking for SZ_BufftoBuffCompress in -lsz... " >&6; }
- if test "${ac_cv_lib_sz_SZ_BufftoBuffCompress+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsz  $LIBS"
-@@ -43222,33 +42036,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_sz_SZ_BufftoBuffCompress=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_sz_SZ_BufftoBuffCompress=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_sz_SZ_BufftoBuffCompress" >&5
--echo "${ECHO_T}$ac_cv_lib_sz_SZ_BufftoBuffCompress" >&6; }
--if test $ac_cv_lib_sz_SZ_BufftoBuffCompress = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sz_SZ_BufftoBuffCompress" >&5
-+$as_echo "$ac_cv_lib_sz_SZ_BufftoBuffCompress" >&6; }
-+if test "x$ac_cv_lib_sz_SZ_BufftoBuffCompress" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSZ 1
- _ACEOF
-@@ -43261,17 +42079,17 @@
- 
- 
-     if test -z "$HAVE_SZLIB" -a -n "$HDF5_CONFIG_ABORT"; then
--      { { echo "$as_me:$LINENO: error: couldn't find szlib library" >&5
--echo "$as_me: error: couldn't find szlib library" >&2;}
-+      { { $as_echo "$as_me:$LINENO: error: couldn't find szlib library" >&5
-+$as_echo "$as_me: error: couldn't find szlib library" >&2;}
-    { (exit 1); exit 1; }; }
-     fi
-     ;;
-   no)
-     HAVE_SZLIB="no"
--    { echo "$as_me:$LINENO: checking for szlib" >&5
--echo $ECHO_N "checking for szlib... $ECHO_C" >&6; }
--    { echo "$as_me:$LINENO: result: suppressed" >&5
--echo "${ECHO_T}suppressed" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for szlib" >&5
-+$as_echo_n "checking for szlib... " >&6; }
-+    { $as_echo "$as_me:$LINENO: result: suppressed" >&5
-+$as_echo "suppressed" >&6; }
-     ;;
-   *)
-     HAVE_SZLIB="yes"
-@@ -43305,20 +42123,21 @@
- 
- for ac_header in szlib.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -43334,32 +42153,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -43373,51 +42193,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -43426,21 +42247,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-  HAVE_SZLIB_H="yes"
- else
-@@ -43455,10 +42279,10 @@
-     fi
- 
- 
--{ echo "$as_me:$LINENO: checking for SZ_BufftoBuffCompress in -lsz" >&5
--echo $ECHO_N "checking for SZ_BufftoBuffCompress in -lsz... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for SZ_BufftoBuffCompress in -lsz" >&5
-+$as_echo_n "checking for SZ_BufftoBuffCompress in -lsz... " >&6; }
- if test "${ac_cv_lib_sz_SZ_BufftoBuffCompress+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsz  $LIBS"
-@@ -43498,33 +42322,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_sz_SZ_BufftoBuffCompress=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_sz_SZ_BufftoBuffCompress=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_sz_SZ_BufftoBuffCompress" >&5
--echo "${ECHO_T}$ac_cv_lib_sz_SZ_BufftoBuffCompress" >&6; }
--if test $ac_cv_lib_sz_SZ_BufftoBuffCompress = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sz_SZ_BufftoBuffCompress" >&5
-+$as_echo "$ac_cv_lib_sz_SZ_BufftoBuffCompress" >&6; }
-+if test "x$ac_cv_lib_sz_SZ_BufftoBuffCompress" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBSZ 1
- _ACEOF
-@@ -43537,16 +42365,16 @@
- 
- 
-     if test -z "$HAVE_SZLIB" -a -n "$HDF5_CONFIG_ABORT"; then
--      { { echo "$as_me:$LINENO: error: couldn't find szlib library" >&5
--echo "$as_me: error: couldn't find szlib library" >&2;}
-+      { { $as_echo "$as_me:$LINENO: error: couldn't find szlib library" >&5
-+$as_echo "$as_me: error: couldn't find szlib library" >&2;}
-    { (exit 1); exit 1; }; }
-     fi
-     ;;
- esac
- 
- if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
--        { echo "$as_me:$LINENO: checking for szlib encoder" >&5
--echo $ECHO_N "checking for szlib encoder... $ECHO_C" >&6; }
-+        { $as_echo "$as_me:$LINENO: checking for szlib encoder" >&5
-+$as_echo_n "checking for szlib encoder... " >&6; }
- 
-                 if test -z "$LD_LIBRARY_PATH"; then
-     export LD_LIBRARY_PATH="$szlib_lib"
-@@ -43557,14 +42385,16 @@
-      LL_PATH="$LD_LIBRARY_PATH"
- 
-     if test "${hdf5_cv_szlib_can_encode+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -43583,7 +42413,7 @@
-             else
-                 exit(1);
-         }
--
-+        , hdf5_cv_szlib_can_encode=yes, hdf5_cv_szlib_can_encode=no,
- _ACEOF
- rm -f conftest$ac_exeext
- if { (ac_try="$ac_link"
-@@ -43591,29 +42421,30 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  hdf5_cv_szlib_can_encode=yes
-+  :
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--( exit $ac_status )
--hdf5_cv_szlib_can_encode=no
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
-@@ -43629,12 +42460,12 @@
-     USE_FILTER_SZIP="yes"
- 
-     if test ${hdf5_cv_szlib_can_encode} = "yes"; then
--        { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-     fi
-     if test ${hdf5_cv_szlib_can_encode} = "no"; then
--        { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+        { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     fi
- 
-         if test ${hdf5_cv_szlib_can_encode} = "yes"; then
-@@ -43688,11 +42519,12 @@
-     case $ac_val in #(
-     *${as_nl}*)
-       case $ac_var in #(
--      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
--echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-       esac
-       case $ac_var in #(
-       _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-       *) $as_unset $ac_var ;;
-       esac ;;
-     esac
-@@ -43725,12 +42557,12 @@
- if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-   if test -w "$cache_file"; then
-     test "x$cache_file" != "x/dev/null" &&
--      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
--echo "$as_me: updating cache $cache_file" >&6;}
-+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
--echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -43750,20 +42582,21 @@
- 
- for ac_header in pthread.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -43779,32 +42612,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -43818,51 +42652,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -43871,21 +42706,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -43893,10 +42731,10 @@
- done
- 
- 
--{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpthread  $LIBS"
-@@ -43936,33 +42774,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_pthread_pthread_create=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_pthread_pthread_create=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
--echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
--if test $ac_cv_lib_pthread_pthread_create = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-+if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBPTHREAD 1
- _ACEOF
-@@ -43975,10 +42817,10 @@
- 
-     ;;
-   no)
--    { echo "$as_me:$LINENO: checking for pthread" >&5
--echo $ECHO_N "checking for pthread... $ECHO_C" >&6; }
--    { echo "$as_me:$LINENO: result: suppressed" >&5
--echo "${ECHO_T}suppressed" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for pthread" >&5
-+$as_echo_n "checking for pthread... " >&6; }
-+    { $as_echo "$as_me:$LINENO: result: suppressed" >&5
-+$as_echo "suppressed" >&6; }
-     unset PTHREAD
-     ;;
-   *)
-@@ -44008,20 +42850,21 @@
- 
- for ac_header in pthread.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -44037,32 +42880,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -44076,51 +42920,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -44129,21 +42974,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- else
-@@ -44156,20 +43004,21 @@
- 
- for ac_header in pthread.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -44185,32 +43034,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -44224,51 +43074,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -44277,21 +43128,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- else
-@@ -44306,10 +43160,10 @@
-       saved_LDFLAGS="$LDFLAGS"
-       LDFLAGS="$LDFLAGS -L$pthread_lib"
- 
--{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpthread  $LIBS"
-@@ -44349,33 +43203,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_pthread_pthread_create=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_pthread_pthread_create=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
--echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
--if test $ac_cv_lib_pthread_pthread_create = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-+if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBPTHREAD 1
- _ACEOF
-@@ -44388,10 +43246,10 @@
- 
-     else
- 
--{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lpthread  $LIBS"
-@@ -44431,33 +43289,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_pthread_pthread_create=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_pthread_pthread_create=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
--echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
--if test $ac_cv_lib_pthread_pthread_create = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-+if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBPTHREAD 1
- _ACEOF
-@@ -44472,30 +43334,18 @@
-     ;;
- esac
- 
--{ echo "$as_me:$LINENO: checking for thread safe support" >&5
--echo $ECHO_N "checking for thread safe support... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for thread safe support" >&5
-+$as_echo_n "checking for thread safe support... " >&6; }
- # Check whether --enable-threadsafe was given.
- if test "${enable_threadsafe+set}" = set; then
-   enableval=$enable_threadsafe; THREADSAFE=$enableval
- fi
- 
- 
--if test "X${HDF_CXX}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
--  { { echo "$as_me:$LINENO: error: --enable-cxx and --enable-threadsafe flags are incompatible" >&5
--echo "$as_me: error: --enable-cxx and --enable-threadsafe flags are incompatible" >&2;}
--   { (exit 1); exit 1; }; }
--fi
--
--if test "X${HDF_FORTRAN}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
--  { { echo "$as_me:$LINENO: error: --enable-fortran and --enable-threadsafe flags are incompatible" >&5
--echo "$as_me: error: --enable-fortran and --enable-threadsafe flags are incompatible" >&2;}
--   { (exit 1); exit 1; }; }
--fi
--
- case "X-$THREADSAFE" in
-   X-|X-no)
--    { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     ;;
-   X-yes)
-         cat >conftest.$ac_ext <<_ACEOF
-@@ -44527,37 +43377,41 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }; THREADSAFE=yes
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }; THREADSAFE=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ { echo "$as_me:$LINENO: error: needed pthread library not available" >&5
--echo "$as_me: error: needed pthread library not available" >&2;}
-+	{ { $as_echo "$as_me:$LINENO: error: needed pthread library not available" >&5
-+$as_echo "$as_me: error: needed pthread library not available" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-     ;;
-   *)
--    { echo "$as_me:$LINENO: result: error" >&5
--echo "${ECHO_T}error" >&6; }
--    { { echo "$as_me:$LINENO: error: \'$enableval\' is not a valid threadsafe type" >&5
--echo "$as_me: error: \'$enableval\' is not a valid threadsafe type" >&2;}
-+    { $as_echo "$as_me:$LINENO: result: error" >&5
-+$as_echo "error" >&6; }
-+    { { $as_echo "$as_me:$LINENO: error: \'$enableval\' is not a valid threadsafe type" >&5
-+$as_echo "$as_me: error: \'$enableval\' is not a valid threadsafe type" >&2;}
-    { (exit 1); exit 1; }; }
-     ;;
- esac
-@@ -44571,8 +43425,8 @@
- fi
- 
- 
--{ echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
--echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
-+$as_echo_n "checking for tm_gmtoff in struct tm... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -44604,13 +43458,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -44620,20 +43475,20 @@
- #define HAVE_TM_GMTOFF 1
- _ACEOF
- 
--{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--{ echo "$as_me:$LINENO: checking for __tm_gmtoff in struct tm" >&5
--echo $ECHO_N "checking for __tm_gmtoff in struct tm... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for __tm_gmtoff in struct tm" >&5
-+$as_echo_n "checking for __tm_gmtoff in struct tm... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -44665,13 +43520,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -44681,25 +43537,25 @@
- #define HAVE___TM_GMTOFF 1
- _ACEOF
- 
--{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--{ echo "$as_me:$LINENO: checking for global timezone variable" >&5
--echo $ECHO_N "checking for global timezone variable... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for global timezone variable" >&5
-+$as_echo_n "checking for global timezone variable... " >&6; }
- 
- case "`uname`" in
-   CYGWIN*)
--    { echo "$as_me:$LINENO: result: disabled in CYGWIN" >&5
--echo "${ECHO_T}disabled in CYGWIN" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: disabled in CYGWIN" >&5
-+$as_echo "disabled in CYGWIN" >&6; }
-     ;;
-   *)
-     cat >conftest.$ac_ext <<_ACEOF
-@@ -44733,42 +43589,46 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_TIMEZONE 1
- _ACEOF
- 
--    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-     ;;
- esac
- 
--{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
--echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
- if test "${ac_cv_struct_tm+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -44792,7 +43652,7 @@
- {
- struct tm tm;
- 				     int *p = &tm.tm_sec;
-- 				     return !p;
-+				     return !p;
-   ;
-   return 0;
- }
-@@ -44803,20 +43663,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_struct_tm=time.h
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_struct_tm=sys/time.h
-@@ -44824,8 +43685,8 @@
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
--echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-+$as_echo "$ac_cv_struct_tm" >&6; }
- if test $ac_cv_struct_tm = sys/time.h; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -44834,10 +43695,10 @@
- 
- fi
- 
--{ echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
--echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
-+$as_echo_n "checking for struct tm.tm_zone... " >&6; }
- if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -44873,20 +43734,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_member_struct_tm_tm_zone=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
-@@ -44923,20 +43785,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_member_struct_tm_tm_zone=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_member_struct_tm_tm_zone=no
-@@ -44947,9 +43810,9 @@
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
--echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6; }
--if test $ac_cv_member_struct_tm_tm_zone = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
-+$as_echo "$ac_cv_member_struct_tm_tm_zone" >&6; }
-+if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_STRUCT_TM_TM_ZONE 1
-@@ -44965,10 +43828,10 @@
- _ACEOF
- 
- else
--  { echo "$as_me:$LINENO: checking whether tzname is declared" >&5
--echo $ECHO_N "checking whether tzname is declared... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking whether tzname is declared" >&5
-+$as_echo_n "checking whether tzname is declared... " >&6; }
- if test "${ac_cv_have_decl_tzname+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -45003,20 +43866,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_have_decl_tzname=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_have_decl_tzname=no
-@@ -45024,9 +43888,9 @@
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5
--echo "${ECHO_T}$ac_cv_have_decl_tzname" >&6; }
--if test $ac_cv_have_decl_tzname = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5
-+$as_echo "$ac_cv_have_decl_tzname" >&6; }
-+if test "x$ac_cv_have_decl_tzname" = x""yes; then
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_DECL_TZNAME 1
-@@ -45042,10 +43906,10 @@
- fi
- 
- 
--  { echo "$as_me:$LINENO: checking for tzname" >&5
--echo $ECHO_N "checking for tzname... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for tzname" >&5
-+$as_echo_n "checking for tzname... " >&6; }
- if test "${ac_cv_var_tzname+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -45080,31 +43944,35 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_var_tzname=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_var_tzname=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
--echo "${ECHO_T}$ac_cv_var_tzname" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
-+$as_echo "$ac_cv_var_tzname" >&6; }
-   if test $ac_cv_var_tzname = yes; then
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -45114,8 +43982,8 @@
-   fi
- fi
- 
--{ echo "$as_me:$LINENO: checking for struct timezone" >&5
--echo $ECHO_N "checking for struct timezone... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for struct timezone" >&5
-+$as_echo_n "checking for struct timezone... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -45148,13 +44016,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -45165,31 +44034,33 @@
- _ACEOF
- 
- have_struct_tz="yes"
--{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- 
- if test "$have_gettime" = "yes" -a "$have_struct_tz" = "yes"; then
--   { echo "$as_me:$LINENO: checking whether gettimeofday() gives timezone" >&5
--echo $ECHO_N "checking whether gettimeofday() gives timezone... $ECHO_C" >&6; }
-+   { $as_echo "$as_me:$LINENO: checking whether gettimeofday() gives timezone" >&5
-+$as_echo_n "checking whether gettimeofday() gives timezone... " >&6; }
-    if test "${hdf5_cv_gettimeofday_tz+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -45219,29 +44090,32 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   hdf5_cv_gettimeofday_tz=yes
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- hdf5_cv_gettimeofday_tz=no
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
-@@ -45250,21 +44124,21 @@
- 
- 
-    if test ${hdf5_cv_gettimeofday_tz} = "yes"; then
--      { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define GETTIMEOFDAY_GIVES_TZ 1
- _ACEOF
- 
-    else
--      { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-    fi
- fi
- 
--{ echo "$as_me:$LINENO: checking for st_blocks in struct stat" >&5
--echo $ECHO_N "checking for st_blocks in struct stat... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for st_blocks in struct stat" >&5
-+$as_echo_n "checking for st_blocks in struct stat... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -45295,13 +44169,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -45311,14 +44186,14 @@
- #define HAVE_STAT_ST_BLOCKS 1
- _ACEOF
- 
--{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-@@ -45328,11 +44203,11 @@
- 
- for ac_func in _getvideoconfig gettextinfo GetConsoleScreenBufferInfo
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-+$as_echo_n "checking for $ac_func... " >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -45393,35 +44268,42 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_var=no"
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -45431,11 +44313,11 @@
- 
- for ac_func in _scrsize ioctl
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-+$as_echo_n "checking for $ac_func... " >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -45496,43 +44378,50 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_var=no"
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
- done
- 
- 
--{ echo "$as_me:$LINENO: checking for struct videoconfig" >&5
--echo $ECHO_N "checking for struct videoconfig... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for struct videoconfig" >&5
-+$as_echo_n "checking for struct videoconfig... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -45562,13 +44451,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -45578,20 +44468,20 @@
- #define HAVE_STRUCT_VIDEOCONFIG 1
- _ACEOF
- 
--{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--{ echo "$as_me:$LINENO: checking for struct text_info" >&5
--echo $ECHO_N "checking for struct text_info... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for struct text_info" >&5
-+$as_echo_n "checking for struct text_info... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -45621,13 +44511,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -45637,20 +44528,20 @@
- #define HAVE_STRUCT_TEXT_INFO 1
- _ACEOF
- 
--{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--{ echo "$as_me:$LINENO: checking for TIOCGWINSZ" >&5
--echo $ECHO_N "checking for TIOCGWINSZ... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for TIOCGWINSZ" >&5
-+$as_echo_n "checking for TIOCGWINSZ... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -45680,13 +44571,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -45696,20 +44588,20 @@
- #define HAVE_TIOCGWINSZ 1
- _ACEOF
- 
--{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--{ echo "$as_me:$LINENO: checking for TIOCGETD" >&5
--echo $ECHO_N "checking for TIOCGETD... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for TIOCGETD" >&5
-+$as_echo_n "checking for TIOCGETD... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -45739,13 +44631,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -45755,14 +44648,14 @@
- #define HAVE_TIOCGETD 1
- _ACEOF
- 
--{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-@@ -45777,11 +44670,11 @@
- 
- for ac_func in alarm fork frexpf frexpl gethostname getpwuid getrusage
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-+$as_echo_n "checking for $ac_func... " >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -45842,35 +44735,42 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_var=no"
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -45883,11 +44783,11 @@
- 
- for ac_func in BSDgettimeofday siglongjmp longjmp setsysinfo sigaction
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-+$as_echo_n "checking for $ac_func... " >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -45948,35 +44848,42 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_var=no"
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -45990,11 +44897,11 @@
- 
- for ac_func in signal snprintf vasprintf strdup system waitpid
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-+$as_echo_n "checking for $ac_func... " >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -46055,35 +44962,42 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_var=no"
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -46094,11 +45008,11 @@
- 
- for ac_func in rand_r random srandom
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-+$as_echo_n "checking for $ac_func... " >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -46159,35 +45073,42 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_var=no"
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -46196,11 +45117,11 @@
- 
- for ac_func in tmpfile
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-+$as_echo_n "checking for $ac_func... " >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -46261,35 +45182,42 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_var=no"
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- fi
-@@ -46299,11 +45227,11 @@
- 
- for ac_func in vsnprintf
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-+$as_echo_n "checking for $ac_func... " >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -46364,48 +45292,57 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_var=no"
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
--                                             { echo "$as_me:$LINENO: checking if vsnprintf returns correct value" >&5
--echo $ECHO_N "checking if vsnprintf returns correct value... $ECHO_C" >&6; }
-+                                             { $as_echo "$as_me:$LINENO: checking if vsnprintf returns correct value" >&5
-+$as_echo_n "checking if vsnprintf returns correct value... " >&6; }
- 
-     if test "${hdf5_cv_vsnprintf_works+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -46443,29 +45380,32 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   hdf5_cv_vsnprintf_works=yes
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- hdf5_cv_vsnprintf_works=no
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
-@@ -46474,26 +45414,26 @@
- 
- 
-        if test ${hdf5_cv_vsnprintf_works} = "yes"; then
--          { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+          { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define VSNPRINTF_WORKS 1
- _ACEOF
- 
-        else
--          { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+          { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-        fi
- 
- fi
- done
- 
- 
--{ echo "$as_me:$LINENO: checking if lone colon can be used as an argument" >&5
--echo $ECHO_N "checking if lone colon can be used as an argument... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if lone colon can be used as an argument" >&5
-+$as_echo_n "checking if lone colon can be used as an argument... " >&6; }
- if test "${hdf5_cv_lone_colon+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
- 
-   echo "int main(int argc, char * argv) {return 0;}" > conftest.c
-@@ -46512,15 +45452,15 @@
-   fi
- 
- fi
--{ echo "$as_me:$LINENO: result: $hdf5_cv_lone_colon" >&5
--echo "${ECHO_T}$hdf5_cv_lone_colon" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $hdf5_cv_lone_colon" >&5
-+$as_echo "$hdf5_cv_lone_colon" >&6; }
- 
-  H5_LONE_COLON="$hdf5_cv_lone_colon"
- 
--{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
--echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
- if test "${ac_cv_c_const+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -46600,20 +45540,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_c_const=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_c_const=no
-@@ -46621,20 +45562,20 @@
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
--echo "${ECHO_T}$ac_cv_c_const" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-+$as_echo "$ac_cv_c_const" >&6; }
- if test $ac_cv_c_const = no; then
- 
- cat >>confdefs.h <<\_ACEOF
--#define const
-+#define const /**/
- _ACEOF
- 
- fi
- 
--{ echo "$as_me:$LINENO: checking for inline" >&5
--echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for inline" >&5
-+$as_echo_n "checking for inline... " >&6; }
- if test "${ac_cv_c_inline+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-@@ -46657,20 +45598,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_cv_c_inline=$ac_kw
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
-@@ -46681,8 +45623,8 @@
- done
- 
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
--echo "${ECHO_T}$ac_cv_c_inline" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-+$as_echo "$ac_cv_c_inline" >&6; }
- 
- 
- case $ac_cv_c_inline in
-@@ -46701,8 +45643,8 @@
- esac
- 
- 
--{ echo "$as_me:$LINENO: checking for __attribute__ extension" >&5
--echo $ECHO_N "checking for __attribute__ extension... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for __attribute__ extension" >&5
-+$as_echo_n "checking for __attribute__ extension... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -46732,13 +45674,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -46748,19 +45691,19 @@
- #define HAVE_ATTRIBUTE 1
- _ACEOF
- 
--               { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+               { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: checking for __func__ extension" >&5
--echo $ECHO_N "checking for __func__ extension... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for __func__ extension" >&5
-+$as_echo_n "checking for __func__ extension... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -46790,13 +45733,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -46806,19 +45750,19 @@
- #define HAVE_C99_FUNC 1
- _ACEOF
- 
--               { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+               { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: checking for __FUNCTION__ extension" >&5
--echo $ECHO_N "checking for __FUNCTION__ extension... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for __FUNCTION__ extension" >&5
-+$as_echo_n "checking for __FUNCTION__ extension... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -46848,13 +45792,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -46864,19 +45809,19 @@
- #define HAVE_FUNCTION 1
- _ACEOF
- 
--               { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+               { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: checking for C99 designated initialization support" >&5
--echo $ECHO_N "checking for C99 designated initialization support... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for C99 designated initialization support" >&5
-+$as_echo_n "checking for C99 designated initialization support... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -46914,13 +45859,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -46930,22 +45876,22 @@
- #define HAVE_C99_DESIGNATED_INITIALIZER 1
- _ACEOF
- 
--               { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+               { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--{ echo "$as_me:$LINENO: checking how to print long long" >&5
--echo $ECHO_N "checking how to print long long... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking how to print long long" >&5
-+$as_echo_n "checking how to print long long... " >&6; }
- if test "${hdf5_cv_printf_ll+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   LD_LIBRARY_PATH="$LD_LIBRARY_PATH`echo $LDFLAGS | sed -e 's/-L/:/g' -e 's/ //g'`"
- export LD_LIBRARY_PATH
-@@ -46980,27 +45926,30 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
-@@ -47008,25 +45957,27 @@
- done
- fi
- 
--{ echo "$as_me:$LINENO: result: %${hdf5_cv_printf_ll}d and %${hdf5_cv_printf_ll}u" >&5
--echo "${ECHO_T}%${hdf5_cv_printf_ll}d and %${hdf5_cv_printf_ll}u" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: %${hdf5_cv_printf_ll}d and %${hdf5_cv_printf_ll}u" >&5
-+$as_echo "%${hdf5_cv_printf_ll}d and %${hdf5_cv_printf_ll}u" >&6; }
- 
- cat >>confdefs.h <<_ACEOF
- #define PRINTF_LL_WIDTH "$hdf5_cv_printf_ll"
- _ACEOF
- 
- 
--{ echo "$as_me:$LINENO: checking Threads support system scope" >&5
--echo $ECHO_N "checking Threads support system scope... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking Threads support system scope" >&5
-+$as_echo_n "checking Threads support system scope... " >&6; }
- if test "${hdf5_cv_system_scope_threads+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -47057,29 +46008,32 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   hdf5_cv_system_scope_threads=yes
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- hdf5_cv_system_scope_threads=no
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
-@@ -47093,11 +46047,11 @@
- #define SYSTEM_SCOPE_THREADS 1
- _ACEOF
- 
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- # Check whether --enable-gpfs was given.
-@@ -47113,20 +46067,21 @@
- 
- for ac_header in gpfs.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -47142,32 +46097,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -47181,51 +46137,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -47234,24 +46191,27 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-- { echo "$as_me:$LINENO: checking for GPFS support" >&5
--echo $ECHO_N "checking for GPFS support... $ECHO_C" >&6; }
-+ { $as_echo "$as_me:$LINENO: checking for GPFS support" >&5
-+$as_echo_n "checking for GPFS support... " >&6; }
-                      cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -47281,13 +46241,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -47297,16 +46258,16 @@
- #define HAVE_GPFS 1
- _ACEOF
- 
--                                    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+                                    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-                                     LIBS="$LIBS -lgpfs"
-                                     GPFS="yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-                                     GPFS="no"
- fi
- 
-@@ -47317,15 +46278,15 @@
- 
-     ;;
-   X-no|*)
--    { echo "$as_me:$LINENO: checking for gpfs" >&5
--echo $ECHO_N "checking for gpfs... $ECHO_C" >&6; }
--    { echo "$as_me:$LINENO: result: suppressed" >&5
--echo "${ECHO_T}suppressed" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for gpfs" >&5
-+$as_echo_n "checking for gpfs... " >&6; }
-+    { $as_echo "$as_me:$LINENO: result: suppressed" >&5
-+$as_echo "suppressed" >&6; }
-     ;;
- esac
- 
--{ echo "$as_me:$LINENO: checking for debug flags" >&5
--echo $ECHO_N "checking for debug flags... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for debug flags" >&5
-+$as_echo_n "checking for debug flags... " >&6; }
- # Check whether --enable-debug was given.
- if test "${enable_debug+set}" = set; then
-   enableval=$enable_debug; DEBUG_PKG=$enableval
-@@ -47346,24 +46307,24 @@
-   X-yes)
-     DEBUG_PKG="d,e,f,g,hg,i,mm,o,p,s,t,v,z"
-     H5_CPPFLAGS="$H5_CPPFLAGS -UNDEBUG"
--    { echo "$as_me:$LINENO: result: default ($DEBUG_PKG)" >&5
--echo "${ECHO_T}default ($DEBUG_PKG)" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: default ($DEBUG_PKG)" >&5
-+$as_echo "default ($DEBUG_PKG)" >&6; }
-     ;;
-   X-all)
-     DEBUG_PKG=$all_packages
-     H5_CPPFLAGS="$H5_CPPFLAGS -UNDEBUG"
--    { echo "$as_me:$LINENO: result: all ($DEBUG_PKG)" >&5
--echo "${ECHO_T}all ($DEBUG_PKG)" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: all ($DEBUG_PKG)" >&5
-+$as_echo "all ($DEBUG_PKG)" >&6; }
-     ;;
-   X-no|X-none)
--    { echo "$as_me:$LINENO: result: none" >&5
--echo "${ECHO_T}none" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: none" >&5
-+$as_echo "none" >&6; }
-     DEBUG_PKG=
-     H5_CPPFLAGS="$H5_CPPFLAGS -DNDEBUG"
-     ;;
-   *)
--    { echo "$as_me:$LINENO: result: $DEBUG_PKG" >&5
--echo "${ECHO_T}$DEBUG_PKG" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: $DEBUG_PKG" >&5
-+$as_echo "$DEBUG_PKG" >&6; }
-     ;;
- esac
- 
-@@ -47373,8 +46334,8 @@
-   done
- fi
- 
--{ echo "$as_me:$LINENO: checking whether function stack tracking is enabled" >&5
--echo $ECHO_N "checking whether function stack tracking is enabled... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether function stack tracking is enabled" >&5
-+$as_echo_n "checking whether function stack tracking is enabled... " >&6; }
- # Check whether --enable-codestack was given.
- if test "${enable_codestack+set}" = set; then
-   enableval=$enable_codestack; CODESTACK=$enableval
-@@ -47384,8 +46345,8 @@
- case "X-$CODESTACK" in
-   X-yes)
-       CODESTACK=yes
--      { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_CODESTACK 1
-@@ -47394,13 +46355,13 @@
-     ;;
-   *)
-       CODESTACK=no
--      { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     ;;
- esac
- 
--{ echo "$as_me:$LINENO: checking whether metadata trace file code is enabled" >&5
--echo $ECHO_N "checking whether metadata trace file code is enabled... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether metadata trace file code is enabled" >&5
-+$as_echo_n "checking whether metadata trace file code is enabled... " >&6; }
- # Check whether --enable-metadata-trace-file was given.
- if test "${enable_metadata_trace_file+set}" = set; then
-   enableval=$enable_metadata_trace_file; METADATATRACEFILE=$enableval
-@@ -47410,8 +46371,8 @@
- case "X-$METADATATRACEFILE" in
-   X-yes)
-       METADATATRACEFILE=yes
--      { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define METADATA_TRACE_FILE 1
-@@ -47420,14 +46381,14 @@
-     ;;
-   *)
-       METADATATRACEFILE=no
--      { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     ;;
- esac
- 
- 
--{ echo "$as_me:$LINENO: checking for API tracing" >&5
--echo $ECHO_N "checking for API tracing... $ECHO_C" >&6; };
-+{ $as_echo "$as_me:$LINENO: checking for API tracing" >&5
-+$as_echo_n "checking for API tracing... " >&6; };
- # Check whether --enable-trace was given.
- if test "${enable_trace+set}" = set; then
-   enableval=$enable_trace; TRACE=$enableval
-@@ -47444,22 +46405,22 @@
- 
- case "X-$TRACE" in
-   X-yes)
--    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-     TRACE_API=yes
-     H5_CPPFLAGS="$H5_CPPFLAGS -DH5_DEBUG_API"
-     ;;
-   X-no|*)
--    { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     TRACE_API=no
-     H5_CPPFLAGS="$H5_CPPFLAGS -UH5_DEBUG_API"
-     ;;
- esac
- 
- 
--{ echo "$as_me:$LINENO: checking for instrumented library" >&5
--echo $ECHO_N "checking for instrumented library... $ECHO_C" >&6; };
-+{ $as_echo "$as_me:$LINENO: checking for instrumented library" >&5
-+$as_echo_n "checking for instrumented library... " >&6; };
- # Check whether --enable-instrument was given.
- if test "${enable_instrument+set}" = set; then
-   enableval=$enable_instrument; INSTRUMENT=$enableval
-@@ -47476,8 +46437,8 @@
- 
- case "X-$INSTRUMENT" in
-   X-yes)
--    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-     INSTRUMENT_LIBRARY=yes
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -47486,15 +46447,15 @@
- 
-     ;;
-   X-no|*)
--    { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     INSTRUMENT_LIBRARY=no
-     ;;
- esac
- 
- 
--{ echo "$as_me:$LINENO: checking whether to clear file buffers" >&5
--echo $ECHO_N "checking whether to clear file buffers... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether to clear file buffers" >&5
-+$as_echo_n "checking whether to clear file buffers... " >&6; }
- # Check whether --enable-clear-file-buffers was given.
- if test "${enable_clear_file_buffers+set}" = set; then
-   enableval=$enable_clear_file_buffers; CLEARFILEBUF=$enableval
-@@ -47504,8 +46465,8 @@
- case "X-$CLEARFILEBUF" in
-   *)
-       CLEARFILEBUF=yes
--      { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define CLEAR_MEMORY 1
-@@ -47514,14 +46475,14 @@
-     ;;
-   X-no)
-       CLEARFILEBUF=no
--      { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     ;;
- esac
- 
- 
--{ echo "$as_me:$LINENO: checking whether a memory checking tool will be used" >&5
--echo $ECHO_N "checking whether a memory checking tool will be used... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether a memory checking tool will be used" >&5
-+$as_echo_n "checking whether a memory checking tool will be used... " >&6; }
- # Check whether --enable-using-memchecker was given.
- if test "${enable_using_memchecker+set}" = set; then
-   enableval=$enable_using_memchecker; USINGMEMCHECKER=$enableval
-@@ -47531,8 +46492,8 @@
- case "X-$USINGMEMCHECKER" in
-   X-yes)
-       USINGMEMCHECKER=yes
--      { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define USING_MEMCHECKER 1
-@@ -47541,8 +46502,8 @@
-     ;;
-   *)
-       USINGMEMCHECKER=no
--      { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     ;;
- esac
- 
-@@ -47573,11 +46534,12 @@
-     case $ac_val in #(
-     *${as_nl}*)
-       case $ac_var in #(
--      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
--echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-       esac
-       case $ac_var in #(
-       _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-       *) $as_unset $ac_var ;;
-       esac ;;
-     esac
-@@ -47610,12 +46572,12 @@
- if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-   if test -w "$cache_file"; then
-     test "x$cache_file" != "x/dev/null" &&
--      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
--echo "$as_me: updating cache $cache_file" >&6;}
-+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
--echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -47627,39 +46589,39 @@
- 
- 
- if test "X${HDF_CXX}" = "Xyes" -a "X${enable_parallel}" = "Xyes"; then
--  { { echo "$as_me:$LINENO: error: --enable-cxx and --enable-parallel flags are incompatible" >&5
--echo "$as_me: error: --enable-cxx and --enable-parallel flags are incompatible" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: --enable-cxx and --enable-parallel flags are incompatible" >&5
-+$as_echo "$as_me: error: --enable-cxx and --enable-parallel flags are incompatible" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- if test "X${THREADSAFE}" = "Xyes" -a "X${enable_parallel}" = "Xyes"; then
--  { { echo "$as_me:$LINENO: error: --enable-threadsafe and --enable-parallel flags are incompatible" >&5
--echo "$as_me: error: --enable-threadsafe and --enable-parallel flags are incompatible" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: --enable-threadsafe and --enable-parallel flags are incompatible" >&5
-+$as_echo "$as_me: error: --enable-threadsafe and --enable-parallel flags are incompatible" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- if test "X${PARALLEL}" != "X" -a "X${enable_cxx}" = "Xyes" ; then
--  { { echo "$as_me:$LINENO: error: An MPI compiler is being used; --enable-cxx is not allowed" >&5
--echo "$as_me: error: An MPI compiler is being used; --enable-cxx is not allowed" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: An MPI compiler is being used; --enable-cxx is not allowed" >&5
-+$as_echo "$as_me: error: An MPI compiler is being used; --enable-cxx is not allowed" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test "X${PARALLEL}" != "X" -a "X${THREADSAFE}" = "Xyes"; then
--  { { echo "$as_me:$LINENO: error: An MPI compiler is being used; --enable-threadsafe is not allowed" >&5
--echo "$as_me: error: An MPI compiler is being used; --enable-threadsafe is not allowed" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: An MPI compiler is being used; --enable-threadsafe is not allowed" >&5
-+$as_echo "$as_me: error: An MPI compiler is being used; --enable-threadsafe is not allowed" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
--{ echo "$as_me:$LINENO: checking for parallel support files" >&5
--echo $ECHO_N "checking for parallel support files... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for parallel support files" >&5
-+$as_echo_n "checking for parallel support files... " >&6; }
- case "X-$enable_parallel" in
-   X-|X-no|X-none)
--                { echo "$as_me:$LINENO: result: skipped" >&5
--echo "${ECHO_T}skipped" >&6; }
-+                { $as_echo "$as_me:$LINENO: result: skipped" >&5
-+$as_echo "skipped" >&6; }
-     ;;
- 
-   X-yes)
--            { echo "$as_me:$LINENO: result: provided by compiler" >&5
--echo "${ECHO_T}provided by compiler" >&6; }
-+            { $as_echo "$as_me:$LINENO: result: provided by compiler" >&5
-+$as_echo "provided by compiler" >&6; }
-     PARALLEL=yes
- 
-             cat >conftest.$ac_ext <<_ACEOF
-@@ -47691,29 +46653,32 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   :
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	\
- 
--{ echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
--echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5
-+$as_echo_n "checking for MPI_Init in -lmpi... " >&6; }
- if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmpi  $LIBS"
-@@ -47753,33 +46718,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_mpi_MPI_Init=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_mpi_MPI_Init=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5
--echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6; }
--if test $ac_cv_lib_mpi_MPI_Init = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5
-+$as_echo "$ac_cv_lib_mpi_MPI_Init" >&6; }
-+if test "x$ac_cv_lib_mpi_MPI_Init" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBMPI 1
- _ACEOF
-@@ -47789,10 +46758,10 @@
- else
-   \
- 
--{ echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5
--echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5
-+$as_echo_n "checking for MPI_Init in -lmpich... " >&6; }
- if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmpich  $LIBS"
-@@ -47832,33 +46801,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_mpich_MPI_Init=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_mpich_MPI_Init=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5
--echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6; }
--if test $ac_cv_lib_mpich_MPI_Init = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5
-+$as_echo "$ac_cv_lib_mpich_MPI_Init" >&6; }
-+if test "x$ac_cv_lib_mpich_MPI_Init" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBMPICH 1
- _ACEOF
-@@ -47873,6 +46846,7 @@
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 
-@@ -47906,28 +46880,31 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   :
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
--{ echo "$as_me:$LINENO: checking for MPI_File_open in -lmpio" >&5
--echo $ECHO_N "checking for MPI_File_open in -lmpio... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for MPI_File_open in -lmpio" >&5
-+$as_echo_n "checking for MPI_File_open in -lmpio... " >&6; }
- if test "${ac_cv_lib_mpio_MPI_File_open+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmpio  $LIBS"
-@@ -47967,33 +46944,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_mpio_MPI_File_open=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_mpio_MPI_File_open=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpio_MPI_File_open" >&5
--echo "${ECHO_T}$ac_cv_lib_mpio_MPI_File_open" >&6; }
--if test $ac_cv_lib_mpio_MPI_File_open = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mpio_MPI_File_open" >&5
-+$as_echo "$ac_cv_lib_mpio_MPI_File_open" >&6; }
-+if test "x$ac_cv_lib_mpio_MPI_File_open" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBMPIO 1
- _ACEOF
-@@ -48006,6 +46987,7 @@
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-     fi
-@@ -48031,34 +47013,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_fc_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   :
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
--{ echo "$as_me:$LINENO: checking for
-+{ $as_echo "$as_me:$LINENO: checking for
-             include 'mpif.h'
-             integer:: ierr
-             call mpi_file_open( ierr ) in -lmpi" >&5
--echo $ECHO_N "checking for
-+$as_echo_n "checking for
-             include 'mpif.h'
-             integer:: ierr
--            call mpi_file_open( ierr ) in -lmpi... $ECHO_C" >&6; }
-+            call mpi_file_open( ierr ) in -lmpi... " >&6; }
- if test "${ac_cv_lib_mpi______________include__mpif_h______________integer___ierr_____________call_mpi_file_open__ierr__+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmpi  $LIBS"
-@@ -48076,33 +47061,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_fc_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_mpi______________include__mpif_h______________integer___ierr_____________call_mpi_file_open__ierr__=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_mpi______________include__mpif_h______________integer___ierr_____________call_mpi_file_open__ierr__=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpi______________include__mpif_h______________integer___ierr_____________call_mpi_file_open__ierr__" >&5
--echo "${ECHO_T}$ac_cv_lib_mpi______________include__mpif_h______________integer___ierr_____________call_mpi_file_open__ierr__" >&6; }
--if test $ac_cv_lib_mpi______________include__mpif_h______________integer___ierr_____________call_mpi_file_open__ierr__ = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mpi______________include__mpif_h______________integer___ierr_____________call_mpi_file_open__ierr__" >&5
-+$as_echo "$ac_cv_lib_mpi______________include__mpif_h______________integer___ierr_____________call_mpi_file_open__ierr__" >&6; }
-+if test "x$ac_cv_lib_mpi______________include__mpif_h______________integer___ierr_____________call_mpi_file_open__ierr__" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBMPI 1
- _ACEOF
-@@ -48115,6 +47104,7 @@
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 
-@@ -48133,34 +47123,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_fc_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   :
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
--{ echo "$as_me:$LINENO: checking for
-+{ $as_echo "$as_me:$LINENO: checking for
-               include 'mpif.h'
-               integer:: ierr
-               call mpi_file_open( ierr ) in -lmpio" >&5
--echo $ECHO_N "checking for
-+$as_echo_n "checking for
-               include 'mpif.h'
-               integer:: ierr
--              call mpi_file_open( ierr ) in -lmpio... $ECHO_C" >&6; }
-+              call mpi_file_open( ierr ) in -lmpio... " >&6; }
- if test "${ac_cv_lib_mpio________________include__mpif_h________________integer___ierr_______________call_mpi_file_open__ierr__+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmpio  $LIBS"
-@@ -48178,33 +47171,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_fc_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_mpio________________include__mpif_h________________integer___ierr_______________call_mpi_file_open__ierr__=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_mpio________________include__mpif_h________________integer___ierr_______________call_mpi_file_open__ierr__=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpio________________include__mpif_h________________integer___ierr_______________call_mpi_file_open__ierr__" >&5
--echo "${ECHO_T}$ac_cv_lib_mpio________________include__mpif_h________________integer___ierr_______________call_mpi_file_open__ierr__" >&6; }
--if test $ac_cv_lib_mpio________________include__mpif_h________________integer___ierr_______________call_mpi_file_open__ierr__ = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mpio________________include__mpif_h________________integer___ierr_______________call_mpi_file_open__ierr__" >&5
-+$as_echo "$ac_cv_lib_mpio________________include__mpif_h________________integer___ierr_______________call_mpi_file_open__ierr__" >&6; }
-+if test "x$ac_cv_lib_mpio________________include__mpif_h________________integer___ierr_______________call_mpi_file_open__ierr__" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBMPIO 1
- _ACEOF
-@@ -48217,6 +47214,7 @@
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-       fi
-@@ -48235,10 +47233,10 @@
-     ;;
- 
-   *)
--    { echo "$as_me:$LINENO: result: error" >&5
--echo "${ECHO_T}error" >&6; }
--    { { echo "$as_me:$LINENO: error: \'$enable_parallel\' is not a valid parallel search type" >&5
--echo "$as_me: error: \'$enable_parallel\' is not a valid parallel search type" >&2;}
-+    { $as_echo "$as_me:$LINENO: result: error" >&5
-+$as_echo "error" >&6; }
-+    { { $as_echo "$as_me:$LINENO: error: \'$enable_parallel\' is not a valid parallel search type" >&5
-+$as_echo "$as_me: error: \'$enable_parallel\' is not a valid parallel search type" >&2;}
-    { (exit 1); exit 1; }; }
-     ;;
- esac
-@@ -48254,17 +47252,17 @@
- _ACEOF
- 
- 
--    { echo "$as_me:$LINENO: checking prefix for running on one processor" >&5
--echo $ECHO_N "checking prefix for running on one processor... $ECHO_C" >&6; }
--  { echo "$as_me:$LINENO: result: $RUNSERIAL" >&5
--echo "${ECHO_T}$RUNSERIAL" >&6; }
--  { echo "$as_me:$LINENO: checking prefix for running in parallel" >&5
--echo $ECHO_N "checking prefix for running in parallel... $ECHO_C" >&6; }
--  { echo "$as_me:$LINENO: result: $RUNPARALLEL" >&5
--echo "${ECHO_T}$RUNPARALLEL" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking prefix for running on one processor" >&5
-+$as_echo_n "checking prefix for running on one processor... " >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $RUNSERIAL" >&5
-+$as_echo "$RUNSERIAL" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking prefix for running in parallel" >&5
-+$as_echo_n "checking prefix for running in parallel... " >&6; }
-+  { $as_echo "$as_me:$LINENO: result: $RUNPARALLEL" >&5
-+$as_echo "$RUNPARALLEL" >&6; }
- 
--    { echo "$as_me:$LINENO: checking whether a simple MPI-IO program can be linked" >&5
--echo $ECHO_N "checking whether a simple MPI-IO program can be linked... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking whether a simple MPI-IO program can be linked" >&5
-+$as_echo_n "checking whether a simple MPI-IO program can be linked... " >&6; }
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -48294,37 +47292,41 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--              { { echo "$as_me:$LINENO: error: unable to link a simple MPI-IO application" >&5
--echo "$as_me: error: unable to link a simple MPI-IO application" >&2;}
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+              { { $as_echo "$as_me:$LINENO: error: unable to link a simple MPI-IO application" >&5
-+$as_echo "$as_me: error: unable to link a simple MPI-IO application" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 
-       if test -z "$RUNPARALLEL"; then
--    { { echo "$as_me:$LINENO: error: no way to run a parallel program" >&5
--echo "$as_me: error: no way to run a parallel program" >&2;}
-+    { { $as_echo "$as_me:$LINENO: error: no way to run a parallel program" >&5
-+$as_echo "$as_me: error: no way to run a parallel program" >&2;}
-    { (exit 1); exit 1; }; }
-   fi
- 
-@@ -48337,8 +47339,8 @@
- 
-   if test "X$HDF_FORTRAN" = "Xyes"; then
-     ADD_PARALLEL_FILES="yes"
--    { echo "$as_me:$LINENO: checking for MPI_Comm_c2f and MPI_Comm_f2c functions" >&5
--echo $ECHO_N "checking for MPI_Comm_c2f and MPI_Comm_f2c functions... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for MPI_Comm_c2f and MPI_Comm_f2c functions" >&5
-+$as_echo_n "checking for MPI_Comm_c2f and MPI_Comm_f2c functions... " >&6; }
- 
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -48369,39 +47371,43 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_MPI_MULTI_LANG_Comm 1
- _ACEOF
- 
--      { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- 
--    { echo "$as_me:$LINENO: checking for MPI_Info_c2f and MPI_Info_f2c functions" >&5
--echo $ECHO_N "checking for MPI_Info_c2f and MPI_Info_f2c functions... $ECHO_C" >&6; }
-+    { $as_echo "$as_me:$LINENO: checking for MPI_Info_c2f and MPI_Info_f2c functions" >&5
-+$as_echo_n "checking for MPI_Info_c2f and MPI_Info_f2c functions... " >&6; }
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -48431,34 +47437,38 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_MPI_MULTI_LANG_Info 1
- _ACEOF
- 
--      { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+	{ $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- 
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-   fi
-@@ -48475,30 +47485,31 @@
- 
-   case "X-$withval" in
-     X-|X-no|X-none)
--      { echo "$as_me:$LINENO: checking for MPE" >&5
--echo $ECHO_N "checking for MPE... $ECHO_C" >&6; }
--      { echo "$as_me:$LINENO: result: suppressed" >&5
--echo "${ECHO_T}suppressed" >&6; }
-+      { $as_echo "$as_me:$LINENO: checking for MPE" >&5
-+$as_echo_n "checking for MPE... " >&6; }
-+      { $as_echo "$as_me:$LINENO: result: suppressed" >&5
-+$as_echo "suppressed" >&6; }
-       unset MPE
-       ;;
-     X-yes)
- 
- for ac_header in mpe.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -48514,32 +47525,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -48553,51 +47565,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -48606,21 +47619,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- else
-@@ -48630,10 +47646,10 @@
- done
- 
- 
--{ echo "$as_me:$LINENO: checking for MPE_Init_log in -lmpe" >&5
--echo $ECHO_N "checking for MPE_Init_log in -lmpe... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for MPE_Init_log in -lmpe" >&5
-+$as_echo_n "checking for MPE_Init_log in -lmpe... " >&6; }
- if test "${ac_cv_lib_mpe_MPE_Init_log+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmpe  $LIBS"
-@@ -48673,33 +47689,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_mpe_MPE_Init_log=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_mpe_MPE_Init_log=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpe_MPE_Init_log" >&5
--echo "${ECHO_T}$ac_cv_lib_mpe_MPE_Init_log" >&6; }
--if test $ac_cv_lib_mpe_MPE_Init_log = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mpe_MPE_Init_log" >&5
-+$as_echo "$ac_cv_lib_mpe_MPE_Init_log" >&6; }
-+if test "x$ac_cv_lib_mpe_MPE_Init_log" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBMPE 1
- _ACEOF
-@@ -48711,10 +47731,10 @@
- fi
- 
- 
--{ echo "$as_me:$LINENO: checking for CLOG_Init in -llmpe" >&5
--echo $ECHO_N "checking for CLOG_Init in -llmpe... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for CLOG_Init in -llmpe" >&5
-+$as_echo_n "checking for CLOG_Init in -llmpe... " >&6; }
- if test "${ac_cv_lib_lmpe_CLOG_Init+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-llmpe  $LIBS"
-@@ -48754,33 +47774,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_lmpe_CLOG_Init=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_lmpe_CLOG_Init=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_lmpe_CLOG_Init" >&5
--echo "${ECHO_T}$ac_cv_lib_lmpe_CLOG_Init" >&6; }
--if test $ac_cv_lib_lmpe_CLOG_Init = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lmpe_CLOG_Init" >&5
-+$as_echo "$ac_cv_lib_lmpe_CLOG_Init" >&6; }
-+if test "x$ac_cv_lib_lmpe_CLOG_Init" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBLMPE 1
- _ACEOF
-@@ -48819,20 +47843,21 @@
- 
- for ac_header in mpe.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -48848,32 +47873,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -48887,51 +47913,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -48940,21 +47967,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- else
-@@ -48967,20 +47997,21 @@
- 
- for ac_header in mpe.h
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- else
-   # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+$as_echo_n "checking $ac_header usability... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -48996,32 +48027,33 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        } && test -s conftest.$ac_objext; then
-   ac_header_compiler=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_header_compiler=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
- 
- # Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+$as_echo_n "checking $ac_header presence... " >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -49035,51 +48067,52 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null && {
- 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-        }; then
-   ac_header_preproc=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-   ac_header_preproc=no
- fi
- 
- rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
- 
- # So?  What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-   yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-     ac_header_preproc=yes
-     ;;
-   no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-     ( cat <<\_ASBOX
- ## -------------------------------- ##
- ## Report this to help at hdfgroup.org ##
-@@ -49088,21 +48121,24 @@
-      ) | sed "s/^/$as_me: WARNING:     /" >&2
-     ;;
- esac
--{ echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-+$as_echo_n "checking for $ac_header... " >&6; }
- if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   eval "$as_ac_Header=\$ac_header_preproc"
- fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
-+ac_res=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- 
- fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+as_val=`eval 'as_val=${'$as_ac_Header'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
- else
-@@ -49117,10 +48153,10 @@
-         saved_LDFLAGS="$LDFLAGS"
-         LDFLAGS="$LDFLAGS -L$mpe_lib"
- 
--{ echo "$as_me:$LINENO: checking for MPE_Init_log in -lmpe" >&5
--echo $ECHO_N "checking for MPE_Init_log in -lmpe... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for MPE_Init_log in -lmpe" >&5
-+$as_echo_n "checking for MPE_Init_log in -lmpe... " >&6; }
- if test "${ac_cv_lib_mpe_MPE_Init_log+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmpe  $LIBS"
-@@ -49160,33 +48196,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_mpe_MPE_Init_log=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_mpe_MPE_Init_log=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpe_MPE_Init_log" >&5
--echo "${ECHO_T}$ac_cv_lib_mpe_MPE_Init_log" >&6; }
--if test $ac_cv_lib_mpe_MPE_Init_log = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mpe_MPE_Init_log" >&5
-+$as_echo "$ac_cv_lib_mpe_MPE_Init_log" >&6; }
-+if test "x$ac_cv_lib_mpe_MPE_Init_log" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBMPE 1
- _ACEOF
-@@ -49198,10 +48238,10 @@
- fi
- 
- 
--{ echo "$as_me:$LINENO: checking for CLOG_Init in -llmpe" >&5
--echo $ECHO_N "checking for CLOG_Init in -llmpe... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for CLOG_Init in -llmpe" >&5
-+$as_echo_n "checking for CLOG_Init in -llmpe... " >&6; }
- if test "${ac_cv_lib_lmpe_CLOG_Init+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-llmpe  $LIBS"
-@@ -49241,33 +48281,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_lmpe_CLOG_Init=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_lmpe_CLOG_Init=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_lmpe_CLOG_Init" >&5
--echo "${ECHO_T}$ac_cv_lib_lmpe_CLOG_Init" >&6; }
--if test $ac_cv_lib_lmpe_CLOG_Init = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lmpe_CLOG_Init" >&5
-+$as_echo "$ac_cv_lib_lmpe_CLOG_Init" >&6; }
-+if test "x$ac_cv_lib_lmpe_CLOG_Init" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBLMPE 1
- _ACEOF
-@@ -49280,10 +48324,10 @@
- 
-       else
- 
--{ echo "$as_me:$LINENO: checking for MPE_Init_log in -lmpe" >&5
--echo $ECHO_N "checking for MPE_Init_log in -lmpe... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for MPE_Init_log in -lmpe" >&5
-+$as_echo_n "checking for MPE_Init_log in -lmpe... " >&6; }
- if test "${ac_cv_lib_mpe_MPE_Init_log+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lmpe  $LIBS"
-@@ -49323,33 +48367,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_mpe_MPE_Init_log=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_mpe_MPE_Init_log=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpe_MPE_Init_log" >&5
--echo "${ECHO_T}$ac_cv_lib_mpe_MPE_Init_log" >&6; }
--if test $ac_cv_lib_mpe_MPE_Init_log = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mpe_MPE_Init_log" >&5
-+$as_echo "$ac_cv_lib_mpe_MPE_Init_log" >&6; }
-+if test "x$ac_cv_lib_mpe_MPE_Init_log" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBMPE 1
- _ACEOF
-@@ -49361,10 +48409,10 @@
- fi
- 
- 
--{ echo "$as_me:$LINENO: checking for CLOG_Init in -llmpe" >&5
--echo $ECHO_N "checking for CLOG_Init in -llmpe... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for CLOG_Init in -llmpe" >&5
-+$as_echo_n "checking for CLOG_Init in -llmpe... " >&6; }
- if test "${ac_cv_lib_lmpe_CLOG_Init+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-llmpe  $LIBS"
-@@ -49404,33 +48452,37 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   ac_cv_lib_lmpe_CLOG_Init=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_lmpe_CLOG_Init=no
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_lmpe_CLOG_Init" >&5
--echo "${ECHO_T}$ac_cv_lib_lmpe_CLOG_Init" >&6; }
--if test $ac_cv_lib_lmpe_CLOG_Init = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lmpe_CLOG_Init" >&5
-+$as_echo "$ac_cv_lib_lmpe_CLOG_Init" >&6; }
-+if test "x$ac_cv_lib_lmpe_CLOG_Init" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBLMPE 1
- _ACEOF
-@@ -49453,10 +48505,10 @@
- 
-   fi
- 
--              { echo "$as_me:$LINENO: checking if MPI_File_set_size works for files over 2GB" >&5
--echo $ECHO_N "checking if MPI_File_set_size works for files over 2GB... $ECHO_C" >&6; }
-+              { $as_echo "$as_me:$LINENO: checking if MPI_File_set_size works for files over 2GB" >&5
-+$as_echo_n "checking if MPI_File_set_size works for files over 2GB... " >&6; }
-   if test "${hdf5_cv_mpi_file_set_size_big+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   hdf5_cv_mpi_file_set_size_big=yes
- fi
-@@ -49468,11 +48520,11 @@
- #define MPI_FILE_SET_SIZE_BIG 1
- _ACEOF
- 
--    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-   else
--    { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-   fi
- 
- # Check whether --enable-mpi-size was given.
-@@ -49481,19 +48533,19 @@
- fi
- 
- 
--{ echo "$as_me:$LINENO: checking if MPI_File_get_size is enabled" >&5
--echo $ECHO_N "checking if MPI_File_get_size is enabled... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if MPI_File_get_size is enabled" >&5
-+$as_echo_n "checking if MPI_File_get_size is enabled... " >&6; }
- 
- 
- case "X-$MPI_GET_SIZE" in
-   X-no)
--    { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     MPI_GET_SIZE=no
-     ;;
-   X-yes|*)
--    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-     MPI_GET_SIZE=yes
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -49503,11 +48555,11 @@
-     ;;
- esac
- 
--{ echo "$as_me:$LINENO: checking if irregular hyperslab optimization code works inside MPI-IO" >&5
--echo $ECHO_N "checking if irregular hyperslab optimization code works inside MPI-IO... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if irregular hyperslab optimization code works inside MPI-IO" >&5
-+$as_echo_n "checking if irregular hyperslab optimization code works inside MPI-IO... " >&6; }
- 
- if test "${hdf5_mpi_complex_derived_datatype_works+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   hdf5_mpi_complex_derived_datatype_works=yes
- fi
-@@ -49519,19 +48571,19 @@
- #define MPI_COMPLEX_DERIVED_DATATYPE_WORKS 1
- _ACEOF
- 
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
- 
--{ echo "$as_me:$LINENO: checking if MPI-IO can do collective IO when one or more processes don't do IOs" >&5
--echo $ECHO_N "checking if MPI-IO can do collective IO when one or more processes don't do IOs... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if MPI-IO can do collective IO when one or more processes don't do IOs" >&5
-+$as_echo_n "checking if MPI-IO can do collective IO when one or more processes don't do IOs... " >&6; }
- 
- if test "${hdf5_mpi_special_collective_io_works+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   hdf5_mpi_special_collective_io_works=yes
- fi
-@@ -49543,11 +48595,11 @@
- #define MPI_SPECIAL_COLLECTIVE_IO_WORKS 1
- _ACEOF
- 
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- fi
++    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=$?
  
-@@ -49556,8 +48608,8 @@
-  USE_FILTER_FLETCHER32="no"
-  USE_FILTER_NBIT="no"
-  USE_FILTER_SCALEOFFSET="no"
--{ echo "$as_me:$LINENO: checking for I/O filters" >&5
--echo $ECHO_N "checking for I/O filters... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for I/O filters" >&5
-+$as_echo_n "checking for I/O filters... " >&6; }
- # Check whether --enable-filters was given.
- if test "${enable_filters+set}" = set; then
-   enableval=$enable_filters; FILTERS=$enableval
-@@ -49568,17 +48620,17 @@
- case "X-$FILTERS" in
-   X-|X-all)
-     FILTERS=$all_filters
--    { echo "$as_me:$LINENO: result: all ($FILTERS)" >&5
--echo "${ECHO_T}all ($FILTERS)" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: all ($FILTERS)" >&5
-+$as_echo "all ($FILTERS)" >&6; }
-     ;;
-   X-no|X-none)
--    { echo "$as_me:$LINENO: result: none" >&5
--echo "${ECHO_T}none" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: none" >&5
-+$as_echo "none" >&6; }
-     FILTERS="none"
-     ;;
-   *)
--    { echo "$as_me:$LINENO: result: $FILTERS" >&5
--echo "${ECHO_T}$FILTERS" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: $FILTERS" >&5
-+$as_echo "$FILTERS" >&6; }
-     ;;
- esac
+-  if test -f "$tmpdepfile"; then :
+-  else
+-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
+-    tmpdepfile="$stripped.u"
+-  fi
+-
+   if test $stat -eq 0; then :
+   else
+-    rm -f "$tmpdepfile"
++    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+     exit $stat
+   fi
  
-@@ -49628,8 +48680,8 @@
- fi
++  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
++  do
++    test -f "$tmpdepfile" && break
++  done
+   if test -f "$tmpdepfile"; then
+-    outname="$stripped.o"
+     # Each line is of the form `foo.o: dependent.h'.
+     # Do two passes, one to just change these to
+     # `$object: dependent.h' and one to simply `dependent.h:'.
+-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
++    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
++    # That's a tab and a space in the [].
++    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+     # The sourcefile does not contain any dependencies, so just
+     # store a dummy comment line, to avoid errors with the Makefile
+@@ -276,6 +302,51 @@
+   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.
++  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++  test "x$dir" = "x$object" && dir=
++  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
++  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 -eq 0; then :
++  else
++     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,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
++    # Add `dependent.h:' lines.
++    sed -ne '2,${
++	       s/^ *//
++	       s/ \\*$//
++	       s/$/:/
++	       p
++	     }' "$tmpdepfile" >> "$depfile"
++  else
++    echo "#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'.
+@@ -288,13 +359,13 @@
  
--{ echo "$as_me:$LINENO: checking for Default Virtual File Driver definition" >&5
--echo $ECHO_N "checking for Default Virtual File Driver definition... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for Default Virtual File Driver definition" >&5
-+$as_echo_n "checking for Default Virtual File Driver definition... " >&6; }
+    if test "$libtool" = yes; then
+       # With Tru64 cc, shared objects can also be used to make a
+-      # static library.  This mecanism is used in libtool 1.4 series to
++      # static library.  This mechanism is used in libtool 1.4 series to
+       # handle both shared and static libraries in a single compilation.
+       # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+       #
+       # With libtool 1.5 this exception was removed, and libtool now
+       # generates 2 separate objects for the 2 libraries.  These two
+-      # compilations output dependencies in in $dir.libs/$base.o.d and
++      # 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
+@@ -345,7 +416,7 @@
  
- # Check whether --with-default-vfd was given.
- if test "${with_default_vfd+set}" = set; then
-@@ -49640,18 +48692,18 @@
+   # Remove the call to Libtool.
+   if test "$libtool" = yes; then
+-    while test $1 != '--mode=compile'; do
++    while test "X$1" != 'X--mode=compile'; do
+       shift
+     done
+     shift
+@@ -396,32 +467,39 @@
+   "$@" || exit $?
+   # Remove any Libtool call
+   if test "$libtool" = yes; then
+-    while test $1 != '--mode=compile'; do
++    while test "X$1" != 'X--mode=compile'; do
+       shift
+     done
+     shift
+   fi
+   # X makedepend
+   shift
+-  cleared=no
+-  for arg in "$@"; do
++  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/^.*\././'`"
++  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+   touch "$tmpdepfile"
+   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+   rm -f "$depfile"
+@@ -441,7 +519,7 @@
  
+   # Remove the call to Libtool.
+   if test "$libtool" = yes; then
+-    while test $1 != '--mode=compile'; do
++    while test "X$1" != 'X--mode=compile'; do
+       shift
+     done
+     shift
+@@ -467,7 +545,8 @@
+   done
  
- if test "X$withval" = "Xsec2"; then
--    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-     default_vfd=yes
-     vfd_define=H5FD_SEC2
- elif test "X$withval" = "Xstdio"; then
--    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-     default_vfd=yes
-     vfd_define=H5FD_STDIO
- else
--    { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     default_vfd=no
- fi
+   "$@" -E |
+-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
++    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"
+@@ -478,13 +557,27 @@
  
-@@ -49664,8 +48716,8 @@
- fi
+ msvisualcpp)
+   # Important note: in order to support this mode, a compiler *must*
+-  # always write the preprocessed file to stdout, regardless of -o,
+-  # because we must use -o when running libtool.
++  # 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
+@@ -497,16 +590,23 @@
+ 	;;
+     esac
+   done
+-  "$@" -E |
+-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
++  "$@" -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"
+-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
++  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+   echo "	" >> "$depfile"
+-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$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 "$@"
+   ;;
+@@ -525,5 +625,6 @@
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+-# time-stamp-end: "$"
++# time-stamp-time-zone: "UTC"
++# time-stamp-end: "; # UTC"
+ # End:
+diff -urN hdf5-1.8.4.orig/bin/ltmain.sh hdf5-1.8.4/bin/ltmain.sh
+--- hdf5-1.8.4.orig/bin/ltmain.sh	2009-11-10 22:12:09.000000000 +0100
++++ hdf5-1.8.4/bin/ltmain.sh	2009-12-21 16:07:49.000000000 +0100
+@@ -1,6 +1,6 @@
+ # Generated from ltmain.m4sh.
  
--{ echo "$as_me:$LINENO: checking for Direct Virtual File Driver support" >&5
--echo $ECHO_N "checking for Direct Virtual File Driver support... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for Direct Virtual File Driver support" >&5
-+$as_echo_n "checking for Direct Virtual File Driver support... " >&6; }
+-# ltmain.sh (GNU libtool) 2.2.6
++# ltmain.sh (GNU libtool) 2.2.6b
+ # Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
  
- # Check whether --enable-direct-vfd was given.
- if test "${enable_direct_vfd+set}" = set; then
-@@ -49677,14 +48729,16 @@
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+@@ -65,7 +65,7 @@
+ #       compiler:		$LTCC
+ #       compiler flags:		$LTCFLAGS
+ #       linker:		$LD (gnu? $with_gnu_ld)
+-#       $progname:		(GNU libtool) 2.2.6
++#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2
+ #       automake:		$automake_version
+ #       autoconf:		$autoconf_version
+ #
+@@ -73,9 +73,9 @@
  
- if test "$DIRECT_VFD" = "yes"; then
-    if test "${hdf5_direct_io+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -49712,19 +48766,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -49755,36 +48811,41 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   hdf5_direct_io=yes
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION=2.2.6
++VERSION="2.2.6b Debian-2.2.6b-2"
+ TIMESTAMP=""
+-package_revision=1.3012
++package_revision=1.3017
  
- 	hdf5_direct_io=no
- fi
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+@@ -116,15 +116,15 @@
  
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $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
+ : ${CP="cp -f"}
+ : ${ECHO="echo"}
+-: ${EGREP="/usr/bin/grep -E"}
+-: ${FGREP="/usr/bin/grep -F"}
+-: ${GREP="/usr/bin/grep"}
++: ${EGREP="/bin/grep -E"}
++: ${FGREP="/bin/grep -F"}
++: ${GREP="/bin/grep"}
+ : ${LN_S="ln -s"}
+ : ${MAKE="make"}
+ : ${MKDIR="mkdir"}
+ : ${MV="mv -f"}
+ : ${RM="rm -f"}
+-: ${SED="/opt/local/bin/gsed"}
++: ${SED="/bin/sed"}
+ : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+ : ${Xsed="$SED -e 1s/^X//"}
  
- ( exit $ac_status )
- hdf5_direct_io=no
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
+@@ -5033,7 +5033,10 @@
+ 	case $pass in
+ 	dlopen) libs="$dlfiles" ;;
+ 	dlpreopen) libs="$dlprefiles" ;;
+-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++	link)
++	  libs="$deplibs %DEPLIBS%"
++	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++	  ;;
+ 	esac
+       fi
+       if test "$linkmode,$pass" = "lib,dlpreopen"; then
+@@ -5344,19 +5347,19 @@
+ 	    # It is a libtool convenience library, so add in its objects.
+ 	    convenience="$convenience $ladir/$objdir/$old_library"
+ 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
++	    tmp_libs=
++	    for deplib in $dependency_libs; do
++	      deplibs="$deplib $deplibs"
++	      if $opt_duplicate_deps ; then
++		case "$tmp_libs " in
++		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++		esac
++	      fi
++	      tmp_libs="$tmp_libs $deplib"
++	    done
+ 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ 	    func_fatal_error "\`$lib' is not a convenience library"
+ 	  fi
+-	  tmp_libs=
+-	  for deplib in $dependency_libs; do
+-	    deplibs="$deplib $deplibs"
+-	    if $opt_duplicate_deps ; then
+-	      case "$tmp_libs " in
+-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	      esac
+-	    fi
+-	    tmp_libs="$tmp_libs $deplib"
+-	  done
+ 	  continue
+ 	fi # $pass = conv
  
-@@ -49793,21 +48854,21 @@
+@@ -5893,6 +5896,7 @@
+ 	  if test "$link_all_deplibs" != no; then
+ 	    # Add the search paths of all dependency libraries
+ 	    for deplib in $dependency_libs; do
++	      path=
+ 	      case $deplib in
+ 	      -L*) path="$deplib" ;;
+ 	      *.la)
+@@ -6206,6 +6210,9 @@
+ 	    revision="$number_minor"
+ 	    lt_irix_increment=no
+ 	    ;;
++	  *)
++	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
++	    ;;
+ 	  esac
+ 	  ;;
+ 	no)
+diff -urN hdf5-1.8.4.orig/bin/missing hdf5-1.8.4/bin/missing
+--- hdf5-1.8.4.orig/bin/missing	2009-11-10 22:12:09.000000000 +0100
++++ hdf5-1.8.4/bin/missing	2009-12-21 16:07:59.000000000 +0100
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Common stub for a few missing GNU programs while installing.
  
+-scriptversion=2005-02-08.22
++scriptversion=2009-04-28.21; # UTC
  
-    if test ${hdf5_direct_io} = "yes"; then
--      { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
+-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+-#   Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
++# 2008, 2009 Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
  
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_DIRECT 1
- _ACEOF
+ # This program is free software; you can redistribute it and/or modify
+@@ -18,9 +18,7 @@
+ # GNU General Public License for more details.
  
-    else
--      { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-       DIRECT_VFD=no
-    fi
- else
--      { echo "$as_me:$LINENO: result: suppressed" >&5
--echo "${ECHO_T}suppressed" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: suppressed" >&5
-+$as_echo "suppressed" >&6; }
- fi
+ # 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.
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
-  if test "X$DIRECT_VFD" = "Xyes"; then
-@@ -49819,8 +48880,8 @@
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -33,6 +31,8 @@
  fi
  
+ run=:
++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
++sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
  
--{ echo "$as_me:$LINENO: checking whether exception handling functions is checked during data conversions" >&5
--echo $ECHO_N "checking whether exception handling functions is checked during data conversions... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether exception handling functions is checked during data conversions" >&5
-+$as_echo_n "checking whether exception handling functions is checked during data conversions... " >&6; }
- # Check whether --enable-dconv-exception was given.
- if test "${enable_dconv_exception+set}" = set; then
-   enableval=$enable_dconv_exception; DCONV_EXCEPTION=$enableval
-@@ -49830,20 +48891,20 @@
- 
- 
- if test "$DCONV_EXCEPTION" = "yes"; then
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define WANT_DCONV_EXCEPTION 1
- _ACEOF
- 
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
--{ echo "$as_me:$LINENO: checking whether data accuracy is guaranteed during data conversions" >&5
--echo $ECHO_N "checking whether data accuracy is guaranteed during data conversions... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking whether data accuracy is guaranteed during data conversions" >&5
-+$as_echo_n "checking whether data accuracy is guaranteed during data conversions... " >&6; }
- # Check whether --enable-dconv-accuracy was given.
- if test "${enable_dconv_accuracy+set}" = set; then
-   enableval=$enable_dconv_accuracy; DATA_ACCURACY=$enableval
-@@ -49853,22 +48914,22 @@
+ # In the cases where this matters, `missing' is being run in the
+ # srcdir already.
+@@ -44,7 +44,7 @@
  
+ msg="missing on your system"
  
- if test "$DATA_ACCURACY" = "yes"; then
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
+-case "$1" in
++case $1 in
+ --run)
+   # Try to run requested program, and just exit if it succeeds.
+   run=
+@@ -77,6 +77,7 @@
+   aclocal      touch file \`aclocal.m4'
+   autoconf     touch file \`configure'
+   autoheader   touch file \`config.h.in'
++  autom4te     touch the output file, or create a stub one
+   automake     touch all \`Makefile.in' files
+   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+   flex         create \`lex.yy.c', if possible, from existing .c
+@@ -86,6 +87,9 @@
+   tar          try tar, gnutar, gtar, then tar without non-portable flags
+   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
  
- cat >>confdefs.h <<\_ACEOF
- #define WANT_DATA_ACCURACY 1
- _ACEOF
++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 at gnu.org>."
+     exit $?
+     ;;
+@@ -103,15 +107,22 @@
  
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+ esac
  
--{ echo "$as_me:$LINENO: checking if converting denormalized floating-point values is possible" >&5
--echo $ECHO_N "checking if converting denormalized floating-point values is possible... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if converting denormalized floating-point values is possible" >&5
-+$as_echo_n "checking if converting denormalized floating-point values is possible... " >&6; }
- if test "${hdf5_cv_convert_denormal_float+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   hdf5_cv_convert_denormal_float=yes
- fi
-@@ -49880,17 +48941,17 @@
- #define CONVERT_DENORMAL_FLOAT 1
- _ACEOF
++# normalize program name to check for.
++program=`echo "$1" | sed '
++  s/^gnu-//; t
++  s/^gnu//; t
++  s/^g//; t'`
++
+ # Now exit if we have it, but it failed.  Also exit now if we
+ # don't have it and --version was passed (most likely to detect
+-# the program).
+-case "$1" in
+-  lex|yacc)
++# the program).  This is about non-GNU programs, so use $1 not
++# $program.
++case $1 in
++  lex*|yacc*)
+     # Not GNU programs, they don't have --version.
+     ;;
  
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+-  tar)
++  tar*)
+     if test -n "$run"; then
+        echo 1>&2 "ERROR: \`tar' requires --run"
+        exit 1
+@@ -135,7 +146,7 @@
  
--{ echo "$as_me:$LINENO: checking if converting floating-point values to long long is not working" >&5
--echo $ECHO_N "checking if converting floating-point values to long long is not working... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if converting floating-point values to long long is not working" >&5
-+$as_echo_n "checking if converting floating-point values to long long is not working... " >&6; }
- if test "${hdf5_cv_convert_float_llong_not_works+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   hdf5_cv_convert_float_llong_not_works=no
- fi
-@@ -49902,15 +48963,15 @@
- #define HW_FP_TO_LLONG_NOT_WORKS 1
- _ACEOF
+ # If it does not exist, or fails to run (possibly an outdated version),
+ # try to emulate it.
+-case "$1" in
++case $program in
+   aclocal*)
+     echo 1>&2 "\
+ WARNING: \`$1' is $msg.  You should only need it if
+@@ -145,7 +156,7 @@
+     touch aclocal.m4
+     ;;
  
--  { echo "$as_me:$LINENO: result: true" >&5
--echo "${ECHO_T}true" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: true" >&5
-+$as_echo "true" >&6; }
- else
--  { echo "$as_me:$LINENO: result: false" >&5
--echo "${ECHO_T}false" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: false" >&5
-+$as_echo "false" >&6; }
- fi
+-  autoconf)
++  autoconf*)
+     echo 1>&2 "\
+ WARNING: \`$1' is $msg.  You should only need it if
+          you modified \`${configure_ac}'.  You might want to install the
+@@ -154,7 +165,7 @@
+     touch configure
+     ;;
  
--{ echo "$as_me:$LINENO: checking if the machine has window style path name" >&5
--echo $ECHO_N "checking if the machine has window style path name... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if the machine has window style path name" >&5
-+$as_echo_n "checking if the machine has window style path name... " >&6; }
+-  autoheader)
++  autoheader*)
+     echo 1>&2 "\
+ WARNING: \`$1' is $msg.  You should only need it if
+          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+@@ -164,7 +175,7 @@
+     test -z "$files" && files="config.h"
+     touch_files=
+     for f in $files; do
+-      case "$f" in
++      case $f in
+       *:*) touch_files="$touch_files "`echo "$f" |
+ 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+       *) touch_files="$touch_files $f.in";;
+@@ -184,7 +195,7 @@
+ 	   while read f; do touch "$f"; done
+     ;;
  
- case "`uname`" in
-   MINGW*)
-@@ -49919,23 +48980,23 @@
- #define HAVE_WINDOW_PATH 1
- _ACEOF
+-  autom4te)
++  autom4te*)
+     echo 1>&2 "\
+ WARNING: \`$1' is needed, but is $msg.
+          You might have modified some files without having the
+@@ -192,8 +203,8 @@
+          You can get \`$1' as part of \`Autoconf' from any GNU
+          archive site."
  
--    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-     ;;
-   *)
--    { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
+-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
++    file=`echo "$*" | sed -n "$sed_output"`
++    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+     if test -f "$file"; then
+ 	touch $file
+     else
+@@ -207,80 +218,78 @@
+     fi
      ;;
- esac
  
--{ echo "$as_me:$LINENO: checking if converting from long double to integers is accurate" >&5
--echo $ECHO_N "checking if converting from long double to integers is accurate... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if converting from long double to integers is accurate" >&5
-+$as_echo_n "checking if converting from long double to integers is accurate... " >&6; }
- 
- if test ${ac_cv_sizeof_long_double} = 0; then
-    hdf5_ldouble_to_integer_accurate=${hdf5_ldouble_to_integer_accurate=no}
- else
-    if test "${hdf5_cv_ldouble_to_integer_accurate+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   hdf5_cv_ldouble_to_integer_accurate=yes
- fi
-@@ -49948,29 +49009,31 @@
- #define LDOUBLE_TO_INTEGER_ACCURATE 1
- _ACEOF
+-  bison|yacc)
++  bison*|yacc*)
+     echo 1>&2 "\
+ WARNING: \`$1' $msg.  You should only need it if
+          you modified a \`.y' file.  You may need the \`Bison' package
+          in order for those modifications to take effect.  You can get
+          \`Bison' from any GNU archive site."
+     rm -f y.tab.c y.tab.h
+-    if [ $# -ne 1 ]; then
++    if test $# -ne 1; then
+         eval LASTARG="\${$#}"
+-	case "$LASTARG" in
++	case $LASTARG in
+ 	*.y)
+ 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+-	    if [ -f "$SRCFILE" ]; then
++	    if test -f "$SRCFILE"; then
+ 	         cp "$SRCFILE" y.tab.c
+ 	    fi
+ 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+-	    if [ -f "$SRCFILE" ]; then
++	    if test -f "$SRCFILE"; then
+ 	         cp "$SRCFILE" y.tab.h
+ 	    fi
+ 	  ;;
+ 	esac
+     fi
+-    if [ ! -f y.tab.h ]; then
++    if test ! -f y.tab.h; then
+ 	echo >y.tab.h
+     fi
+-    if [ ! -f y.tab.c ]; then
++    if test ! -f y.tab.c; then
+ 	echo 'main() { return 0; }' >y.tab.c
+     fi
+     ;;
  
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+-  lex|flex)
++  lex*|flex*)
+     echo 1>&2 "\
+ WARNING: \`$1' is $msg.  You should only need it if
+          you modified a \`.l' file.  You may need the \`Flex' package
+          in order for those modifications to take effect.  You can get
+          \`Flex' from any GNU archive site."
+     rm -f lex.yy.c
+-    if [ $# -ne 1 ]; then
++    if test $# -ne 1; then
+         eval LASTARG="\${$#}"
+-	case "$LASTARG" in
++	case $LASTARG in
+ 	*.l)
+ 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+-	    if [ -f "$SRCFILE" ]; then
++	    if test -f "$SRCFILE"; then
+ 	         cp "$SRCFILE" lex.yy.c
+ 	    fi
+ 	  ;;
+ 	esac
+     fi
+-    if [ ! -f lex.yy.c ]; then
++    if test ! -f lex.yy.c; then
+ 	echo 'main() { return 0; }' >lex.yy.c
+     fi
+     ;;
  
+-  help2man)
++  help2man*)
+     echo 1>&2 "\
+ WARNING: \`$1' is $msg.  You should only need it if
+ 	 you modified a dependency of a manual page.  You may need the
+ 	 \`Help2man' package in order for those modifications to take
+ 	 effect.  You can get \`Help2man' from any GNU archive site."
  
--{ echo "$as_me:$LINENO: checking if converting from long double to integers works" >&5
--echo $ECHO_N "checking if converting from long double to integers works... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if converting from long double to integers works" >&5
-+$as_echo_n "checking if converting from long double to integers works... " >&6; }
+-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+-    if test -z "$file"; then
+-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+-    fi
+-    if [ -f "$file" ]; then
++    file=`echo "$*" | sed -n "$sed_output"`
++    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++    if test -f "$file"; then
+ 	touch $file
+     else
+ 	test -z "$file" || exec >$file
+ 	echo ".ab help2man is required to generate this page"
+-	exit 1
++	exit $?
+     fi
+     ;;
  
- if test ${ac_cv_sizeof_long_double} = 0; then
-    hdf5_ldouble_to_integer_works=${hdf5_ldouble_to_integer_works=no}
- else
-    if test "${hdf5_ldouble_to_integer_works+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -50008,29 +49071,32 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   hdf5_ldouble_to_integer_works=yes
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $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
+-  makeinfo)
++  makeinfo*)
+     echo 1>&2 "\
+ WARNING: \`$1' is $msg.  You should only need it if
+          you modified a \`.texi' or \`.texinfo' file, or any other file
+@@ -289,18 +298,27 @@
+          DU, IRIX).  You might want to install the \`Texinfo' package or
+          the \`GNU make' package.  Grab either from any GNU archive site."
+     # The file to touch is that specified with -o ...
+-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
++    file=`echo "$*" | sed -n "$sed_output"`
++    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+     if test -z "$file"; then
+       # ... or it is the one specified with @setfilename ...
+       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
++      file=`sed -n '
++	/^@setfilename/{
++	  s/.* \([^ ]*\) *$/\1/
++	  p
++	  q
++	}' $infile`
+       # ... or it is derived from the source name (dir/f.texi becomes f.info)
+       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+     fi
++    # If the file does not exist, the user really needs makeinfo;
++    # let's fail without touching anything.
++    test -f $file || exit 1
+     touch $file
+     ;;
  
- ( exit $ac_status )
- hdf5_ldouble_to_integer_works=no
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
+-  tar)
++  tar*)
+     shift
  
-@@ -50045,21 +49111,21 @@
- #define LDOUBLE_TO_INTEGER_WORKS 1
- _ACEOF
+     # We have already tried tar in the generic part.
+@@ -314,13 +332,13 @@
+     fi
+     firstarg="$1"
+     if shift; then
+-	case "$firstarg" in
++	case $firstarg in
+ 	*o*)
+ 	    firstarg=`echo "$firstarg" | sed s/o//`
+ 	    tar "$firstarg" "$@" && exit 0
+ 	    ;;
+ 	esac
+-	case "$firstarg" in
++	case $firstarg in
+ 	*h*)
+ 	    firstarg=`echo "$firstarg" | sed s/h//`
+ 	    tar "$firstarg" "$@" && exit 0
+@@ -353,5 +371,6 @@
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
+ # time-stamp-format: "%:y-%02m-%02d.%02H"
+-# time-stamp-end: "$"
++# time-stamp-time-zone: "UTC"
++# time-stamp-end: "; # UTC"
+ # End:
+diff -urN hdf5-1.8.4.orig/bin/mkinstalldirs hdf5-1.8.4/bin/mkinstalldirs
+--- hdf5-1.8.4.orig/bin/mkinstalldirs	2009-11-10 22:12:09.000000000 +0100
++++ hdf5-1.8.4/bin/mkinstalldirs	2009-12-21 16:08:05.000000000 +0100
+@@ -1,31 +1,59 @@
+ #! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+-# Author: Noah Friedman <friedman at prep.ai.mit.edu>
+-# Created: 1993-05-16
+-# Public domain
  
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+-# $Id: mkinstalldirs 9902 2005-02-01 04:17:02Z jlaird $
++scriptversion=2009-04-28.21; # UTC
  
--{ echo "$as_me:$LINENO: checking if accurately converting from integers to long double" >&5
--echo $ECHO_N "checking if accurately converting from integers to long double... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if accurately converting from integers to long double" >&5
-+$as_echo_n "checking if accurately converting from integers to long double... " >&6; }
++# Original author: Noah Friedman <friedman at prep.ai.mit.edu>
++# Created: 1993-05-16
++# Public domain.
++#
++# This file is maintained in Automake, please report
++# bugs to <bug-automake at gnu.org> or send patches to
++# <automake-patches at gnu.org>.
++
++nl='
++'
++IFS=" ""	$nl"
+ errstatus=0
+-dirmode=""
++dirmode=
  
- if test ${ac_cv_sizeof_long_double} = 0; then
-    hdf5_cv_integer_to_ldouble_accurate=${hdf5_cv_integer_to_ldouble_accurate=no}
- else
-    if test "${hdf5_cv_integer_to_ldouble_accurate+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   hdf5_cv_integer_to_ldouble_accurate=yes
- fi
-@@ -50072,26 +49138,28 @@
- #define INTEGER_TO_LDOUBLE_ACCURATE 1
- _ACEOF
+ usage="\
+-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
++Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
++
++Create each directory DIR (with mode MODE, if specified), including all
++leading file name components.
++
++Report bugs to <bug-automake at gnu.org>."
  
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+ # process command line arguments
+ while test $# -gt 0 ; do
+-   case "${1}" in
+-     -h | --help | --h* )			# -h for help
+-	echo "${usage}" 1>&2; exit 0 ;;
+-     -m )					# -m PERM arg
+-	shift
+-	test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
+-	dirmode="${1}"
+-	shift ;;
+-     -- ) shift; break ;;			# stop option processing
+-     -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
+-     * )  break ;;				# first non-opt arg
+-   esac
++  case $1 in
++    -h | --help | --h*)         # -h for help
++      echo "$usage"
++      exit $?
++      ;;
++    -m)                         # -m PERM arg
++      shift
++      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
++      dirmode=$1
++      shift
++      ;;
++    --version)
++      echo "$0 $scriptversion"
++      exit $?
++      ;;
++    --)                         # stop option processing
++      shift
++      break
++      ;;
++    -*)                         # unknown option
++      echo "$usage" 1>&2
++      exit 1
++      ;;
++    *)                          # first non-opt arg
++      break
++      ;;
++  esac
+ done
  
--{ echo "$as_me:$LINENO: checking if accurately converting unsigned long long to floating-point values" >&5
--echo $ECHO_N "checking if accurately converting unsigned long long to floating-point values... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if accurately converting unsigned long long to floating-point values" >&5
-+$as_echo_n "checking if accurately converting unsigned long long to floating-point values... " >&6; }
+ for file
+@@ -38,64 +66,97 @@
+ done
  
- if test ${host_os_novers} = "solaris2.x"; then
-     if test "${hdf5_cv_ulong_to_fp_bottom_bit_accurate+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -50166,29 +49234,32 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
+ case $# in
+-0) exit 0 ;;
++  0) exit 0 ;;
  esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   hdf5_cv_ulong_to_fp_bottom_bit_accurate=yes
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
- hdf5_cv_ulong_to_fp_bottom_bit_accurate=no
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
-@@ -50197,7 +49268,7 @@
  
- else
-     if test "${hdf5_cv_ulong_to_fp_bottom_bit_accurate+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   hdf5_cv_ulong_to_fp_bottom_bit_accurate=yes
- fi
-@@ -50210,25 +49281,27 @@
- #define ULONG_TO_FP_BOTTOM_BIT_ACCURATE 1
- _ACEOF
++# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
++# mkdir -p a/c at the same time, both will detect that a is missing,
++# one will create a, then the other will try to create a and die with
++# a "File exists" error.  This is a problem when calling mkinstalldirs
++# from a parallel make.  We use --version in the probe to restrict
++# ourselves to GNU mkdir, which is thread-safe.
+ case $dirmode in
+-'')
+-  if mkdir -p -- . 2>/dev/null; then
+-    echo "mkdir -p -- $*"
+-    exec mkdir -p -- "$@"
+-  fi ;;
+-*)
+-  if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+-    echo "mkdir -m $dirmode -p -- $*"
+-    exec mkdir -m "$dirmode" -p -- "$@"
+-  fi ;;
++  '')
++    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
++      echo "mkdir -p -- $*"
++      exec mkdir -p -- "$@"
++    else
++      # On NextStep and OpenStep, the `mkdir' command does not
++      # recognize any option.  It will interpret all options as
++      # directories to create, and then abort because `.' already
++      # exists.
++      test -d ./-p && rmdir ./-p
++      test -d ./--version && rmdir ./--version
++    fi
++    ;;
++  *)
++    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
++       test ! -d ./--version; then
++      echo "mkdir -m $dirmode -p -- $*"
++      exec mkdir -m "$dirmode" -p -- "$@"
++    else
++      # Clean up after NextStep and OpenStep mkdir.
++      for d in ./-m ./-p ./--version "./$dirmode";
++      do
++        test -d $d && rmdir $d
++      done
++    fi
++    ;;
+ esac
  
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+ for file
+ do
+-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+-   shift
++  case $file in
++    /*) pathcomp=/ ;;
++    *)  pathcomp= ;;
++  esac
++  oIFS=$IFS
++  IFS=/
++  set fnord $file
++  shift
++  IFS=$oIFS
++
++  for d
++  do
++    test "x$d" = x && continue
++
++    pathcomp=$pathcomp$d
++    case $pathcomp in
++      -*) pathcomp=./$pathcomp ;;
++    esac
++
++    if test ! -d "$pathcomp"; then
++      echo "mkdir $pathcomp"
++
++      mkdir "$pathcomp" || lasterr=$?
++
++      if test ! -d "$pathcomp"; then
++	errstatus=$lasterr
++      else
++	if test ! -z "$dirmode"; then
++	  echo "chmod $dirmode $pathcomp"
++	  lasterr=
++	  chmod "$dirmode" "$pathcomp" || lasterr=$?
  
--{ echo "$as_me:$LINENO: checking if accurately roundup converting floating-point to unsigned long long values" >&5
--echo $ECHO_N "checking if accurately roundup converting floating-point to unsigned long long values... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if accurately roundup converting floating-point to unsigned long long values" >&5
-+$as_echo_n "checking if accurately roundup converting floating-point to unsigned long long values... " >&6; }
+-   pathcomp=
+-   for d
+-   do
+-     pathcomp="$pathcomp$d"
+-     case "$pathcomp" in
+-       -* ) pathcomp=./$pathcomp ;;
+-     esac
+-
+-     if test ! -d "$pathcomp"; then
+-	echo "mkdir $pathcomp"
+-
+-	mkdir "$pathcomp" || lasterr=$?
+-
+-	if test ! -d "$pathcomp"; then
+-	  errstatus=$lasterr
+-	else
+-	  if test ! -z "$dirmode"; then
+-	     echo "chmod $dirmode $pathcomp"
+-
+-	     lasterr=""
+-	     chmod "$dirmode" "$pathcomp" || lasterr=$?
+-
+-	     if test ! -z "$lasterr"; then
+-	       errstatus=$lasterr
+-	     fi
++	  if test ! -z "$lasterr"; then
++	    errstatus=$lasterr
+ 	  fi
+ 	fi
+-     fi
++      fi
++    fi
  
- if test "${hdf5_fp_to_ullong_accurate+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -50261,29 +49334,32 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   hdf5_fp_to_ullong_accurate=yes
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $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
+-     pathcomp="$pathcomp/"
+-   done
++    pathcomp=$pathcomp/
++  done
+ done
  
- ( exit $ac_status )
- hdf5_fp_to_ullong_accurate=no
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
+ exit $errstatus
  
-@@ -50297,25 +49373,27 @@
- #define FP_TO_ULLONG_ACCURATE 1
- _ACEOF
+ # Local Variables:
+ # mode: shell-script
+-# sh-indentation: 3
++# 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:
+-# mkinstalldirs ends here
+diff -urN hdf5-1.8.4.orig/configure hdf5-1.8.4/configure
+--- hdf5-1.8.4.orig/configure	2009-11-10 22:12:10.000000000 +0100
++++ hdf5-1.8.4/configure	2009-12-21 16:07:56.000000000 +0100
+@@ -1,13 +1,15 @@
+ #! /bin/sh
+-# From configure.in Id: configure.in 17841 2009-11-05 19:40:39Z acheng .
++# From configure.in Id: configure.in 17851 2009-11-09 16:28:35Z epourmal .
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.64 for HDF5 1.8.4.
++# Generated by GNU Autoconf 2.65 for HDF5 1.8.4.
+ #
+ # Report bugs to <help at hdfgroup.org>.
+ #
++#
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+-# Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
++#
+ #
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+@@ -677,7 +679,8 @@
+ 
+ 
+ 
+-exec 7<&0 </dev/null 6>&1
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
+ 
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+@@ -1753,7 +1756,7 @@
+   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    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+               you have headers in a nonstandard directory <include dir>
+   FC          Fortran compiler command
+   FCFLAGS     Fortran compiler flags
+@@ -1829,7 +1832,7 @@
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ HDF5 configure 1.8.4
+-generated by GNU Autoconf 2.64
++generated by GNU Autoconf 2.65
  
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
+ Copyright (C) 2009 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+@@ -1876,7 +1879,7 @@
+ 	ac_retval=1
  fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
++  as_fn_set_status $ac_retval
  
--{ echo "$as_me:$LINENO: checking if right maximum converting floating-point to unsigned long long values" >&5
--echo $ECHO_N "checking if right maximum converting floating-point to unsigned long long values... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if right maximum converting floating-point to unsigned long long values" >&5
-+$as_echo_n "checking if right maximum converting floating-point to unsigned long long values... " >&6; }
- 
- if test "${hdf5_fp_to_ullong_right_maximum+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -50355,29 +49433,32 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   hdf5_fp_to_ullong_right_maximum=yes
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $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_fn_c_try_compile
  
- ( exit $ac_status )
- hdf5_fp_to_ullong_right_maximum=no
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+@@ -1914,7 +1917,7 @@
+ 	ac_retval=1
  fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
++  as_fn_set_status $ac_retval
  
-@@ -50391,28 +49472,30 @@
- #define FP_TO_ULLONG_RIGHT_MAXIMUM 1
- _ACEOF
- 
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+ } # ac_fn_fc_try_compile
  
--{ echo "$as_me:$LINENO: checking if correctly converting long double to unsigned int values" >&5
--echo $ECHO_N "checking if correctly converting long double to unsigned int values... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if correctly converting long double to unsigned int values" >&5
-+$as_echo_n "checking if correctly converting long double to unsigned int values... " >&6; }
+@@ -1960,7 +1963,7 @@
+   # 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
++  as_fn_set_status $ac_retval
  
- if test ${ac_cv_sizeof_long_double} = 0; then
-    hdf5_ldouble_to_uint_accurate=${hdf5_ldouble_to_uint_accurate=no}
- else
-    if test "${hdf5_ldouble_to_uint_accurate+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -50442,29 +49525,32 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   hdf5_ldouble_to_uint_accurate=yes
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $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_fn_c_try_link
  
- ( exit $ac_status )
- hdf5_ldouble_to_uint_accurate=no
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+@@ -2002,7 +2005,7 @@
  fi
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
++  as_fn_set_status $ac_retval
  
-@@ -50479,17 +49565,17 @@
- #define LDOUBLE_TO_UINT_ACCURATE 1
- _ACEOF
+ } # ac_fn_fc_try_run
  
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
+@@ -2040,7 +2043,7 @@
+ 	ac_retval=1
  fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
++  as_fn_set_status $ac_retval
  
--{ echo "$as_me:$LINENO: checking if compiling unsigned long long to floating-point typecasts work" >&5
--echo $ECHO_N "checking if compiling unsigned long long to floating-point typecasts work... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if compiling unsigned long long to floating-point typecasts work" >&5
-+$as_echo_n "checking if compiling unsigned long long to floating-point typecasts work... " >&6; }
- if test "${hdf5_cv_ullong_to_fp_cast_works+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   hdf5_cv_ullong_to_fp_cast_works=yes
- fi
-@@ -50501,17 +49587,17 @@
- #define ULLONG_TO_FP_CAST_WORKS 1
- _ACEOF
+ } # ac_fn_cxx_try_compile
  
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
+@@ -2077,7 +2080,7 @@
+     ac_retval=1
  fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
++  as_fn_set_status $ac_retval
  
--{ echo "$as_me:$LINENO: checking if compiling long long to floating-point typecasts work" >&5
--echo $ECHO_N "checking if compiling long long to floating-point typecasts work... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if compiling long long to floating-point typecasts work" >&5
-+$as_echo_n "checking if compiling long long to floating-point typecasts work... " >&6; }
- if test "${hdf5_cv_llong_to_fp_cast_works+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   hdf5_cv_llong_to_fp_cast_works=yes
- fi
-@@ -50523,28 +49609,30 @@
- #define LLONG_TO_FP_CAST_WORKS 1
- _ACEOF
+ } # ac_fn_cxx_try_cpp
  
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
+@@ -2119,7 +2122,7 @@
  fi
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
++  as_fn_set_status $ac_retval
  
--{ echo "$as_me:$LINENO: checking if converting unsigned long long to long double with precision" >&5
--echo $ECHO_N "checking if converting unsigned long long to long double with precision... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if converting unsigned long long to long double with precision" >&5
-+$as_echo_n "checking if converting unsigned long long to long double with precision... " >&6; }
- 
- if test ${ac_cv_sizeof_long_double} = 0; then
-    hdf5_cv_ullong_to_ldouble_precision=${hdf5_cv_ullong_to_ldouble_precision=no}
- else
-    if test "${hdf5_cv_ullong_to_ldouble_precision+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -50631,29 +49719,32 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   hdf5_cv_ullong_to_ldouble_precision=yes
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $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_fn_cxx_try_run
  
- ( exit $ac_status )
- hdf5_cv_ullong_to_ldouble_precision=no
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+@@ -2187,7 +2190,7 @@
+     ac_retval=1
  fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
++  as_fn_set_status $ac_retval
  
-@@ -50668,25 +49759,27 @@
- #define ULLONG_TO_LDOUBLE_PRECISION 1
- _ACEOF
+ } # ac_fn_c_try_cpp
  
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
+@@ -2229,7 +2232,7 @@
  fi
+   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
++  as_fn_set_status $ac_retval
  
--{ echo "$as_me:$LINENO: checking if overflows normally converting floating-point to integer values" >&5
--echo $ECHO_N "checking if overflows normally converting floating-point to integer values... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if overflows normally converting floating-point to integer values" >&5
-+$as_echo_n "checking if overflows normally converting floating-point to integer values... " >&6; }
- 
- if test "${hdf5_cv_fp_to_integer_overflow_works+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -50713,29 +49806,32 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   hdf5_cv_fp_to_integer_overflow_works=yes
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $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_fn_c_try_run
  
- ( exit $ac_status )
- hdf5_cv_fp_to_integer_overflow_works=no
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
+@@ -2350,7 +2353,7 @@
+   # 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
++  as_fn_set_status $ac_retval
  
-@@ -50749,28 +49845,30 @@
- #define FP_TO_INTEGER_OVERFLOW_WORKS 1
- _ACEOF
+ } # ac_fn_cxx_try_link
  
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+@@ -2396,7 +2399,7 @@
+   # 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
++  as_fn_set_status $ac_retval
  
--{ echo "$as_me:$LINENO: checking if correctly converting long double to (unsigned) long long values" >&5
--echo $ECHO_N "checking if correctly converting long double to (unsigned) long long values... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if correctly converting long double to (unsigned) long long values" >&5
-+$as_echo_n "checking if correctly converting long double to (unsigned) long long values... " >&6; }
+ } # ac_fn_fc_try_link
  
- if test ${ac_cv_sizeof_long_double} = 0; then
-    hdf5_ldouble_to_llong_accurate=${hdf5_ldouble_to_llong_accurate=no}
- else
-    if test "${hdf5_ldouble_to_llong_accurate+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -50823,29 +49921,32 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   hdf5_ldouble_to_llong_accurate=yes
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $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
+@@ -2785,7 +2788,7 @@
  
- ( exit $ac_status )
- hdf5_ldouble_to_llong_accurate=no
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
+   fi
+   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+-  return $ac_retval
++  as_fn_set_status $ac_retval
  
-@@ -50860,28 +49961,30 @@
- #define LDOUBLE_TO_LLONG_ACCURATE 1
- _ACEOF
+ } # ac_fn_c_compute_int
  
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+@@ -2913,7 +2916,7 @@
+ running configure, to aid debugging if configure makes a mistake.
  
--{ echo "$as_me:$LINENO: checking if correctly converting (unsigned) long long to long double values" >&5
--echo $ECHO_N "checking if correctly converting (unsigned) long long to long double values... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if correctly converting (unsigned) long long to long double values" >&5
-+$as_echo_n "checking if correctly converting (unsigned) long long to long double values... " >&6; }
+ It was created by HDF5 $as_me 1.8.4, which was
+-generated by GNU Autoconf 2.64.  Invocation command line was
++generated by GNU Autoconf 2.65.  Invocation command line was
  
- if test ${ac_cv_sizeof_long_double} = 0; then
-    hdf5_llong_to_ldouble_correct=${hdf5_llong_to_ldouble_correct=no}
- else
-    if test "${hdf5_llong_to_ldouble_correct+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
-+$as_echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+   { (exit 1); exit 1; }; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -50938,29 +50041,32 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   hdf5_llong_to_ldouble_correct=yes
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $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
+   $ $0 $@
  
- ( exit $ac_status )
- hdf5_llong_to_ldouble_correct=no
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
+@@ -3166,7 +3169,7 @@
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+ do
+   test "x$ac_site_file" = xNONE && continue
+-  if test -r "$ac_site_file"; then
++  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
+@@ -3175,9 +3178,9 @@
+ done
  
-@@ -50975,17 +50081,17 @@
- #define LLONG_TO_LDOUBLE_CORRECT 1
- _ACEOF
+ if test -r "$cache_file"; then
+-  # Some versions of bash will fail to source /dev/null (special
+-  # files actually), so we avoid doing that.
+-  if test -f "$cache_file"; then
++  # 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
+@@ -3601,6 +3604,7 @@
  
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
  fi
  
--{ echo "$as_me:$LINENO: checking if bad code for log2 routine is generated" >&5
--echo $ECHO_N "checking if bad code for log2 routine is generated... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if bad code for log2 routine is generated" >&5
-+$as_echo_n "checking if bad code for log2 routine is generated... " >&6; }
- if test "${hdf5_cv_bad_log2_code_generated+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   hdf5_cv_bad_log2_code_generated=no
++  test -d ./--version && rmdir ./--version
+   if test "${ac_cv_path_mkdir+set}" = set; then
+     MKDIR_P="$ac_cv_path_mkdir -p"
+   else
+@@ -3608,7 +3612,6 @@
+     # value for MKDIR_P within a source directory, because that will
+     # break other packages using the cache if that directory is
+     # removed, or if the value is a relative name.
+-    test -d ./--version && rmdir ./--version
+     MKDIR_P="$ac_install_sh -d"
+   fi
  fi
-@@ -50997,11 +50103,11 @@
- #define BAD_LOG2_CODE_GENERATED 1
- _ACEOF
+@@ -4382,32 +4385,30 @@
+ ... rest of stderr output deleted ...
+          10q' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+-    rm -f conftest.er1 conftest.err
+   fi
++  rm -f conftest.er1 conftest.err
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }
+ done
  
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+  { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+ 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_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
++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 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}: 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[^ ]*//'`
  
-@@ -51097,8 +50203,8 @@
-  HL=""
- # name of fortran folder inside "hl", if FORTRAN compile is requested
-  HL_FOR=""
--{ echo "$as_me:$LINENO: checking if high level library is enabled" >&5
--echo $ECHO_N "checking if high level library is enabled... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if high level library is enabled" >&5
-+$as_echo_n "checking if high level library is enabled... " >&6; }
- # Check whether --enable-hl was given.
- if test "${enable_hl+set}" = set; then
-   enableval=$enable_hl; HDF5_HL=$enableval
-@@ -51119,8 +50225,8 @@
-  echo "no"
+ # The possible output files:
+@@ -4469,10 +4470,10 @@
+ else
+   ac_file=''
  fi
- 
--{ echo "$as_me:$LINENO: checking additional programs should be built" >&5
--echo $ECHO_N "checking additional programs should be built... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking additional programs should be built" >&5
-+$as_echo_n "checking additional programs should be built... " >&6; }
- # Check whether --enable-build-all was given.
- if test "${enable_build_all+set}" = set; then
-   enableval=$enable_build_all; BUILD_ALL=$enableval
-@@ -51144,8 +50250,8 @@
- 
- 
- 
--{ echo "$as_me:$LINENO: checking if deprecated public symbols are available" >&5
--echo $ECHO_N "checking if deprecated public symbols are available... $ECHO_C" >&6; };
-+{ $as_echo "$as_me:$LINENO: checking if deprecated public symbols are available" >&5
-+$as_echo_n "checking if deprecated public symbols are available... " >&6; };
- # Check whether --enable-deprecated-symbols was given.
- if test "${enable_deprecated_symbols+set}" = set; then
-   enableval=$enable_deprecated_symbols; DEPREC_SYMBOLS=$enableval
-@@ -51156,13 +50262,13 @@
- 
- case "X-$DEPREC_SYMBOLS" in
-   X-yes)
--    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-     DEPRECATED_SYMBOLS=yes
-     ;;
-   X-no|*)
--    { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: no" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+-$as_echo "$ac_file" >&6; }
+ if test -z "$ac_file"; then :
+-  $as_echo "$as_me: failed program was:" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
-     DEPRECATED_SYMBOLS=no
++$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
- cat >>confdefs.h <<\_ACEOF
-@@ -51174,8 +50280,8 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+@@ -4480,51 +4481,18 @@
+ { as_fn_set_status 77
+ as_fn_error "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
  
+-# 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 the C compiler works" >&5
+-$as_echo_n "checking whether the C compiler works... " >&6; }
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+-  if { ac_try='./$ac_file'
+-  { { case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${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: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+-# 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; }
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
+-
+ { $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"
+@@ -4557,13 +4525,72 @@
+ as_fn_error "cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." "$LINENO" 5; }
+ fi
+-rm -f conftest$ac_cv_exeext
++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 test "${ac_cv_objext+set}" = set; then :
+@@ -5172,8 +5199,8 @@
+ ... rest of stderr output deleted ...
+          10q' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+-    rm -f conftest.er1 conftest.err
+   fi
++  rm -f conftest.er1 conftest.err
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }
+ done
+@@ -5433,8 +5460,8 @@
+ ... rest of stderr output deleted ...
+          10q' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+-    rm -f conftest.er1 conftest.err
+   fi
++  rm -f conftest.er1 conftest.err
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }
+ done
+@@ -6494,8 +6521,8 @@
+ ... rest of stderr output deleted ...
+          10q' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+-    rm -f conftest.er1 conftest.err
+   fi
++  rm -f conftest.er1 conftest.err
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }
+ done
+@@ -7617,8 +7644,8 @@
  
--{ echo "$as_me:$LINENO: checking which version of public symbols to use by default" >&5
--echo $ECHO_N "checking which version of public symbols to use by default... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking which version of public symbols to use by default" >&5
-+$as_echo_n "checking which version of public symbols to use by default... " >&6; }
  
- # Check whether --with-default-api-version was given.
- if test "${with_default_api_version+set}" = set; then
-@@ -51186,8 +50292,8 @@
  
+-macro_version='2.2.6'
+-macro_revision='1.3012'
++macro_version='2.2.6b'
++macro_revision='1.3017'
  
- if test "X$withval" = "Xv16"; then
--    { echo "$as_me:$LINENO: result: v16" >&5
--echo "${ECHO_T}v16" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: v16" >&5
-+$as_echo "v16" >&6; }
-     DEFAULT_API_VERSION=v16
  
- cat >>confdefs.h <<\_ACEOF
-@@ -51195,25 +50301,25 @@
- _ACEOF
  
- elif test "X$withval" = "Xv18"; then
--    { echo "$as_me:$LINENO: result: v18" >&5
--echo "${ECHO_T}v18" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: v18" >&5
-+$as_echo "v18" >&6; }
-     DEFAULT_API_VERSION=v18
+@@ -8218,13 +8245,13 @@
  else
--    { { echo "$as_me:$LINENO: error: invalid version of public symbols given" >&5
--echo "$as_me: error: invalid version of public symbols given" >&2;}
-+    { { $as_echo "$as_me:$LINENO: error: invalid version of public symbols given" >&5
-+$as_echo "$as_me: error: invalid version of public symbols given" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- if test "X${DEFAULT_API_VERSION}" != "Xv18" -a "X${DEPRECATED_SYMBOLS}" = "Xno" ; then
--  { { echo "$as_me:$LINENO: error: Removing old public API symbols not allowed when using them as default public API symbols" >&5
--echo "$as_me: error: Removing old public API symbols not allowed when using them as default public API symbols" >&2;}
-+  { { $as_echo "$as_me:$LINENO: error: Removing old public API symbols not allowed when using them as default public API symbols" >&5
-+$as_echo "$as_me: error: Removing old public API symbols not allowed when using them as default public API symbols" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- 
- 
--{ echo "$as_me:$LINENO: checking Whether to perform strict file format checks" >&5
--echo $ECHO_N "checking Whether to perform strict file format checks... $ECHO_C" >&6; };
-+{ $as_echo "$as_me:$LINENO: checking Whether to perform strict file format checks" >&5
-+$as_echo_n "checking Whether to perform strict file format checks... " >&6; };
- # Check whether --enable-strict-format-checks was given.
- if test "${enable_strict_format_checks+set}" = set; then
-   enableval=$enable_strict_format_checks; STRICT_CHECKS=$enableval
-@@ -51230,8 +50336,8 @@
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:8221: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:8248: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:8224: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:8251: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:8227: output\"" >&5)
++  (eval echo "\"\$as_me:8254: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -8690,11 +8717,11 @@
+   ;;
  
- case "X-$STRICT_CHECKS" in
-   X-yes)
--    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-     STRICT_FORMAT_CHECKS=yes
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
  
- cat >>confdefs.h <<\_ACEOF
-@@ -51240,15 +50346,15 @@
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+   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
+@@ -9429,7 +9456,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 9432 "configure"' > conftest.$ac_ext
++  echo '#line 9459 "configure"' > conftest.$ac_ext
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -10613,8 +10640,8 @@
+ ... rest of stderr output deleted ...
+          10q' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+-    rm -f conftest.er1 conftest.err
+   fi
++  rm -f conftest.er1 conftest.err
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }
+ done
+@@ -11165,8 +11192,8 @@
+ ... rest of stderr output deleted ...
+          10q' conftest.err >conftest.er1
+     cat conftest.er1 >&5
+-    rm -f conftest.er1 conftest.err
+   fi
++  rm -f conftest.er1 conftest.err
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }
+ done
+@@ -11749,11 +11776,11 @@
+    -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:11752: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11779: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:11756: \$? = $ac_status" >&5
++   echo "$as_me:11783: \$? = $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.
+@@ -11918,7 +11945,7 @@
+       lt_prog_compiler_static='-non_shared'
+       ;;
  
+-    linux* | k*bsd*-gnu)
++    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+       case $cc_basename in
+       # old Intel for x86_64 which still supported -KPIC.
+       ecc*)
+@@ -12088,11 +12115,11 @@
+    -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:12091: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:12118: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:12095: \$? = $ac_status" >&5
++   echo "$as_me:12122: \$? = $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.
+@@ -12193,11 +12220,11 @@
+    -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:12196: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:12223: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:12200: \$? = $ac_status" >&5
++   echo "$as_me:12227: \$? = $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
+@@ -12248,11 +12275,11 @@
+    -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:12251: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:12278: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:12255: \$? = $ac_status" >&5
++   echo "$as_me:12282: \$? = $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
+@@ -12367,6 +12394,9 @@
+   openbsd*)
+     with_gnu_ld=no
      ;;
-   X-no|*)
--    { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-     STRICT_FORMAT_CHECKS=no
-     ;;
- esac
- 
- 
--{ echo "$as_me:$LINENO: checking Whether to have library information embedded in the executables" >&5
--echo $ECHO_N "checking Whether to have library information embedded in the executables... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking Whether to have library information embedded in the executables" >&5
-+$as_echo_n "checking Whether to have library information embedded in the executables... " >&6; }
- # Check whether --enable-embedded-libinfo was given.
- if test "${enable_embedded_libinfo+set}" = set; then
-   enableval=$enable_embedded_libinfo; enable_embedded_libinfo=$enableval
-@@ -51258,25 +50364,25 @@
- 
- 
-    if test "${enable_embedded_libinfo}" = "yes"; then
--      { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_EMBEDDED_LIBINFO 1
- _ACEOF
++  linux* | k*bsd*-gnu)
++    link_all_deplibs=no
++    ;;
+   esac
  
-    else
--      { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+      { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
+   ld_shlibs=yes
+@@ -12388,6 +12418,7 @@
      fi
+     supports_anon_versioning=no
+     case `$LD -v 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 ...
+@@ -12479,7 +12510,7 @@
+       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)
++    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+       tmp_diet=no
+       if test "$host_os" = linux-dietlibc; then
+ 	case $cc_basename in
+@@ -12549,7 +12580,7 @@
+       fi
+       ;;
  
--{ echo "$as_me:$LINENO: checking if alignment restrictions are strictly enforced" >&5
--echo $ECHO_N "checking if alignment restrictions are strictly enforced... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking if alignment restrictions are strictly enforced" >&5
-+$as_echo_n "checking if alignment restrictions are strictly enforced... " >&6; }
- if test "$cross_compiling" = yes; then
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -12724,6 +12755,7 @@
+ 	if test "$aix_use_runtimelinking" = yes; then
+ 	  shared_flag="$shared_flag "'${wl}-G'
+ 	fi
++	link_all_deplibs=no
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -13066,7 +13098,7 @@
+       link_all_deplibs=yes
+       ;;
  
--    { echo "$as_me:$LINENO: result: unknown, assuming yes" >&5
--echo "${ECHO_T}unknown, assuming yes" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: unknown, assuming yes" >&5
-+$as_echo "unknown, assuming yes" >&6; }
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -13956,7 +13988,7 @@
+   ;;
  
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -51342,19 +50448,21 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -14019,6 +14051,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
  
++netbsdelf*-gnu)
++  version_type=linux
++  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='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -14679,7 +14723,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 14682 "configure"
++#line 14726 "configure"
+ #include "confdefs.h"
  
-@@ -51362,20 +50470,21 @@
- #define NO_ALIGNMENT_RESTRICTIONS 1
- _ACEOF
+ #if HAVE_DLFCN_H
+@@ -14775,7 +14819,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 14778 "configure"
++#line 14822 "configure"
+ #include "confdefs.h"
  
--    { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
+ #if HAVE_DLFCN_H
+@@ -15731,7 +15775,7 @@
+         inherit_rpath_CXX=yes
+         ;;
  
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
-+  $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
+-      linux* | k*bsd*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+         case $cc_basename in
+           KCC*)
+ 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -16559,7 +16603,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      linux* | k*bsd*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ 	case $cc_basename in
+ 	  KCC*)
+ 	    # KAI C++ Compiler
+@@ -16623,7 +16667,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu)
+ 	;;
+       *qnx* | *nto*)
+         # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -16747,11 +16791,11 @@
+    -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:16750: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16794: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:16754: \$? = $ac_status" >&5
++   echo "$as_me:16798: \$? = $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.
+@@ -16846,11 +16890,11 @@
+    -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:16849: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16893: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16853: \$? = $ac_status" >&5
++   echo "$as_me:16897: \$? = $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
+@@ -16898,11 +16942,11 @@
+    -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:16901: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16945: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16905: \$? = $ac_status" >&5
++   echo "$as_me:16949: \$? = $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
+@@ -16974,6 +17018,9 @@
+   cygwin* | mingw* | cegcc*)
+     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
++  linux* | k*bsd*-gnu)
++    link_all_deplibs_CXX=no
++  ;;
+   *)
+     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+@@ -17473,7 +17520,7 @@
+   ;;
  
- ( exit $ac_status )
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -17536,6 +17583,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
  
--    { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-+    { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
++netbsdelf*-gnu)
++  version_type=linux
++  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='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -18248,7 +18307,7 @@
+       lt_prog_compiler_static_FC='-non_shared'
+       ;;
  
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
+-    linux* | k*bsd*-gnu)
++    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+       case $cc_basename in
+       # old Intel for x86_64 which still supported -KPIC.
+       ecc*)
+@@ -18415,11 +18474,11 @@
+    -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:18418: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18477: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:18422: \$? = $ac_status" >&5
++   echo "$as_me:18481: \$? = $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.
+@@ -18514,11 +18573,11 @@
+    -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:18517: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18576: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18521: \$? = $ac_status" >&5
++   echo "$as_me:18580: \$? = $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
+@@ -18566,11 +18625,11 @@
+    -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:18569: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18628: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:18573: \$? = $ac_status" >&5
++   echo "$as_me:18632: \$? = $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
+@@ -18682,6 +18741,9 @@
+   openbsd*)
+     with_gnu_ld=no
+     ;;
++  linux* | k*bsd*-gnu)
++    link_all_deplibs_FC=no
++    ;;
+   esac
  
-@@ -51480,11 +50589,12 @@
-     case $ac_val in #(
-     *${as_nl}*)
-       case $ac_var in #(
--      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
--echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-       esac
-       case $ac_var in #(
-       _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-       *) $as_unset $ac_var ;;
-       esac ;;
-     esac
-@@ -51517,12 +50627,12 @@
- if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-   if test -w "$cache_file"; then
-     test "x$cache_file" != "x/dev/null" &&
--      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
--echo "$as_me: updating cache $cache_file" >&6;}
-+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
--echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
- rm -f confcache
-@@ -51538,7 +50648,7 @@
- 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=`echo "$ac_i" | sed "$ac_script"`
-+  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.
-   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-@@ -51550,124 +50660,126 @@
- 
- 
- if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-+$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"AMDEP\" was never defined.
-+$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-+$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${FORTRAN_HAVE_SIZEOF_TRUE}" && test -z "${FORTRAN_HAVE_SIZEOF_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"FORTRAN_HAVE_SIZEOF\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"FORTRAN_HAVE_SIZEOF\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"FORTRAN_HAVE_SIZEOF\" was never defined.
-+$as_echo "$as_me: error: conditional \"FORTRAN_HAVE_SIZEOF\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${FORTRAN_DEFAULT_REALisDBLE_F_TRUE}" && test -z "${FORTRAN_DEFAULT_REALisDBLE_F_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"FORTRAN_DEFAULT_REALisDBLE_F\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"FORTRAN_DEFAULT_REALisDBLE_F\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"FORTRAN_DEFAULT_REALisDBLE_F\" was never defined.
-+$as_echo "$as_me: error: conditional \"FORTRAN_DEFAULT_REALisDBLE_F\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${FORTRAN_SHARED_CONDITIONAL_TRUE}" && test -z "${FORTRAN_SHARED_CONDITIONAL_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"FORTRAN_SHARED_CONDITIONAL\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"FORTRAN_SHARED_CONDITIONAL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"FORTRAN_SHARED_CONDITIONAL\" was never defined.
-+$as_echo "$as_me: error: conditional \"FORTRAN_SHARED_CONDITIONAL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${CXX_SHARED_CONDITIONAL_TRUE}" && test -z "${CXX_SHARED_CONDITIONAL_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"CXX_SHARED_CONDITIONAL\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"CXX_SHARED_CONDITIONAL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"CXX_SHARED_CONDITIONAL\" was never defined.
-+$as_echo "$as_me: error: conditional \"CXX_SHARED_CONDITIONAL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-+$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
-+
- if test -z "${BUILD_SZIP_CONDITIONAL_TRUE}" && test -z "${BUILD_SZIP_CONDITIONAL_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"BUILD_SZIP_CONDITIONAL\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_SZIP_CONDITIONAL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"BUILD_SZIP_CONDITIONAL\" was never defined.
-+$as_echo "$as_me: error: conditional \"BUILD_SZIP_CONDITIONAL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${DIRECT_VFD_CONDITIONAL_TRUE}" && test -z "${DIRECT_VFD_CONDITIONAL_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"DIRECT_VFD_CONDITIONAL\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"DIRECT_VFD_CONDITIONAL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"DIRECT_VFD_CONDITIONAL\" was never defined.
-+$as_echo "$as_me: error: conditional \"DIRECT_VFD_CONDITIONAL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${BUILD_ALL_CONDITIONAL_TRUE}" && test -z "${BUILD_ALL_CONDITIONAL_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"BUILD_ALL_CONDITIONAL\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_ALL_CONDITIONAL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"BUILD_ALL_CONDITIONAL\" was never defined.
-+$as_echo "$as_me: error: conditional \"BUILD_ALL_CONDITIONAL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${BUILD_CXX_CONDITIONAL_TRUE}" && test -z "${BUILD_CXX_CONDITIONAL_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"BUILD_CXX_CONDITIONAL\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CXX_CONDITIONAL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"BUILD_CXX_CONDITIONAL\" was never defined.
-+$as_echo "$as_me: error: conditional \"BUILD_CXX_CONDITIONAL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${BUILD_PARALLEL_CONDITIONAL_TRUE}" && test -z "${BUILD_PARALLEL_CONDITIONAL_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"BUILD_PARALLEL_CONDITIONAL\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_PARALLEL_CONDITIONAL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"BUILD_PARALLEL_CONDITIONAL\" was never defined.
-+$as_echo "$as_me: error: conditional \"BUILD_PARALLEL_CONDITIONAL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${BUILD_FORTRAN_CONDITIONAL_TRUE}" && test -z "${BUILD_FORTRAN_CONDITIONAL_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"BUILD_FORTRAN_CONDITIONAL\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_FORTRAN_CONDITIONAL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"BUILD_FORTRAN_CONDITIONAL\" was never defined.
-+$as_echo "$as_me: error: conditional \"BUILD_FORTRAN_CONDITIONAL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
- if test -z "${BUILD_HDF5_HL_CONDITIONAL_TRUE}" && test -z "${BUILD_HDF5_HL_CONDITIONAL_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"BUILD_HDF5_HL_CONDITIONAL\" was never defined.
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_HDF5_HL_CONDITIONAL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"BUILD_HDF5_HL_CONDITIONAL\" was never defined.
-+$as_echo "$as_me: error: conditional \"BUILD_HDF5_HL_CONDITIONAL\" was never defined.
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
+   ld_shlibs_FC=yes
+@@ -18703,6 +18765,7 @@
+     fi
+     supports_anon_versioning=no
+     case `$LD -v 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 ...
+@@ -18794,7 +18857,7 @@
+       archive_expsym_cmds_FC='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'
+       ;;
  
- : ${CONFIG_STATUS=./config.status}
-+ac_write_fail=0
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
--echo "$as_me: creating $CONFIG_STATUS" >&6;}
--cat >$CONFIG_STATUS <<_ACEOF
-+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- #! $SHELL
- # Generated by $as_me.
- # Run this file to recreate the current configuration.
-@@ -51680,7 +50792,7 @@
- SHELL=\${CONFIG_SHELL-$SHELL}
- _ACEOF
+-    gnu* | linux* | tpf* | k*bsd*-gnu)
++    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+       tmp_diet=no
+       if test "$host_os" = linux-dietlibc; then
+ 	case $cc_basename in
+@@ -18864,7 +18927,7 @@
+       fi
+       ;;
  
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- ## --------------------- ##
- ## M4sh Initialization.  ##
- ## --------------------- ##
-@@ -51690,7 +50802,7 @@
- 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
-+  # 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
-@@ -51712,17 +50824,45 @@
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
-+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
-+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='printf %s\n'
-+  as_echo_n='printf %s'
-+else
-+  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
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conf$$.sh
-+  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
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -19039,6 +19102,7 @@
+ 	if test "$aix_use_runtimelinking" = yes; then
+ 	  shared_flag="$shared_flag "'${wl}-G'
+ 	fi
++	link_all_deplibs_FC=no
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -19352,7 +19416,7 @@
+       link_all_deplibs_FC=yes
+       ;;
  
- # Support unset when possible.
-@@ -51738,8 +50878,6 @@
- # 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.)
--as_nl='
--'
- IFS=" ""	$as_nl"
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -20088,7 +20152,7 @@
+   ;;
  
- # Find who we are.  Look in the path if we contain no directory separator.
-@@ -51762,7 +50900,7 @@
-   as_myself=$0
- fi
- if test ! -f "$as_myself"; then
--  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-   { (exit 1); exit 1; }
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -20137,6 +20201,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  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='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -24171,14 +24247,6 @@
  fi
  
-@@ -51775,17 +50913,10 @@
- PS4='+ '
  
- # NLS nuisances.
--for as_var in \
--  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
--  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
--  LC_TELEPHONE LC_TIME
--do
--  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
--    eval $as_var=C; export $as_var
--  else
--    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
--  fi
--done
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
- 
- # Required to use basename.
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -51807,7 +50938,7 @@
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
- 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--echo X/"$0" |
-+$as_echo X/"$0" |
-     sed '/^.*\/\([^/][^/]*\)\/*$/{
- 	    s//\1/
- 	    q
-@@ -51858,7 +50989,7 @@
-       s/-\n.*//
-     ' >$as_me.lineno &&
-   chmod +x "$as_me.lineno" ||
--    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-    { (exit 1); exit 1; }; }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-@@ -51886,7 +51017,6 @@
- *)
-   ECHO_N='-n';;
- esac
+-if test "X${HDF_CXX}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
+-  as_fn_error "--enable-cxx and --enable-threadsafe flags are incompatible" "$LINENO" 5
+-fi
 -
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
-@@ -51899,19 +51029,22 @@
-   rm -f conf$$.dir/conf$$.file
- else
-   rm -f conf$$.dir
--  mkdir conf$$.dir
-+  mkdir conf$$.dir 2>/dev/null
- fi
--echo >conf$$.file
--if ln -s conf$$.file conf$$ 2>/dev/null; then
--  as_ln_s='ln -s'
--  # ... but there are two gotchas:
--  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
--  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
--  # In both cases, we have to default to `cp -p'.
--  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+if (echo >conf$$.file) 2>/dev/null; then
-+  if ln -s conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s='ln -s'
-+    # ... but there are two gotchas:
-+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+    # In both cases, we have to default to `cp -p'.
-+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+      as_ln_s='cp -p'
-+  elif ln conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s=ln
-+  else
-     as_ln_s='cp -p'
--elif ln conf$$.file conf$$ 2>/dev/null; then
--  as_ln_s=ln
-+  fi
- else
-   as_ln_s='cp -p'
- fi
-@@ -51936,10 +51069,10 @@
-   as_test_x='
-     eval sh -c '\''
-       if test -d "$1"; then
--        test -d "$1/.";
-+	test -d "$1/.";
-       else
- 	case $1 in
--        -*)set "./$1";;
-+	-*)set "./$1";;
- 	esac;
- 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- 	???[sx]*):;;*)false;;esac;fi
-@@ -51962,7 +51095,7 @@
+-if test "X${HDF_FORTRAN}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
+-  as_fn_error "--enable-fortran and --enable-threadsafe flags are incompatible" "$LINENO" 5
+-fi
+-
+ case "X-$THREADSAFE" in
+   X-|X-no)
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+@@ -28847,7 +28915,7 @@
  # values after options handling.
  ac_log="
- This file was extended by HDF5 $as_me 1.8.3, which was
--generated by GNU Autoconf 2.61.  Invocation command line was
-+generated by GNU Autoconf 2.63.  Invocation command line was
+ This file was extended by HDF5 $as_me 1.8.4, which was
+-generated by GNU Autoconf 2.64.  Invocation command line was
++generated by GNU Autoconf 2.65.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -51975,7 +51108,16 @@
- 
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<_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"
-@@ -51983,22 +51125,23 @@
- 
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
- 
--Usage: $0 [OPTIONS] [FILE]...
-+Usage: $0 [OPTION]... [FILE]...
+@@ -28887,6 +28955,7 @@
  
    -h, --help       print this help, then exit
    -V, --version    print version number and configuration settings, then exit
--  -q, --quiet      do not print progress messages
-+  -q, --quiet, --silent
-+                   do not print progress messages
++      --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
-+      --file=FILE[:TEMPLATE]
-+                   instantiate the configuration file FILE
-+      --header=FILE[:TEMPLATE]
-+                   instantiate the configuration header FILE
- 
- Configuration files:
- $config_files
-@@ -52012,13 +51155,13 @@
- Report bugs to <bug-autoconf at gnu.org>."
+@@ -28909,10 +28978,11 @@
  
  _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
- HDF5 config.status 1.8.3
--configured by $0, generated by GNU Autoconf 2.61,
--  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.63,
-+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+ HDF5 config.status 1.8.4
+-configured by $0, generated by GNU Autoconf 2.64,
+-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.65,
++  with options \\"\$ac_cs_config\\"
  
--Copyright (C) 2006 Free Software Foundation, Inc.
-+Copyright (C) 2008 Free Software Foundation, Inc.
+ Copyright (C) 2009 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
- 
-@@ -52026,11 +51169,12 @@
- srcdir='$srcdir'
- INSTALL='$INSTALL'
- MKDIR_P='$MKDIR_P'
-+AWK='$AWK'
-+test -n "\$AWK" || AWK=awk
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
--# If no file are specified by the user, then we need to provide default
--# value.  By we need to know if files were specified by the user.
-+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
-@@ -52052,30 +51196,36 @@
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+@@ -28950,6 +29020,8 @@
      ac_cs_recheck=: ;;
    --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
--    echo "$ac_cs_version"; exit ;;
-+    $as_echo "$ac_cs_version"; exit ;;
+     $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
--    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-+    case $ac_optarg in
-+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
-     ac_need_defaults=false;;
-   --header | --heade | --head | --hea )
-     $ac_shift
--    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-+    case $ac_optarg in
-+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
-     ac_need_defaults=false;;
-   --he | --h)
-     # Conflict between --help and --header
--    { echo "$as_me: error: ambiguous option: $1
-+    { $as_echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; };;
-   --help | --hel | -h )
--    echo "$ac_cs_usage"; exit ;;
-+    $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.
--  -*) { echo "$as_me: error: unrecognized option: $1
-+  -*) { $as_echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2
-    { (exit 1); exit 1; }; } ;;
- 
-@@ -52094,27 +51244,29 @@
- fi
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- if \$ac_cs_recheck; then
--  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
--  CONFIG_SHELL=$SHELL
-+  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 $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  exec "\$@"
- fi
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<\_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
--  echo "$ac_log"
-+  $as_echo "$ac_log"
- } >&5
- 
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- #
- # INIT-COMMANDS
- #
-@@ -52558,7 +51710,7 @@
- 
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- 
- # Handling of arguments.
- for ac_config_target in $ac_config_targets
-@@ -52625,8 +51777,8 @@
-     "hl/fortran/test/Makefile") CONFIG_FILES="$CONFIG_FILES hl/fortran/test/Makefile" ;;
-     "hl/fortran/examples/Makefile") CONFIG_FILES="$CONFIG_FILES hl/fortran/examples/Makefile" ;;
- 
--  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
--echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
- done
-@@ -52667,365 +51819,144 @@
-   (umask 077 && mkdir "$tmp")
- } ||
- {
--   echo "$me: cannot create a temporary directory in ." >&2
-+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-    { (exit 1); exit 1; }
- }
- 
--#
--# Set up the sed scripts for CONFIG_FILES section.
--#
--
--# No need to generate the scripts if there are no CONFIG_FILES.
--# This happens for instance when ./config.status config.h
-+# 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
- 
--_ACEOF
--
--
--
--ac_delim='%!_!# '
--for ac_last_try in false false false false false :; do
--  cat >conf$$subs.sed <<_ACEOF
--SHELL!$SHELL$ac_delim
--PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
--PACKAGE_NAME!$PACKAGE_NAME$ac_delim
--PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
--PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
--PACKAGE_STRING!$PACKAGE_STRING$ac_delim
--PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
--exec_prefix!$exec_prefix$ac_delim
--prefix!$prefix$ac_delim
--program_transform_name!$program_transform_name$ac_delim
--bindir!$bindir$ac_delim
--sbindir!$sbindir$ac_delim
--libexecdir!$libexecdir$ac_delim
--datarootdir!$datarootdir$ac_delim
--datadir!$datadir$ac_delim
--sysconfdir!$sysconfdir$ac_delim
--sharedstatedir!$sharedstatedir$ac_delim
--localstatedir!$localstatedir$ac_delim
--includedir!$includedir$ac_delim
--oldincludedir!$oldincludedir$ac_delim
--docdir!$docdir$ac_delim
--infodir!$infodir$ac_delim
--htmldir!$htmldir$ac_delim
--dvidir!$dvidir$ac_delim
--pdfdir!$pdfdir$ac_delim
--psdir!$psdir$ac_delim
--libdir!$libdir$ac_delim
--localedir!$localedir$ac_delim
--mandir!$mandir$ac_delim
--DEFS!$DEFS$ac_delim
--ECHO_C!$ECHO_C$ac_delim
--ECHO_N!$ECHO_N$ac_delim
--ECHO_T!$ECHO_T$ac_delim
--LIBS!$LIBS$ac_delim
--build_alias!$build_alias$ac_delim
--host_alias!$host_alias$ac_delim
--target_alias!$target_alias$ac_delim
--INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
--INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
--INSTALL_DATA!$INSTALL_DATA$ac_delim
--am__isrc!$am__isrc$ac_delim
--CYGPATH_W!$CYGPATH_W$ac_delim
--PACKAGE!$PACKAGE$ac_delim
--VERSION!$VERSION$ac_delim
--ACLOCAL!$ACLOCAL$ac_delim
--AUTOCONF!$AUTOCONF$ac_delim
--AUTOMAKE!$AUTOMAKE$ac_delim
--AUTOHEADER!$AUTOHEADER$ac_delim
--MAKEINFO!$MAKEINFO$ac_delim
--install_sh!$install_sh$ac_delim
--STRIP!$STRIP$ac_delim
--INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
--mkdir_p!$mkdir_p$ac_delim
--AWK!$AWK$ac_delim
--SET_MAKE!$SET_MAKE$ac_delim
--am__leading_dot!$am__leading_dot$ac_delim
--AMTAR!$AMTAR$ac_delim
--am__tar!$am__tar$ac_delim
--am__untar!$am__untar$ac_delim
--MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
--MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
--MAINT!$MAINT$ac_delim
--build!$build$ac_delim
--build_cpu!$build_cpu$ac_delim
--build_vendor!$build_vendor$ac_delim
--build_os!$build_os$ac_delim
--host!$host$ac_delim
--host_cpu!$host_cpu$ac_delim
--host_vendor!$host_vendor$ac_delim
--host_os!$host_os$ac_delim
--CPPFLAGS!$CPPFLAGS$ac_delim
--H5_CFLAGS!$H5_CFLAGS$ac_delim
--H5_CPPFLAGS!$H5_CPPFLAGS$ac_delim
--H5_FCFLAGS!$H5_FCFLAGS$ac_delim
--H5_CXXFLAGS!$H5_CXXFLAGS$ac_delim
--EXTERNAL_FILTERS!$EXTERNAL_FILTERS$ac_delim
--MPE!$MPE$ac_delim
--STATIC_EXEC!$STATIC_EXEC$ac_delim
--HDF_FORTRAN!$HDF_FORTRAN$ac_delim
--FC!$FC$ac_delim
--HDF_CXX!$HDF_CXX$ac_delim
--CXX!$CXX$ac_delim
--HDF5_HL!$HDF5_HL$ac_delim
--GPFS!$GPFS$ac_delim
--LINUX_LFS!$LINUX_LFS$ac_delim
--INSTRUMENT!$INSTRUMENT$ac_delim
--CODESTACK!$CODESTACK$ac_delim
--HAVE_DMALLOC!$HAVE_DMALLOC$ac_delim
--DIRECT_VFD!$DIRECT_VFD$ac_delim
--THREADSAFE!$THREADSAFE$ac_delim
--STATIC_SHARED!$STATIC_SHARED$ac_delim
--enable_shared!$enable_shared$ac_delim
--enable_static!$enable_static$ac_delim
--UNAME_INFO!$UNAME_INFO$ac_delim
--CC!$CC$ac_delim
--CFLAGS!$CFLAGS$ac_delim
--LDFLAGS!$LDFLAGS$ac_delim
--_ACEOF
--
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
--    break
--  elif $ac_last_try; then
--    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
--   { (exit 1); exit 1; }; }
--  else
--    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
--  fi
--done
- 
--ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
--if test -n "$ac_eof"; then
--  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
--  ac_eof=`expr $ac_eof + 1`
-+ac_cr='
'
-+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-+  ac_cs_awk_cr='\\r'
-+else
-+  ac_cs_awk_cr=$ac_cr
- fi
- 
--cat >>$CONFIG_STATUS <<_ACEOF
--cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
--/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--_ACEOF
--sed '
--s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
--s/^/s,@/; s/!/@,|#_!!_#|/
--:n
--t n
--s/'"$ac_delim"'$/,g/; t
--s/$/\\/; p
--N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
--' >>$CONFIG_STATUS <conf$$subs.sed
--rm -f conf$$subs.sed
--cat >>$CONFIG_STATUS <<_ACEOF
--CEOF$ac_eof
-+echo 'BEGIN {' >"$tmp/subs1.awk" &&
- _ACEOF
- 
- 
-+{
-+  echo "cat >conf$$subs.awk <<_ACEOF" &&
-+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-+  echo "_ACEOF"
-+} >conf$$subs.sh ||
-+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
--  cat >conf$$subs.sed <<_ACEOF
--ac_ct_CC!$ac_ct_CC$ac_delim
--EXEEXT!$EXEEXT$ac_delim
--OBJEXT!$OBJEXT$ac_delim
--DEPDIR!$DEPDIR$ac_delim
--am__include!$am__include$ac_delim
--am__quote!$am__quote$ac_delim
--AMDEP_TRUE!$AMDEP_TRUE$ac_delim
--AMDEP_FALSE!$AMDEP_FALSE$ac_delim
--AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
--CCDEPMODE!$CCDEPMODE$ac_delim
--am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
--am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
--HDF5_INTERFACES!$HDF5_INTERFACES$ac_delim
--R_LARGE!$R_LARGE$ac_delim
--R_INTEGER!$R_INTEGER$ac_delim
--HADDR_T!$HADDR_T$ac_delim
--HSIZE_T!$HSIZE_T$ac_delim
--HSSIZE_T!$HSSIZE_T$ac_delim
--HID_T!$HID_T$ac_delim
--SIZE_T!$SIZE_T$ac_delim
--OBJECT_NAMELEN_DEFAULT_F!$OBJECT_NAMELEN_DEFAULT_F$ac_delim
--FCFLAGS!$FCFLAGS$ac_delim
--ac_ct_FC!$ac_ct_FC$ac_delim
--FCFLAGS_f90!$FCFLAGS_f90$ac_delim
--F9XSUFFIXFLAG!$F9XSUFFIXFLAG$ac_delim
--FSEARCH_DIRS!$FSEARCH_DIRS$ac_delim
--F9XMODFLAG!$F9XMODFLAG$ac_delim
--F9XMODEXT!$F9XMODEXT$ac_delim
--FCLIBS!$FCLIBS$ac_delim
--FORTRAN_HAVE_SIZEOF_TRUE!$FORTRAN_HAVE_SIZEOF_TRUE$ac_delim
--FORTRAN_HAVE_SIZEOF_FALSE!$FORTRAN_HAVE_SIZEOF_FALSE$ac_delim
--FORTRAN_DEFAULT_REALisDBLE_F_TRUE!$FORTRAN_DEFAULT_REALisDBLE_F_TRUE$ac_delim
--FORTRAN_DEFAULT_REALisDBLE_F_FALSE!$FORTRAN_DEFAULT_REALisDBLE_F_FALSE$ac_delim
--CXXFLAGS!$CXXFLAGS$ac_delim
--ac_ct_CXX!$ac_ct_CXX$ac_delim
--CXXDEPMODE!$CXXDEPMODE$ac_delim
--am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
--am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
--CXXCPP!$CXXCPP$ac_delim
--LT_STATIC_EXEC!$LT_STATIC_EXEC$ac_delim
--PERL!$PERL$ac_delim
--AR!$AR$ac_delim
--TR!$TR$ac_delim
--TIME!$TIME$ac_delim
--PARALLEL!$PARALLEL$ac_delim
--RUNSERIAL!$RUNSERIAL$ac_delim
--RUNPARALLEL!$RUNPARALLEL$ac_delim
--TESTPARALLEL!$TESTPARALLEL$ac_delim
--FORTRAN_SHARED_CONDITIONAL_TRUE!$FORTRAN_SHARED_CONDITIONAL_TRUE$ac_delim
--FORTRAN_SHARED_CONDITIONAL_FALSE!$FORTRAN_SHARED_CONDITIONAL_FALSE$ac_delim
--CXX_SHARED_CONDITIONAL_TRUE!$CXX_SHARED_CONDITIONAL_TRUE$ac_delim
--CXX_SHARED_CONDITIONAL_FALSE!$CXX_SHARED_CONDITIONAL_FALSE$ac_delim
--LIBTOOL!$LIBTOOL$ac_delim
--SED!$SED$ac_delim
--GREP!$GREP$ac_delim
--EGREP!$EGREP$ac_delim
--FGREP!$FGREP$ac_delim
--LD!$LD$ac_delim
--DUMPBIN!$DUMPBIN$ac_delim
--ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim
--NM!$NM$ac_delim
--LN_S!$LN_S$ac_delim
--OBJDUMP!$OBJDUMP$ac_delim
--RANLIB!$RANLIB$ac_delim
--lt_ECHO!$lt_ECHO$ac_delim
--DSYMUTIL!$DSYMUTIL$ac_delim
--NMEDIT!$NMEDIT$ac_delim
--LIPO!$LIPO$ac_delim
--OTOOL!$OTOOL$ac_delim
--OTOOL64!$OTOOL64$ac_delim
--CPP!$CPP$ac_delim
--AM_MAKEFLAGS!$AM_MAKEFLAGS$ac_delim
--USE_FILTER_DEFLATE!$USE_FILTER_DEFLATE$ac_delim
--USE_FILTER_SZIP!$USE_FILTER_SZIP$ac_delim
--LL_PATH!$LL_PATH$ac_delim
--BUILD_SZIP_CONDITIONAL_TRUE!$BUILD_SZIP_CONDITIONAL_TRUE$ac_delim
--BUILD_SZIP_CONDITIONAL_FALSE!$BUILD_SZIP_CONDITIONAL_FALSE$ac_delim
--PTHREAD!$PTHREAD$ac_delim
--H5_LONE_COLON!$H5_LONE_COLON$ac_delim
--DEBUG_PKG!$DEBUG_PKG$ac_delim
--TRACE_API!$TRACE_API$ac_delim
--INSTRUMENT_LIBRARY!$INSTRUMENT_LIBRARY$ac_delim
--CLEARFILEBUF!$CLEARFILEBUF$ac_delim
--USINGMEMCHECKER!$USINGMEMCHECKER$ac_delim
--ADD_PARALLEL_FILES!$ADD_PARALLEL_FILES$ac_delim
--MPI_GET_SIZE!$MPI_GET_SIZE$ac_delim
--FILTERS!$FILTERS$ac_delim
--USE_FILTER_SHUFFLE!$USE_FILTER_SHUFFLE$ac_delim
--USE_FILTER_FLETCHER32!$USE_FILTER_FLETCHER32$ac_delim
--USE_FILTER_NBIT!$USE_FILTER_NBIT$ac_delim
--USE_FILTER_SCALEOFFSET!$USE_FILTER_SCALEOFFSET$ac_delim
--DIRECT_VFD_CONDITIONAL_TRUE!$DIRECT_VFD_CONDITIONAL_TRUE$ac_delim
--DIRECT_VFD_CONDITIONAL_FALSE!$DIRECT_VFD_CONDITIONAL_FALSE$ac_delim
--H5_VERSION!$H5_VERSION$ac_delim
--CONFIG_DATE!$CONFIG_DATE$ac_delim
--CONFIG_USER!$CONFIG_USER$ac_delim
--CONFIG_MODE!$CONFIG_MODE$ac_delim
--_ACEOF
-+  . ./conf$$subs.sh ||
-+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+  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
--    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-    { (exit 1); exit 1; }; }
-   else
-     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
- done
-+rm -f conf$$subs.sh
- 
--ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
--if test -n "$ac_eof"; then
--  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
--  ac_eof=`expr $ac_eof + 1`
--fi
--
--cat >>$CONFIG_STATUS <<_ACEOF
--cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
--/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--_ACEOF
--sed '
--s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
--s/^/s,@/; s/!/@,|#_!!_#|/
--:n
--t n
--s/'"$ac_delim"'$/,g/; t
--s/$/\\/; p
--N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
--' >>$CONFIG_STATUS <conf$$subs.sed
--rm -f conf$$subs.sed
--cat >>$CONFIG_STATUS <<_ACEOF
--CEOF$ac_eof
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>"\$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 >>"\$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
-+  }
- 
--ac_delim='%!_!# '
--for ac_last_try in false false false false false :; do
--  cat >conf$$subs.sed <<_ACEOF
--BYTESEX!$BYTESEX$ac_delim
--WORDS_BIGENDIAN!$WORDS_BIGENDIAN$ac_delim
--CC_VERSION!$CC_VERSION$ac_delim
--ROOT!$ROOT$ac_delim
--DYNAMIC_DIRS!$DYNAMIC_DIRS$ac_delim
--HL!$HL$ac_delim
--HL_FOR!$HL_FOR$ac_delim
--BUILD_ALL_CONDITIONAL_TRUE!$BUILD_ALL_CONDITIONAL_TRUE$ac_delim
--BUILD_ALL_CONDITIONAL_FALSE!$BUILD_ALL_CONDITIONAL_FALSE$ac_delim
--DEPRECATED_SYMBOLS!$DEPRECATED_SYMBOLS$ac_delim
--DEFAULT_API_VERSION!$DEFAULT_API_VERSION$ac_delim
--STRICT_FORMAT_CHECKS!$STRICT_FORMAT_CHECKS$ac_delim
--BUILD_CXX_CONDITIONAL_TRUE!$BUILD_CXX_CONDITIONAL_TRUE$ac_delim
--BUILD_CXX_CONDITIONAL_FALSE!$BUILD_CXX_CONDITIONAL_FALSE$ac_delim
--BUILD_PARALLEL_CONDITIONAL_TRUE!$BUILD_PARALLEL_CONDITIONAL_TRUE$ac_delim
--BUILD_PARALLEL_CONDITIONAL_FALSE!$BUILD_PARALLEL_CONDITIONAL_FALSE$ac_delim
--BUILD_FORTRAN_CONDITIONAL_TRUE!$BUILD_FORTRAN_CONDITIONAL_TRUE$ac_delim
--BUILD_FORTRAN_CONDITIONAL_FALSE!$BUILD_FORTRAN_CONDITIONAL_FALSE$ac_delim
--BUILD_HDF5_HL_CONDITIONAL_TRUE!$BUILD_HDF5_HL_CONDITIONAL_TRUE$ac_delim
--BUILD_HDF5_HL_CONDITIONAL_FALSE!$BUILD_HDF5_HL_CONDITIONAL_FALSE$ac_delim
--SEARCH!$SEARCH$ac_delim
--SETX!$SETX$ac_delim
--LIBOBJS!$LIBOBJS$ac_delim
--LTLIBOBJS!$LTLIBOBJS$ac_delim
--_ACEOF
-+  print line
-+}
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 24; then
--    break
--  elif $ac_last_try; then
--    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+_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 < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-    { (exit 1); exit 1; }; }
--  else
--    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
--  fi
--done
--
--ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
--if test -n "$ac_eof"; then
--  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
--  ac_eof=`expr $ac_eof + 1`
--fi
--
--cat >>$CONFIG_STATUS <<_ACEOF
--cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
--/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
--_ACEOF
--sed '
--s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
--s/^/s,@/; s/!/@,|#_!!_#|/
--:n
--t n
--s/'"$ac_delim"'$/,g/; t
--s/$/\\/; p
--N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
--' >>$CONFIG_STATUS <conf$$subs.sed
--rm -f conf$$subs.sed
--cat >>$CONFIG_STATUS <<_ACEOF
--:end
--s/|#_!!_#|//g
--CEOF$ac_eof
- _ACEOF
- 
--
- # VPATH may cause trouble with some makes, so we remove $(srcdir),
- # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
- # trailing colons and then remove the whole line if VPATH becomes empty
-@@ -53041,19 +51972,133 @@
- }'
- fi
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
-+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 >"$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_t=`sed -n "/$ac_delim/p" confdefs.h`
-+  if test -z "$ac_t"; then
-+    break
-+  elif $ac_last_try; then
-+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-+$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-+   { (exit 1); exit 1; }; }
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+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_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi # test -n "$CONFIG_HEADERS"
-+
- 
--for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
-+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*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
--echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-    { (exit 1); exit 1; }; };;
-   :[FH]-) ac_tag=-:-;;
-   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-@@ -53082,26 +52127,38 @@
- 	   [\\/$]*) false;;
- 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
- 	   esac ||
--	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
--echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-    { (exit 1); exit 1; }; };;
-       esac
--      ac_file_inputs="$ac_file_inputs $ac_f"
-+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-+      ac_file_inputs="$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 "`IFS=:
--	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-+    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"
--      { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
-+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-+$as_echo "$as_me: creating $ac_file" >&6;}
-     fi
-+    # Neutralize special characters interpreted by sed in replacement strings.
-+    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 >"$tmp/stdin";;
-+    *:-:* | *:-) cat >"$tmp/stdin" \
-+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-+$as_echo "$as_me: error: could not create $ac_file" >&2;}
-+   { (exit 1); exit 1; }; } ;;
-     esac
-     ;;
-   esac
-@@ -53111,7 +52168,7 @@
- 	 X"$ac_file" : 'X\(//\)[^/]' \| \
- 	 X"$ac_file" : 'X\(//\)$' \| \
- 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
--echo X"$ac_file" |
-+$as_echo X"$ac_file" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -53137,7 +52194,7 @@
-     as_dirs=
-     while :; do
-       case $as_dir in #(
--      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-       *) as_qdir=$as_dir;;
-       esac
-       as_dirs="'$as_qdir' $as_dirs"
-@@ -53146,7 +52203,7 @@
- 	 X"$as_dir" : 'X\(//\)[^/]' \| \
- 	 X"$as_dir" : 'X\(//\)$' \| \
- 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
--echo X"$as_dir" |
-+$as_echo X"$as_dir" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -53167,17 +52224,17 @@
-       test -d "$as_dir" && break
-     done
-     test -z "$as_dirs" || eval "mkdir $as_dirs"
--  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
--echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-    { (exit 1); exit 1; }; }; }
-   ac_builddir=.
- 
- case "$ac_dir" in
- .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *)
--  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-   # A ".." for each directory in $ac_dir_suffix.
--  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+  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/ ;;
-@@ -53222,12 +52279,13 @@
-   esac
- _ACEOF
- 
--cat >>$CONFIG_STATUS <<\_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=
- 
--case `sed -n '/datarootdir/ {
-+ac_sed_dataroot='
-+/datarootdir/ {
-   p
-   q
- }
-@@ -53236,13 +52294,14 @@
- /@infodir@/p
- /@localedir@/p
- /@mandir@/p
--' $ac_file_inputs` in
-+'
-+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
- *datarootdir*) ac_datarootdir_seen=yes;;
- *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
--  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
--echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
- _ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-   ac_datarootdir_hack='
-   s&@datadir@&$datadir&g
-   s&@docdir@&$docdir&g
-@@ -53256,15 +52315,16 @@
- # 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
--  sed "$ac_vpsub
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_sed_extra="$ac_vpsub
- $extrasub
- _ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s&@configure_input@&$configure_input&;t t
-+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
-@@ -53275,121 +52335,60 @@
- s&@INSTALL@&$ac_INSTALL&;t t
- s&@MKDIR_P@&$ac_MKDIR_P&;t t
- $ac_datarootdir_hack
--" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
-+"
-+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-+$as_echo "$as_me: error: could not create $ac_file" >&2;}
-+   { (exit 1); exit 1; }; }
- 
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
--  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- which seems to be undefined.  Please make sure it is defined." >&5
--echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+$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 "$tmp/stdin"
-   case $ac_file in
--  -) cat "$tmp/out"; rm -f "$tmp/out";;
--  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
--  esac
-+  -) cat "$tmp/out" && rm -f "$tmp/out";;
-+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-+  esac \
-+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-+$as_echo "$as_me: error: could not create $ac_file" >&2;}
-+   { (exit 1); exit 1; }; }
-  ;;
-   :H)
-   #
-   # CONFIG_HEADER
-   #
--_ACEOF
--
--# Transform confdefs.h into a sed script `conftest.defines', that
--# substitutes the proper values into config.h.in to produce config.h.
--rm -f conftest.defines conftest.tail
--# First, append a space to every undef/define line, to ease matching.
--echo 's/$/ /' >conftest.defines
--# Then, protect against being on the right side of a sed subst, or in
--# an unquoted here document, in config.status.  If some macros were
--# called several times there might be several #defines for the same
--# symbol, which is useless.  But do not sort them, since the last
--# AC_DEFINE must be honored.
--ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
--# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
--# NAME is the cpp macro being defined, VALUE is the value it is being given.
--# PARAMS is the parameter list in the macro definition--in most cases, it's
--# just an empty string.
--ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
--ac_dB='\\)[	 (].*,\\1define\\2'
--ac_dC=' '
--ac_dD=' ,'
--
--uniq confdefs.h |
--  sed -n '
--	t rset
--	:rset
--	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
--	t ok
--	d
--	:ok
--	s/[\\&,]/\\&/g
--	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
--	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
--  ' >>conftest.defines
--
--# Remove the space that was appended to ease matching.
--# Then 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.
--# (The regexp can be short, since the line contains either #define or #undef.)
--echo 's/ $//
--s,^[	 #]*u.*,/* & */,' >>conftest.defines
--
--# Break up conftest.defines:
--ac_max_sed_lines=50
--
--# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
--# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
--# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
--# et cetera.
--ac_in='$ac_file_inputs'
--ac_out='"$tmp/out1"'
--ac_nxt='"$tmp/out2"'
--
--while :
--do
--  # Write a here document:
--    cat >>$CONFIG_STATUS <<_ACEOF
--    # First, check the format of the line:
--    cat >"\$tmp/defines.sed" <<\\CEOF
--/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
--/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
--b
--:def
--_ACEOF
--  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
--  echo 'CEOF
--    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
--  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
--  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
--  grep . conftest.tail >/dev/null || break
--  rm -f conftest.defines
--  mv conftest.tail conftest.defines
--done
--rm -f conftest.defines conftest.tail
--
--echo "ac_result=$ac_in" >>$CONFIG_STATUS
--cat >>$CONFIG_STATUS <<\_ACEOF
-   if test x"$ac_file" != x-; then
--    echo "/* $configure_input  */" >"$tmp/config.h"
--    cat "$ac_result" >>"$tmp/config.h"
--    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
--      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
--echo "$as_me: $ac_file is unchanged" >&6;}
-+    {
-+      $as_echo "/* $configure_input  */" \
-+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-+    } >"$tmp/config.h" \
-+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-+$as_echo "$as_me: error: could not create $ac_file" >&2;}
-+   { (exit 1); exit 1; }; }
-+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-+      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-+$as_echo "$as_me: $ac_file is unchanged" >&6;}
-     else
--      rm -f $ac_file
--      mv "$tmp/config.h" $ac_file
-+      rm -f "$ac_file"
-+      mv "$tmp/config.h" "$ac_file" \
-+	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-+$as_echo "$as_me: error: could not create $ac_file" >&2;}
-+   { (exit 1); exit 1; }; }
-     fi
-   else
--    echo "/* $configure_input  */"
--    cat "$ac_result"
-+    $as_echo "/* $configure_input  */" \
-+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-+      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-+$as_echo "$as_me: error: could not create -" >&2;}
-+   { (exit 1); exit 1; }; }
-   fi
--  rm -f "$tmp/out12"
--# Compute $ac_file's index in $config_headers.
--_am_arg=$ac_file
-+# 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
-@@ -53404,7 +52403,7 @@
- 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
- 	 X"$_am_arg" : 'X\(//\)$' \| \
- 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
--echo X"$_am_arg" |
-+$as_echo X"$_am_arg" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -53424,8 +52423,8 @@
- 	  s/.*/./; q'`/stamp-h$_am_stamp_count
-  ;;
- 
--  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
--echo "$as_me: executing $ac_file commands" >&6;}
-+  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
-+$as_echo "$as_me: executing $ac_file commands" >&6;}
-  ;;
-   esac
- 
-@@ -53473,7 +52472,7 @@
- 	 X"$mf" : 'X\(//\)[^/]' \| \
- 	 X"$mf" : 'X\(//\)$' \| \
- 	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
--echo X"$mf" |
-+$as_echo X"$mf" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -53517,7 +52516,7 @@
- 	 X"$file" : 'X\(//\)[^/]' \| \
- 	 X"$file" : 'X\(//\)$' \| \
- 	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
--echo X"$file" |
-+$as_echo X"$file" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -53543,7 +52542,7 @@
-     as_dirs=
-     while :; do
-       case $as_dir in #(
--      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-       *) as_qdir=$as_dir;;
-       esac
-       as_dirs="'$as_qdir' $as_dirs"
-@@ -53552,7 +52551,7 @@
- 	 X"$as_dir" : 'X\(//\)[^/]' \| \
- 	 X"$as_dir" : 'X\(//\)$' \| \
- 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
--echo X"$as_dir" |
-+$as_echo X"$as_dir" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- 	    s//\1/
- 	    q
-@@ -53573,8 +52572,8 @@
-       test -d "$as_dir" && break
-     done
-     test -z "$as_dirs" || eval "mkdir $as_dirs"
--  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
--echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-    { (exit 1); exit 1; }; }; }
-     # echo "creating $dirpart/$file"
-     echo '# dummy' > "$dirpart/$file"
-@@ -54546,6 +53545,11 @@
- chmod +x $CONFIG_STATUS
- ac_clean_files=$ac_clean_files_save
- 
-+test $ac_write_fail = 0 ||
-+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-+   { (exit 1); exit 1; }; }
-+
- 
- # configure is writing to config.log, and then calls config.status.
- # config.status does its own redirection, appending to config.log.
-@@ -54567,6 +53571,10 @@
-   # would make configure fail if this is the last instruction.
-   $ac_cs_success || { (exit 1); exit 1; }
- fi
-+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-+fi
- 
- no_create=$saved_no_create
- 
-diff -urN hdf5-1.8.3-orig/configure.in hdf5-1.8.3/configure.in
---- hdf5-1.8.3-orig/configure.in	2009-06-19 12:59:55.000000000 +0200
-+++ hdf5-1.8.3/configure.in	2009-06-19 15:34:10.000000000 +0200
-@@ -1652,7 +1652,7 @@
-             else
-                 exit(1);
-         }
--        ], [hdf5_cv_szlib_can_encode=yes], [hdf5_cv_szlib_can_encode=no],)])
-+        ], [hdf5_cv_szlib_can_encode=yes], [hdf5_cv_szlib_can_encode=no],])])])
-     
-     AC_DEFINE(HAVE_FILTER_SZIP, 1, 
-             [Define if support for szip filter is enabled])
-@@ -1758,17 +1758,6 @@
-               [AS_HELP_STRING(--enable-threadsafe,Enable thread safe capability)],
+@@ -29632,7 +29704,7 @@
+ t delim
+ :nl
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+@@ -29646,7 +29718,7 @@
+ t nl
+ :delim
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+diff -urN hdf5-1.8.4.orig/configure.in hdf5-1.8.4/configure.in
+--- hdf5-1.8.4.orig/configure.in	2009-11-10 22:12:10.000000000 +0100
++++ hdf5-1.8.4/configure.in	2009-12-21 16:07:28.000000000 +0100
+@@ -1820,17 +1820,6 @@
+                               [Enable thread safe capability])],
                THREADSAFE=$enableval)
  
 -dnl The --enable-threadsafe flag is not compatible with --enable-cxx.
@@ -54561,239 +14467,19 @@ diff -urN hdf5-1.8.3-orig/configure.in hdf5-1.8.3/configure.in
  case "X-$THREADSAFE" in
    X-|X-no)
      AC_MSG_RESULT([no])
-@@ -1862,7 +1851,7 @@
+@@ -1926,7 +1915,7 @@
               if(tz.tz_minuteswest == 7777 && tz.tz_dsttime == 7)
                  exit(1);
               else exit (0);
--          }]])],[hdf5_cv_gettimeofday_tz=yes],[hdf5_cv_gettimeofday_tz=no],[])])
-+          }],[hdf5_cv_gettimeofday_tz=yes],[hdf5_cv_gettimeofday_tz=no],[])])
+-          }], [hdf5_cv_gettimeofday_tz=yes], [hdf5_cv_gettimeofday_tz=no],)])
++          }], [hdf5_cv_gettimeofday_tz=yes], [hdf5_cv_gettimeofday_tz=no],[])])
  
     if test ${hdf5_cv_gettimeofday_tz} = "yes"; then
        AC_MSG_RESULT([yes])
-diff -urN hdf5-1.8.3-orig/examples/Makefile.in hdf5-1.8.3/examples/Makefile.in
---- hdf5-1.8.3-orig/examples/Makefile.in	2009-05-13 17:03:25.000000000 +0200
-+++ hdf5-1.8.3/examples/Makefile.in	2009-06-19 15:35:25.000000000 +0200
-@@ -272,6 +272,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/fortran/examples/Makefile.in hdf5-1.8.3/fortran/examples/Makefile.in
---- hdf5-1.8.3-orig/fortran/examples/Makefile.in	2009-05-13 17:03:25.000000000 +0200
-+++ hdf5-1.8.3/fortran/examples/Makefile.in	2009-06-19 15:35:25.000000000 +0200
-@@ -272,6 +272,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/fortran/Makefile.in hdf5-1.8.3/fortran/Makefile.in
---- hdf5-1.8.3-orig/fortran/Makefile.in	2009-05-13 17:03:25.000000000 +0200
-+++ hdf5-1.8.3/fortran/Makefile.in	2009-06-19 15:35:25.000000000 +0200
-@@ -282,6 +282,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/fortran/src/Makefile.in hdf5-1.8.3/fortran/src/Makefile.in
---- hdf5-1.8.3-orig/fortran/src/Makefile.in	2009-05-13 17:03:24.000000000 +0200
-+++ hdf5-1.8.3/fortran/src/Makefile.in	2009-06-19 15:35:26.000000000 +0200
-@@ -341,6 +341,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/fortran/test/Makefile.in hdf5-1.8.3/fortran/test/Makefile.in
---- hdf5-1.8.3-orig/fortran/test/Makefile.in	2009-05-13 17:03:21.000000000 +0200
-+++ hdf5-1.8.3/fortran/test/Makefile.in	2009-06-19 15:35:27.000000000 +0200
-@@ -334,6 +334,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/fortran/testpar/Makefile.in hdf5-1.8.3/fortran/testpar/Makefile.in
---- hdf5-1.8.3-orig/fortran/testpar/Makefile.in	2009-05-13 17:03:24.000000000 +0200
-+++ hdf5-1.8.3/fortran/testpar/Makefile.in	2009-06-19 15:35:27.000000000 +0200
-@@ -285,6 +285,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/hl/c++/examples/Makefile.in hdf5-1.8.3/hl/c++/examples/Makefile.in
---- hdf5-1.8.3-orig/hl/c++/examples/Makefile.in	2009-05-13 17:03:15.000000000 +0200
-+++ hdf5-1.8.3/hl/c++/examples/Makefile.in	2009-06-19 15:35:28.000000000 +0200
-@@ -272,6 +272,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/hl/c++/Makefile.in hdf5-1.8.3/hl/c++/Makefile.in
---- hdf5-1.8.3-orig/hl/c++/Makefile.in	2009-05-13 17:03:15.000000000 +0200
-+++ hdf5-1.8.3/hl/c++/Makefile.in	2009-06-19 15:35:28.000000000 +0200
-@@ -278,6 +278,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/hl/c++/src/Makefile.in hdf5-1.8.3/hl/c++/src/Makefile.in
---- hdf5-1.8.3-orig/hl/c++/src/Makefile.in	2009-05-13 17:03:15.000000000 +0200
-+++ hdf5-1.8.3/hl/c++/src/Makefile.in	2009-06-19 15:35:29.000000000 +0200
-@@ -301,6 +301,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/hl/c++/test/Makefile.in hdf5-1.8.3/hl/c++/test/Makefile.in
---- hdf5-1.8.3-orig/hl/c++/test/Makefile.in	2009-05-13 17:03:11.000000000 +0200
-+++ hdf5-1.8.3/hl/c++/test/Makefile.in	2009-06-19 15:35:29.000000000 +0200
-@@ -288,6 +288,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/hl/examples/Makefile.in hdf5-1.8.3/hl/examples/Makefile.in
---- hdf5-1.8.3-orig/hl/examples/Makefile.in	2009-05-13 17:03:16.000000000 +0200
-+++ hdf5-1.8.3/hl/examples/Makefile.in	2009-06-19 15:35:30.000000000 +0200
-@@ -272,6 +272,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/hl/fortran/examples/Makefile.in hdf5-1.8.3/hl/fortran/examples/Makefile.in
---- hdf5-1.8.3-orig/hl/fortran/examples/Makefile.in	2009-05-13 17:03:15.000000000 +0200
-+++ hdf5-1.8.3/hl/fortran/examples/Makefile.in	2009-06-19 15:35:30.000000000 +0200
-@@ -272,6 +272,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/hl/fortran/Makefile.in hdf5-1.8.3/hl/fortran/Makefile.in
---- hdf5-1.8.3-orig/hl/fortran/Makefile.in	2009-05-13 17:03:15.000000000 +0200
-+++ hdf5-1.8.3/hl/fortran/Makefile.in	2009-06-19 15:35:30.000000000 +0200
-@@ -282,6 +282,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/hl/fortran/src/Makefile.in hdf5-1.8.3/hl/fortran/src/Makefile.in
---- hdf5-1.8.3-orig/hl/fortran/src/Makefile.in	2009-05-13 17:03:15.000000000 +0200
-+++ hdf5-1.8.3/hl/fortran/src/Makefile.in	2009-06-19 15:35:31.000000000 +0200
-@@ -306,6 +306,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/hl/fortran/test/Makefile.in hdf5-1.8.3/hl/fortran/test/Makefile.in
---- hdf5-1.8.3-orig/hl/fortran/test/Makefile.in	2009-05-13 17:03:15.000000000 +0200
-+++ hdf5-1.8.3/hl/fortran/test/Makefile.in	2009-06-19 15:35:31.000000000 +0200
-@@ -292,6 +292,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/hl/Makefile.in hdf5-1.8.3/hl/Makefile.in
---- hdf5-1.8.3-orig/hl/Makefile.in	2009-05-13 17:03:16.000000000 +0200
-+++ hdf5-1.8.3/hl/Makefile.in	2009-06-19 15:35:28.000000000 +0200
-@@ -282,6 +282,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/hl/src/Makefile.in hdf5-1.8.3/hl/src/Makefile.in
---- hdf5-1.8.3-orig/hl/src/Makefile.in	2009-05-13 17:03:11.000000000 +0200
-+++ hdf5-1.8.3/hl/src/Makefile.in	2009-06-19 15:35:32.000000000 +0200
-@@ -302,6 +302,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/hl/test/Makefile.in hdf5-1.8.3/hl/test/Makefile.in
---- hdf5-1.8.3-orig/hl/test/Makefile.in	2009-05-13 17:03:10.000000000 +0200
-+++ hdf5-1.8.3/hl/test/Makefile.in	2009-06-19 15:35:32.000000000 +0200
-@@ -308,6 +308,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/hl/tools/gif2h5/Makefile.in hdf5-1.8.3/hl/tools/gif2h5/Makefile.in
---- hdf5-1.8.3-orig/hl/tools/gif2h5/Makefile.in	2009-05-13 17:03:11.000000000 +0200
-+++ hdf5-1.8.3/hl/tools/gif2h5/Makefile.in	2009-06-19 15:35:33.000000000 +0200
-@@ -301,6 +301,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/hl/tools/Makefile.in hdf5-1.8.3/hl/tools/Makefile.in
---- hdf5-1.8.3-orig/hl/tools/Makefile.in	2009-05-13 17:03:11.000000000 +0200
-+++ hdf5-1.8.3/hl/tools/Makefile.in	2009-06-19 15:35:33.000000000 +0200
-@@ -279,6 +279,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/Makefile.in hdf5-1.8.3/Makefile.in
---- hdf5-1.8.3-orig/Makefile.in	2009-05-13 17:03:25.000000000 +0200
-+++ hdf5-1.8.3/Makefile.in	2009-06-19 15:35:42.000000000 +0200
-@@ -43,9 +43,9 @@
+diff -urN hdf5-1.8.4.orig/Makefile.in hdf5-1.8.4/Makefile.in
+--- hdf5-1.8.4.orig/Makefile.in	2009-11-10 22:12:10.000000000 +0100
++++ hdf5-1.8.4/Makefile.in	2009-12-21 16:08:05.000000000 +0100
+@@ -44,9 +44,9 @@
  # Configure should set AM_MAKEFLAGS to -V to solve this problem in
  # subdirectories.
  # NOTE: This means that invoking pmake in a subdirectory will not work.
@@ -54805,63 +14491,23 @@ diff -urN hdf5-1.8.3-orig/Makefile.in hdf5-1.8.3/Makefile.in
 +#xxx
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
-@@ -307,6 +307,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/perform/Makefile.in hdf5-1.8.3/perform/Makefile.in
---- hdf5-1.8.3-orig/perform/Makefile.in	2009-05-13 17:03:21.000000000 +0200
-+++ hdf5-1.8.3/perform/Makefile.in	2009-06-19 15:35:34.000000000 +0200
-@@ -337,6 +337,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/src/H5config.h.in hdf5-1.8.3/src/H5config.h.in
---- hdf5-1.8.3-orig/src/H5config.h.in	2009-05-13 17:02:40.000000000 +0200
-+++ hdf5-1.8.3/src/H5config.h.in	2009-06-19 15:35:20.000000000 +0200
-@@ -1,5 +1,8 @@
- /* src/H5config.h.in.  Generated from configure.in by autoheader.  */
- 
-+/* Define if building universal (internal helper macro) */
-+#undef AC_APPLE_UNIVERSAL_BUILD
-+
- /* Define if your system generates wrong code for log2 routine. */
- #undef BAD_LOG2_CODE_GENERATED
- 
-@@ -636,9 +639,17 @@
- /* Check exception handling functions during data conversions */
- #undef WANT_DCONV_EXCEPTION
- 
--/* Define to 1 if your processor stores words with the most significant byte
--   first (like Motorola and SPARC, unlike Intel and VAX). */
--#undef WORDS_BIGENDIAN
-+/* 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
- 
- /* Define to empty if `const' does not conform to ANSI C. */
- #undef const
-diff -urN hdf5-1.8.3-orig/src/H5config.h.in~ hdf5-1.8.3/src/H5config.h.in~
---- hdf5-1.8.3-orig/src/H5config.h.in~	1970-01-01 01:00:00.000000000 +0100
-+++ hdf5-1.8.3/src/H5config.h.in~	2009-06-19 14:05:10.000000000 +0200
-@@ -0,0 +1,670 @@
+ pkgincludedir = $(includedir)/@PACKAGE@
+diff -urN hdf5-1.8.4.orig/src/H5config.h.in hdf5-1.8.4/src/H5config.h.in
+--- hdf5-1.8.4.orig/src/H5config.h.in	2009-11-10 22:12:02.000000000 +0100
++++ hdf5-1.8.4/src/H5config.h.in	2009-12-21 16:07:58.000000000 +0100
+@@ -301,7 +301,7 @@
+ /* Define if `struct timezone' is defined */
+ #undef HAVE_STRUCT_TIMEZONE
+ 
+-/* Define to 1 if `struct tm' is a member of `tm_zone'. */
++/* Define to 1 if `tm_zone' is a member of `struct tm'. */
+ #undef HAVE_STRUCT_TM_TM_ZONE
+ 
+ /* Define if `struct videoconfig' is defined */
+diff -urN hdf5-1.8.4.orig/src/H5config.h.in~ hdf5-1.8.4/src/H5config.h.in~
+--- hdf5-1.8.4.orig/src/H5config.h.in~	1970-01-01 01:00:00.000000000 +0100
++++ hdf5-1.8.4/src/H5config.h.in~	2009-12-21 14:04:28.000000000 +0100
+@@ -0,0 +1,680 @@
 +/* src/H5config.h.in.  Generated from configure.in by autoheader.  */
 +
 +/* Define if building universal (internal helper macro) */
@@ -55165,7 +14811,7 @@ diff -urN hdf5-1.8.3-orig/src/H5config.h.in~ hdf5-1.8.3/src/H5config.h.in~
 +/* Define if `struct timezone' is defined */
 +#undef HAVE_STRUCT_TIMEZONE
 +
-+/* Define to 1 if `tm_zone' is member of `struct tm'. */
++/* Define to 1 if `tm_zone' is a member of `struct tm'. */
 +#undef HAVE_STRUCT_TM_TM_ZONE
 +
 +/* Define if `struct videoconfig' is defined */
@@ -55337,6 +14983,9 @@ diff -urN hdf5-1.8.3-orig/src/H5config.h.in~ hdf5-1.8.3/src/H5config.h.in~
 +/* 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
 +
@@ -55451,6 +15100,9 @@ diff -urN hdf5-1.8.3-orig/src/H5config.h.in~ hdf5-1.8.3/src/H5config.h.in~
 +/* The size of `uint_least8_t', as computed by sizeof. */
 +#undef SIZEOF_UINT_LEAST8_T
 +
++/* The size of `unsigned', as computed by sizeof. */
++#undef SIZEOF_UNSIGNED
++
 +/* The size of `__int64', as computed by sizeof. */
 +#undef SIZEOF___INT64
 +
@@ -55478,6 +15130,10 @@ diff -urN hdf5-1.8.3-orig/src/H5config.h.in~ hdf5-1.8.3/src/H5config.h.in~
 +   correct precision. */
 +#undef ULLONG_TO_LDOUBLE_PRECISION
 +
++/* Define if your system accurately converting unsigned long to float values.
++   */
++#undef ULONG_TO_FLOAT_ACCURATE
++
 +/* Define if your system can accurately convert unsigned (long) long values to
 +   floating-point values. */
 +#undef ULONG_TO_FP_BOTTOM_BIT_ACCURATE
@@ -55532,157 +15188,3 @@ diff -urN hdf5-1.8.3-orig/src/H5config.h.in~ hdf5-1.8.3/src/H5config.h.in~
 +
 +/* Define to `long' if <sys/types.h> does not define. */
 +#undef ssize_t
-diff -urN hdf5-1.8.3-orig/src/Makefile.in hdf5-1.8.3/src/Makefile.in
---- hdf5-1.8.3-orig/src/Makefile.in	2009-05-13 17:02:40.000000000 +0200
-+++ hdf5-1.8.3/src/Makefile.in	2009-06-19 15:35:34.000000000 +0200
-@@ -359,6 +359,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/test/Makefile.in hdf5-1.8.3/test/Makefile.in
---- hdf5-1.8.3-orig/test/Makefile.in	2009-05-13 17:02:24.000000000 +0200
-+++ hdf5-1.8.3/test/Makefile.in	2009-06-19 15:35:35.000000000 +0200
-@@ -575,6 +575,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/testpar/Makefile.in hdf5-1.8.3/testpar/Makefile.in
---- hdf5-1.8.3-orig/testpar/Makefile.in	2009-05-13 17:02:25.000000000 +0200
-+++ hdf5-1.8.3/testpar/Makefile.in	2009-06-19 15:35:36.000000000 +0200
-@@ -315,6 +315,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/tools/h5copy/Makefile.in hdf5-1.8.3/tools/h5copy/Makefile.in
---- hdf5-1.8.3-orig/tools/h5copy/Makefile.in	2009-05-13 17:03:06.000000000 +0200
-+++ hdf5-1.8.3/tools/h5copy/Makefile.in	2009-06-19 15:35:37.000000000 +0200
-@@ -296,6 +296,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/tools/h5diff/Makefile.in hdf5-1.8.3/tools/h5diff/Makefile.in
---- hdf5-1.8.3-orig/tools/h5diff/Makefile.in	2009-05-13 17:03:05.000000000 +0200
-+++ hdf5-1.8.3/tools/h5diff/Makefile.in	2009-06-19 15:35:37.000000000 +0200
-@@ -303,6 +303,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/tools/h5dump/Makefile.in hdf5-1.8.3/tools/h5dump/Makefile.in
---- hdf5-1.8.3-orig/tools/h5dump/Makefile.in	2009-05-13 17:03:00.000000000 +0200
-+++ hdf5-1.8.3/tools/h5dump/Makefile.in	2009-06-19 15:35:38.000000000 +0200
-@@ -301,6 +301,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/tools/h5import/Makefile.in hdf5-1.8.3/tools/h5import/Makefile.in
---- hdf5-1.8.3-orig/tools/h5import/Makefile.in	2009-05-13 17:03:06.000000000 +0200
-+++ hdf5-1.8.3/tools/h5import/Makefile.in	2009-06-19 15:35:38.000000000 +0200
-@@ -296,6 +296,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/tools/h5jam/Makefile.in hdf5-1.8.3/tools/h5jam/Makefile.in
---- hdf5-1.8.3-orig/tools/h5jam/Makefile.in	2009-05-13 17:03:04.000000000 +0200
-+++ hdf5-1.8.3/tools/h5jam/Makefile.in	2009-06-19 15:35:39.000000000 +0200
-@@ -307,6 +307,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/tools/h5ls/Makefile.in hdf5-1.8.3/tools/h5ls/Makefile.in
---- hdf5-1.8.3-orig/tools/h5ls/Makefile.in	2009-05-13 17:03:08.000000000 +0200
-+++ hdf5-1.8.3/tools/h5ls/Makefile.in	2009-06-19 15:35:39.000000000 +0200
-@@ -290,6 +290,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/tools/h5repack/Makefile.in hdf5-1.8.3/tools/h5repack/Makefile.in
---- hdf5-1.8.3-orig/tools/h5repack/Makefile.in	2009-05-13 17:03:00.000000000 +0200
-+++ hdf5-1.8.3/tools/h5repack/Makefile.in	2009-06-19 15:35:40.000000000 +0200
-@@ -310,6 +310,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/tools/h5stat/Makefile.in hdf5-1.8.3/tools/h5stat/Makefile.in
---- hdf5-1.8.3-orig/tools/h5stat/Makefile.in	2009-05-13 17:03:08.000000000 +0200
-+++ hdf5-1.8.3/tools/h5stat/Makefile.in	2009-06-19 15:35:40.000000000 +0200
-@@ -299,6 +299,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/tools/lib/Makefile.in hdf5-1.8.3/tools/lib/Makefile.in
---- hdf5-1.8.3-orig/tools/lib/Makefile.in	2009-05-13 17:03:06.000000000 +0200
-+++ hdf5-1.8.3/tools/lib/Makefile.in	2009-06-19 15:35:41.000000000 +0200
-@@ -295,6 +295,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/tools/Makefile.in hdf5-1.8.3/tools/Makefile.in
---- hdf5-1.8.3-orig/tools/Makefile.in	2009-05-13 17:03:08.000000000 +0200
-+++ hdf5-1.8.3/tools/Makefile.in	2009-06-19 15:35:36.000000000 +0200
-@@ -279,6 +279,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
-diff -urN hdf5-1.8.3-orig/tools/misc/Makefile.in hdf5-1.8.3/tools/misc/Makefile.in
---- hdf5-1.8.3-orig/tools/misc/Makefile.in	2009-05-13 17:03:08.000000000 +0200
-+++ hdf5-1.8.3/tools/misc/Makefile.in	2009-06-19 15:35:41.000000000 +0200
-@@ -314,6 +314,7 @@
- srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- 
diff --git a/debian/rules b/debian/rules
index fa575e2..58d66af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 patch: patch-stamp
 patch-stamp:
-	QUILT_PATCHES=debian/patches quilt push --color=auto -a
+	QUILT_PATCHES=debian/patches quilt push --color=auto -a || [ $$? = 2 ]
 	touch patch-stamp
 
 unpatch:
@@ -145,7 +145,7 @@ configure-stamp-mpich: configure-stamp-debian
 	dh_testdir
 	-mkdir debian/build-mpich
 # configure version with mpich
-	cd debian/build-mpich && CPPFLAGS=-I/usr/lib/mpich/include/ \
+	cd debian/build-mpich && FCFLAGS=-I/usr/lib/mpich/include/ \
 		LDFLAGS=-L/usr/lib/mpich/lib/ CC=mpicc.mpich \
 		CXX=mpiCC.mpich F9X=mpif90.mpich RUNPARALLEL=/usr/bin/mpirun.mpich \
 		../../configure $(CONFIGURE_FLAGS) --enable-fortran \

-- 
Hierarchical Data Format 5 (HDF5)



More information about the Pkg-grass-devel mailing list