[svn-r17896] Description:

	Bring r17546:17895 from trunk to revise_chunks branch.  Changes to
fixed and extensible array dataset chunk indexing code to accommodate changes
to private APIs in those interfaces.  Also, other adjustments to source code
and expected output in response to changes on the trunk.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (smirom) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.6.2 (amazon) in debug mode
        Mac OS X/32 10.6.2 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode

1 files changed, 172 insertions, 309 deletions

diff --git a/configure b/configure
index 7d380f6..2a82389 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.in Id: configure.in 17515 2009-09-24 11:25:37Z koziol .
+# From configure.in Id: configure.in 17547 2009-09-29 15:21:35Z koziol .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for HDF5 1.9.47-FA_a4.
+# Generated by GNU Autoconf 2.64 for HDF5 1.9.51-FA_a4.
 #
 # Report bugs to <help@hdfgroup.org>.
 #
@@ -699,8 +699,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='HDF5'
 PACKAGE_TARNAME='hdf5'
-PACKAGE_VERSION='1.9.47-FA_a4'
-PACKAGE_STRING='HDF5 1.9.47-FA_a4'
+PACKAGE_VERSION='1.9.51-FA_a4'
+PACKAGE_STRING='HDF5 1.9.51-FA_a4'
 PACKAGE_BUGREPORT='help@hdfgroup.org'
 PACKAGE_URL=''
 
@@ -887,6 +887,11 @@ HDF_FORTRAN
 STATIC_EXEC
 MPE
 EXTERNAL_FILTERS
+AM_LDFLAGS
+AM_CPPFLAGS
+AM_CXXFLAGS
+AM_FCFLAGS
+AM_CFLAGS
 H5_CXXFLAGS
 H5_FCFLAGS
 H5_CPPFLAGS
@@ -1566,7 +1571,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures HDF5 1.9.47-FA_a4 to adapt to many kinds of systems.
+\`configure' configures HDF5 1.9.51-FA_a4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1636,7 +1641,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HDF5 1.9.47-FA_a4:";;
+     short | recursive ) echo "Configuration of HDF5 1.9.51-FA_a4:";;
    esac
   cat <<\_ACEOF
 
@@ -1738,9 +1743,9 @@ Optional Packages:
   --with-mpe=DIR          Use MPE instrumentation [default=no]
   --with-default-vfd=driver
                           Specify default file driver [default=sec2]
-  --with-default-api-version=(v16|v18)
+  --with-default-api-version=(v16|v18|v110)
                           Specify default release version of public symbols
-                          [default=v18]
+                          [default=v110]
 
 Some influential environment variables:
   CC          C compiler command
@@ -1823,7 +1828,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-HDF5 configure 1.9.47-FA_a4
+HDF5 configure 1.9.51-FA_a4
 generated by GNU Autoconf 2.64
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2907,7 +2912,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HDF5 $as_me 1.9.47-FA_a4, which was
+It was created by HDF5 $as_me 1.9.51-FA_a4, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   $ $0 $@
@@ -3720,7 +3725,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='hdf5'
- VERSION='1.9.47-FA_a4'
+ VERSION='1.9.51-FA_a4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3872,10 +3877,28 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
+
+
+
+
+
+
+AM_CFLAGS="${AM_CFLAGS}"
+AM_CXXFLAGS="${AM_CXXFLAGS}"
+AM_FCFLAGS="${AM_FCFLAGS}"
+AM_CPPFLAGS="${AM_CPPFLAGS}"
+AM_LDFLAGS="${AM_LDFLAGS}"
 CFLAGS="${CFLAGS}"
-CPPFLAGS="${CPPFLAGS}"
 CXXFLAGS="${CXXFLAGS}"
 FCFLAGS="${FCFLAGS}"
+CPPFLAGS="${CPPFLAGS}"
+LDFLAGS="${LDFLAGS}"
+
+saved_user_CFLAGS="$CFLAGS"
+saved_user_CXXFLAGS="$CXXFLAGS"
+saved_user_FCFLAGS="$FCFLAGS"
+saved_user_LDFLAGS="$LDFLAGS"
+saved_user_CPPFLAGS="$CPPFLAGS"
 
 DEFAULT_LIBS=""
 
@@ -4027,6 +4050,12 @@ $as_echo "no" >&6; }
   test "$hname_tmp" = "$hname" && break
 done
 
+CFLAGS="${AM_CFLAGS} ${CFLAGS}"
+FCFLAGS="${AM_FCFLAGS} ${FCFLAGS}"
+CXXFLAGS="${AM_CXXFLAGS} ${CXXFLAGS}"
+CPPFLAGS="${AM_CPPFLAGS} ${CPPFLAGS}"
+LDFLAGS="${AM_LDFLAGS} ${LDFLAGS}"
+
 if test -z "${enable_dependency_tracking}"; then
   enable_dependency_tracking="yes"
 fi
@@ -5016,7 +5045,8 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
 
 
 
-        FCFLAGS="${FCFLAGS} ${FFLAGS}"
+        AM_FCFLAGS="${AM_FCFLAGS} ${FFLAGS}"
+  FCFLAGS="${FCFLAGS} ${FFLAGS}"
 
         ac_ext=${ac_fc_srcext-f}
 ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
@@ -6314,6 +6344,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 else
   echo "no"
+  FC="no"
 fi
 
  if test "X$HAVE_SIZEOF" = "Xyes"; then
@@ -6927,6 +6958,7 @@ else
 
     echo yes
     CXXFLAGS="${CXXFLAGS} -DOLD_HEADER_FILENAME"
+    AM_CXXFLAGS="${AM_CXXFLAGS} -DOLD_HEADER_FILENAME"
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -6964,6 +6996,7 @@ else
 
      echo no
      CXXFLAGS="${CXXFLAGS} -DH5_NO_NAMESPACE"
+     AM_CXXFLAGS="${AM_CXXFLAGS} -DH5_NO_NAMESPACE"
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -7000,6 +7033,7 @@ else
 
      echo no
      CXXFLAGS="${CXXFLAGS} -DH5_NO_STD"
+     AM_CXXFLAGS="${AM_CXXFLAGS} -DH5_NO_STD"
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -7032,6 +7066,7 @@ else
 
      echo no
      CXXFLAGS="${CXXFLAGS} -DBOOL_NOTDEFINED"
+     AM_CXXFLAGS="${AM_CXXFLAGS} -DBOOL_NOTDEFINED"
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -7114,6 +7149,7 @@ else
 
     echo no
     CXXFLAGS="${CXXFLAGS} -DNO_STATIC_CAST"
+    AM_CXXFLAGS="${AM_CXXFLAGS} -DNO_STATIC_CAST"
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -7122,6 +7158,7 @@ fi
 
 else
   echo "no"
+  CXX="no"
 fi
 
 ac_ext=c
@@ -7489,13 +7526,6 @@ elif test "X${enable_shared}" = "Xyes" -a "X${PARALLEL}" != "X"; then
     echo '    shared libraries explicitly enabled by user'
 fi
 
-if test "X${enable_shared}" != "Xno" && \
-      (${CC-cc} -V 2>&1 | grep '^pgcc') > /dev/null; then
-  echo '    warning: shared libraries are not supported for pgcc!'
-  echo '    disabling shared libraries'
-  enable_shared="no"
-fi
-
 if test "X${HDF_FORTRAN}" = "Xyes"; then
   H5_FORTRAN_SHARED="yes"
 
@@ -7508,6 +7538,7 @@ if test "X${HDF_FORTRAN}" = "Xyes"; then
       H5_FORTRAN_SHARED="no"
     else
       FCFLAGS="${FCFLAGS} -fPIC"
+      AM_FCFLAGS="${AM_FCFLAGS} -fPIC"
     fi
   fi
   if (${FC} +version 2>&1 | grep '^HP F90') > /dev/null; then
@@ -7541,12 +7572,6 @@ H5_CXX_SHARED="no"
 if test "X${HDF_CXX}" = "Xyes" && test "X${enable_shared}" != "Xno"; then
   H5_CXX_SHARED="yes"
 
-  if (echo dummy ${CXX} ${CXXLD} ${CFLAGS} ${CXXFLAGS} ${LDFLAGS} | grep 'xarch') > /dev/null; then
-    echo "    warning: -xarch flag detected"
-    echo "    disabling shared C++ libraries"
-    H5_CXX_SHARED="no"
-  fi
-
 
   if (echo dummy ${CXX} ${CXXLD} ${CFLAGS} ${CXXFLAGS} ${LDFLAGS} | grep 'DD64') > /dev/null; then
     echo "    warning: +DD64 flag detected"
@@ -8196,13 +8221,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:8199: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:8224: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:8202: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:8227: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:8205: output\"" >&5)
+  (eval echo "\"\$as_me:8230: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -9407,7 +9432,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 9410 "configure"' > conftest.$ac_ext
+  echo '#line 9435 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -11726,11 +11751,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11729: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11754: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11733: \$? = $ac_status" >&5
+   echo "$as_me:11758: \$? = $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.
@@ -12065,11 +12090,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12068: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12093: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12072: \$? = $ac_status" >&5
+   echo "$as_me:12097: \$? = $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.
@@ -12170,11 +12195,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12173: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12198: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12177: \$? = $ac_status" >&5
+   echo "$as_me:12202: \$? = $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
@@ -12225,11 +12250,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12228: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12253: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12232: \$? = $ac_status" >&5
+   echo "$as_me:12257: \$? = $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
@@ -14656,7 +14681,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 14659 "configure"
+#line 14684 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14752,7 +14777,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 14755 "configure"
+#line 14780 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16724,11 +16749,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16727: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16752: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16731: \$? = $ac_status" >&5
+   echo "$as_me:16756: \$? = $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.
@@ -16823,11 +16848,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16826: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16851: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16830: \$? = $ac_status" >&5
+   echo "$as_me:16855: \$? = $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
@@ -16875,11 +16900,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16878: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16903: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16882: \$? = $ac_status" >&5
+   echo "$as_me:16907: \$? = $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
@@ -18392,11 +18417,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18395: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18420: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18399: \$? = $ac_status" >&5
+   echo "$as_me:18424: \$? = $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.
@@ -18491,11 +18516,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18494: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18519: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18498: \$? = $ac_status" >&5
+   echo "$as_me:18523: \$? = $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
@@ -18543,11 +18568,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18546: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18571: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18550: \$? = $ac_status" >&5
+   echo "$as_me:18575: \$? = $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
@@ -21156,18 +21181,20 @@ $as_echo_n "checking for large file support mode on Linux... " >&6; }
     if test "X$LINUX_LFS" = "Xyes"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled" >&5
 $as_echo "enabled" >&6; }
-      CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $CPPFLAGS"
+      AM_CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $AM_CPPFLAGS"
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
 $as_echo "disabled" >&6; }
     fi
 
-                CPPFLAGS="-D_POSIX_SOURCE $CPPFLAGS"
+                H5_CPPFLAGS="-D_POSIX_SOURCE $H5_CPPFLAGS"
 
-                    CPPFLAGS="-D_BSD_SOURCE $CPPFLAGS"
+                    AM_CPPFLAGS="-D_BSD_SOURCE $AM_CPPFLAGS"
     ;;
 esac
 
+CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS"
+
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
@@ -23186,10 +23213,13 @@ $as_echo "suppressed" >&6; }
     fi
 
     saved_CPPFLAGS="$CPPFLAGS"
+    saved_AM_CPPFLAGS="$AM_CPPFLAGS"
     saved_LDFLAGS="$LDFLAGS"
+    saved_AM_LDFLAGS="$AM_LDFLAGS"
 
     if test -n "$dmalloc_inc"; then
       CPPFLAGS="$CPPFLAGS -I$dmalloc_inc"
+      AM_CPPFLAGS="$AM_CPPFLAGS -I$dmalloc_inc"
     fi
 
     for ac_header in dmalloc.h
@@ -23201,7 +23231,7 @@ if test "x$ac_cv_header_dmalloc_h" = x""yes; then :
 _ACEOF
 
 else
-  CPPFLAGS="$saved_CPPFLAGS"
+  CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"
 fi
 
 done
@@ -23209,6 +23239,7 @@ done
 
     if test -n "$dmalloc_lib"; then
       LDFLAGS="$LDFLAGS -L$dmalloc_lib"
+      AM_LDFLAGS="$AM_LDFLAGS -L$dmalloc_lib"
     fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dmalloc_shutdown in -ldmalloc" >&5
@@ -23263,7 +23294,7 @@ _ACEOF
   LIBS="-ldmalloc $LIBS"
 
 else
-  LDFLAGS="$saved_LDFLAGS"; unset HAVE_DMALLOC
+  LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_DMALLOC
 fi
 
 
@@ -23393,10 +23424,13 @@ $as_echo "suppressed" >&6; }
     fi
 
     saved_CPPFLAGS="$CPPFLAGS"
+    saved_AM_CPPFLAGS="$AM_CPPFLAGS"
     saved_LDFLAGS="$LDFLAGS"
+    saved_AM_LDFLAGS="$AM_LDFLAGS"
 
     if test -n "$zlib_inc"; then
       CPPFLAGS="$CPPFLAGS -I$zlib_inc"
+      AM_CPPFLAGS="$AM_CPPFLAGS -I$zlib_inc"
     fi
 
     for ac_header in zlib.h
@@ -23408,7 +23442,7 @@ if test "x$ac_cv_header_zlib_h" = x""yes; then :
 _ACEOF
  HAVE_ZLIB_H="yes"
 else
-  CPPFLAGS="$saved_CPPFLAGS"
+  CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"
 fi
 
 done
@@ -23416,6 +23450,7 @@ done
 
     if test -n "$zlib_lib"; then
       LDFLAGS="$LDFLAGS -L$zlib_lib"
+      AM_LDFLAGS="$AM_LDFLAGS -L$zlib_lib"
     fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress2 in -lz" >&5
@@ -23470,7 +23505,7 @@ _ACEOF
   LIBS="-lz $LIBS"
 
 else
-  LDFLAGS="$saved_LDFLAGS"; unset HAVE_ZLIB
+  LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_ZLIB
 fi
 
     ac_fn_c_check_func "$LINENO" "compress2" "ac_cv_func_compress2"
@@ -23613,10 +23648,13 @@ $as_echo "suppressed" >&6; }
     fi
 
     saved_CPPFLAGS="$CPPFLAGS"
+    saved_AM_CPPFLAGS="$AM_CPPFLAGS"
     saved_LDFLAGS="$LDFLAGS"
+    saved_AM_LDFLAGS="$AM_LDFLAGS"
 
     if test -n "$szlib_inc"; then
       CPPFLAGS="$CPPFLAGS -I$szlib_inc"
+      AM_CPPFLAGS="$AM_CPPFLAGS -I$szlib_inc"
     fi
 
     for ac_header in szlib.h
@@ -23628,7 +23666,7 @@ if test "x$ac_cv_header_szlib_h" = x""yes; then :
 _ACEOF
  HAVE_SZLIB_H="yes"
 else
-  CPPFLAGS="$saved_CPPFLAGS"
+  CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"
 fi
 
 done
@@ -23636,6 +23674,7 @@ done
 
     if test -n "$szlib_lib"; then
       LDFLAGS="$LDFLAGS -L$szlib_lib"
+      AM_LDFLAGS="$AM_LDFLAGS -L$szlib_lib"
     fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SZ_BufftoBuffCompress in -lsz" >&5
@@ -23690,7 +23729,7 @@ _ACEOF
   LIBS="-lsz $LIBS"
 
 else
-  LDFLAGS="$saved_LDFLAGS"; unset HAVE_SZLIB
+  LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset HAVE_SZLIB
 fi
 
 
@@ -23971,7 +24010,9 @@ $as_echo "suppressed" >&6; }
 
     if test -n "$pthread_inc"; then
       saved_CPPFLAGS="$CPPFLAGS"
+      saved_AM_CPPFLAGS="$AM_CPPFLAGS"
       CPPFLAGS="$CPPFLAGS -I$pthread_inc"
+      AM_CPPFLAGS="$AM_CPPFLAGS -I$pthread_inc"
       for ac_header in pthread.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
@@ -23981,7 +24022,7 @@ if test "x$ac_cv_header_pthread_h" = x""yes; then :
 _ACEOF
 
 else
-  CPPFLAGS="$saved_CPPFLAGS"; unset PTHREAD
+  CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"; unset PTHREAD
 fi
 
 done
@@ -24005,7 +24046,9 @@ done
 
     if test -n "$pthread_lib"; then
       saved_LDFLAGS="$LDFLAGS"
+      saved_AM_LDFLAGS="$AM_LDFLAGS"
       LDFLAGS="$LDFLAGS -L$pthread_lib"
+      AM_LDFLAGS="$AM_LDFLAGS -L$pthread_lib"
       { $as_echo "$as_me:${as_lineno-$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 :
@@ -24058,9 +24101,10 @@ _ACEOF
   LIBS="-lpthread $LIBS"
 
 else
-  LDFLAGS="$saved_LDFLAGS"; unset PTHREAD
+  LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset PTHREAD
 fi
 
+
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
 $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
@@ -25133,7 +25177,7 @@ $as_echo_n "checking how to print long long... " >&6; }
 if test "${hdf5_cv_printf_ll+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH`echo $LDFLAGS | sed -e 's/-L/:/g' -e 's/ //g'`"
+  LD_LIBRARY_PATH="$LD_LIBRARY_PATH`echo $AM_LDFLAGS $LDFLAGS | sed -e 's/-L/:/g' -e 's/ //g'`"
 export LD_LIBRARY_PATH
 
 for hdf5_cv_printf_ll in l ll L q unknown; do
@@ -26289,7 +26333,9 @@ fi
 
       if test -n "$mpe_inc"; then
         saved_CPPFLAGS="$CPPFLAGS"
+        saved_AM_CPPFLAGS="$AM_CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -I$mpe_inc"
+        AM_CPPFLAGS="$AM_CPPFLAGS -I$mpe_inc"
         for ac_header in mpe.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "mpe.h" "ac_cv_header_mpe_h" "$ac_includes_default"
@@ -26299,7 +26345,7 @@ if test "x$ac_cv_header_mpe_h" = x""yes; then :
 _ACEOF
 
 else
-  CPPFLAGS="$saved_CPPFLAGS"; unset MPE
+  CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"; unset MPE
 fi
 
 done
@@ -26323,7 +26369,9 @@ done
 
       if test -n "$mpe_lib"; then
         saved_LDFLAGS="$LDFLAGS"
+        saved_AM_LDFLAGS="$AM_LDFLAGS"
         LDFLAGS="$LDFLAGS -L$mpe_lib"
+        AM_LDFLAGS="$AM_LDFLAGS -L$mpe_lib"
         { $as_echo "$as_me:${as_lineno-$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 :
@@ -26376,7 +26424,7 @@ _ACEOF
   LIBS="-lmpe $LIBS"
 
 else
-  LDFLAGS="$saved_LDFLAGS"; unset MPE
+  LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset MPE
 fi
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOG_Init in -llmpe" >&5
@@ -26431,9 +26479,10 @@ _ACEOF
   LIBS="-llmpe $LIBS"
 
 else
-  LDFLAGS="$saved_LDFLAGS"; unset MPE
+  LDFLAGS="$saved_LDFLAGS"; AM_LDFLAGS="$saved_AM_LDFLAGS"; unset MPE
 fi
 
+
       else
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPE_Init_log in -lmpe" >&5
 $as_echo_n "checking for MPE_Init_log in -lmpe... " >&6; }
@@ -26607,11 +26656,11 @@ $as_echo_n "checking if irregular hyperslab optimization code works inside MPI-I
 if test "${hdf5_cv_mpi_complex_derived_datatype_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  hdf5_mpi_complex_derived_datatype_works=yes
+  hdf5_cv_mpi_complex_derived_datatype_works=yes
 fi
 
 
-if test ${hdf5_mpi_complex_derived_datatype_works} = "yes"; then
+if test ${hdf5_cv_mpi_complex_derived_datatype_works} = "yes"; then
 
 $as_echo "#define MPI_COMPLEX_DERIVED_DATATYPE_WORKS 1" >>confdefs.h
 
@@ -26629,11 +26678,11 @@ $as_echo_n "checking if MPI-IO can do collective IO when one or more processes d
 if test "${hdf5_cv_mpi_special_collective_io_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  hdf5_mpi_special_collective_io_works=yes
+  hdf5_cv_mpi_special_collective_io_works=yes
 fi
 
 
-if test ${hdf5_mpi_special_collective_io_works} = "yes"; then
+if test ${hdf5_cv_mpi_special_collective_io_works} = "yes"; then
 
 $as_echo "#define MPI_SPECIAL_COLLECTIVE_IO_WORKS 1" >>confdefs.h
 
@@ -26806,14 +26855,14 @@ posix_memalign()
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  hdf5_direct_io=yes
+  hdf5_cv_direct_io=yes
 else
-  hdf5_direct_io=no
+  hdf5_cv_direct_io=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 else
-  hdf5_direct_io=no
+  hdf5_cv_direct_io=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -26822,7 +26871,7 @@ fi
 fi
 
 
-   if test ${hdf5_direct_io} = "yes"; then
+   if test ${hdf5_cv_direct_io} = "yes"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
@@ -26950,7 +26999,7 @@ esac
 $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}
+   hdf5_cv_ldouble_to_integer_accurate=${hdf5_cv_ldouble_to_integer_accurate=no}
 else
    if test "${hdf5_cv_ldouble_to_integer_accurate+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -26976,7 +27025,7 @@ fi
 $as_echo_n "checking if converting from long double to integers works... " >&6; }
 
 if test ${ac_cv_sizeof_long_double} = 0; then
-   hdf5_ldouble_to_integer_works=${hdf5_ldouble_to_integer_works=no}
+   hdf5_cv_ldouble_to_integer_works=${hdf5_cv_ldouble_to_integer_works=no}
 else
    if test "${hdf5_cv_ldouble_to_integer_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -27014,9 +27063,9 @@ else
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_ldouble_to_integer_works=yes
+  hdf5_cv_ldouble_to_integer_works=yes
 else
-  hdf5_ldouble_to_integer_works=no
+  hdf5_cv_ldouble_to_integer_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -27026,7 +27075,7 @@ fi
 
 fi
 
-if test ${hdf5_ldouble_to_integer_works} = "yes"; then
+if test ${hdf5_cv_ldouble_to_integer_works} = "yes"; then
 
 $as_echo "#define LDOUBLE_TO_INTEGER_WORKS 1" >>confdefs.h
 
@@ -27107,9 +27156,9 @@ done:
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_ulong_to_float_accurate=yes
+  hdf5_cv_ulong_to_float_accurate=yes
 else
-  hdf5_ulong_to_float_accurate=no
+  hdf5_cv_ulong_to_float_accurate=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -27118,7 +27167,7 @@ fi
 fi
 
 
-if test ${hdf5_ulong_to_float_accurate} = "yes"; then
+if test ${hdf5_cv_ulong_to_float_accurate} = "yes"; then
 
 $as_echo "#define ULONG_TO_FLOAT_ACCURATE 1" >>confdefs.h
 
@@ -27271,9 +27320,9 @@ done:
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_fp_to_ullong_accurate=yes
+  hdf5_cv_fp_to_ullong_accurate=yes
 else
-  hdf5_fp_to_ullong_accurate=no
+  hdf5_cv_fp_to_ullong_accurate=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -27282,7 +27331,7 @@ fi
 fi
 
 
-if test ${hdf5_fp_to_ullong_accurate} = "yes"; then
+if test ${hdf5_cv_fp_to_ullong_accurate} = "yes"; then
 
 $as_echo "#define FP_TO_ULLONG_ACCURATE 1" >>confdefs.h
 
@@ -27334,9 +27383,9 @@ done:
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_fp_to_ullong_right_maximum=yes
+  hdf5_cv_fp_to_ullong_right_maximum=yes
 else
-  hdf5_fp_to_ullong_right_maximum=no
+  hdf5_cv_fp_to_ullong_right_maximum=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -27345,7 +27394,7 @@ fi
 fi
 
 
-if test ${hdf5_fp_to_ullong_right_maximum} = "yes"; then
+if test ${hdf5_cv_fp_to_ullong_right_maximum} = "yes"; then
 
 $as_echo "#define FP_TO_ULLONG_RIGHT_MAXIMUM 1" >>confdefs.h
 
@@ -27360,7 +27409,7 @@ fi
 $as_echo_n "checking if correctly converting long double to unsigned int values... " >&6; }
 
 if test ${ac_cv_sizeof_long_double} = 0; then
-   hdf5_ldouble_to_uint_accurate=${hdf5_ldouble_to_uint_accurate=no}
+   hdf5_cv_ldouble_to_uint_accurate=${hdf5_cv_ldouble_to_uint_accurate=no}
 else
    if test "${hdf5_cv_ldouble_to_uint_accurate+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -27390,9 +27439,9 @@ else
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_ldouble_to_uint_accurate=yes
+  hdf5_cv_ldouble_to_uint_accurate=yes
 else
-  hdf5_ldouble_to_uint_accurate=no
+  hdf5_cv_ldouble_to_uint_accurate=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -27402,7 +27451,7 @@ fi
 
 fi
 
-if test ${hdf5_ldouble_to_uint_accurate} = "yes"; then
+if test ${hdf5_cv_ldouble_to_uint_accurate} = "yes"; then
 
 $as_echo "#define LDOUBLE_TO_UINT_ACCURATE 1" >>confdefs.h
 
@@ -27621,7 +27670,7 @@ fi
 $as_echo_n "checking if correctly converting long double to (unsigned) long long values... " >&6; }
 
 if test ${ac_cv_sizeof_long_double} = 0; then
-   hdf5_ldouble_to_llong_accurate=${hdf5_ldouble_to_llong_accurate=no}
+   hdf5_cv_ldouble_to_llong_accurate=${hdf5_cv_ldouble_to_llong_accurate=no}
 else
    if test "${hdf5_cv_ldouble_to_llong_accurate+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -27674,9 +27723,9 @@ else
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_ldouble_to_llong_accurate=yes
+  hdf5_cv_ldouble_to_llong_accurate=yes
 else
-  hdf5_ldouble_to_llong_accurate=no
+  hdf5_cv_ldouble_to_llong_accurate=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -27686,7 +27735,7 @@ fi
 
 fi
 
-if test ${hdf5_ldouble_to_llong_accurate} = "yes"; then
+if test ${hdf5_cv_ldouble_to_llong_accurate} = "yes"; then
 
 $as_echo "#define LDOUBLE_TO_LLONG_ACCURATE 1" >>confdefs.h
 
@@ -27701,7 +27750,7 @@ fi
 $as_echo_n "checking if correctly converting (unsigned) long long to long double values... " >&6; }
 
 if test ${ac_cv_sizeof_long_double} = 0; then
-   hdf5_llong_to_ldouble_correct=${hdf5_llong_to_ldouble_correct=no}
+   hdf5_cv_llong_to_ldouble_correct=${hdf5_cv_llong_to_ldouble_correct=no}
 else
    if test "${hdf5_cv_llong_to_ldouble_correct+set}" = set; then :
   $as_echo_n "(cached) " >&6
@@ -27758,9 +27807,9 @@ else
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  hdf5_llong_to_ldouble_correct=yes
+  hdf5_cv_llong_to_ldouble_correct=yes
 else
-  hdf5_llong_to_ldouble_correct=no
+  hdf5_cv_llong_to_ldouble_correct=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -27770,7 +27819,7 @@ fi
 
 fi
 
-if test ${hdf5_llong_to_ldouble_correct} = "yes"; then
+if test ${hdf5_cv_llong_to_ldouble_correct} = "yes"; then
 
 $as_echo "#define LLONG_TO_LDOUBLE_CORRECT 1" >>confdefs.h
 
@@ -27860,8 +27909,8 @@ LIBS="$DEFAULT_LIBS $LIBS"
 
  DYNAMIC_DIRS=""
 
-if test -n "$LDFLAGS"; then
-  for d in $LDFLAGS ; do
+if test -n "$AM_LDFLAGS $LDFLAGS"; then
+  for d in $AM_LDFLAGS $LDFLAGS ; do
     case "$d" in
       -L*)
         d="`echo $d | sed -e 's/-L//g'`"
@@ -27876,9 +27925,9 @@ if test -n "$LDFLAGS"; then
   done
 fi
 
-if test -n "$CPPFLAGS"; then
+if test -n "$AM_CPPFLAGS"; then
   TEMP_CPPFLAGS=""
-  for d in $CPPFLAGS ; do
+  for d in $AM_CPPFLAGS ; do
     case "$d" in
       -I.*)
                         d="`echo $d | sed -e 's/-I//g'`"
@@ -27887,7 +27936,7 @@ if test -n "$CPPFLAGS"; then
     esac
     TEMP_CPPFLAGS="$d $TEMP_CPPFLAGS"
   done
-  CPPFLAGS=$TEMP_CPPFLAGS
+  AM_CPPFLAGS=$TEMP_CPPFLAGS
 fi
 
 
@@ -27974,7 +28023,7 @@ $as_echo_n "checking which version of public symbols to use by default... " >&6;
 if test "${with_default_api_version+set}" = set; then :
   withval=$with_default_api_version;
 else
-  withval=v18
+  withval=v110
 fi
 
 
@@ -27989,11 +28038,15 @@ elif test "X$withval" = "Xv18"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: v18" >&5
 $as_echo "v18" >&6; }
     DEFAULT_API_VERSION=v18
+elif test "X$withval" = "Xv110"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: v110" >&5
+$as_echo "v110" >&6; }
+    DEFAULT_API_VERSION=v110
 else
     as_fn_error "invalid version of public symbols given" "$LINENO" 5
 fi
 
-if test "X${DEFAULT_API_VERSION}" != "Xv18" -a "X${DEPRECATED_SYMBOLS}" = "Xno" ; then
+if test "X${DEFAULT_API_VERSION}" != "Xv110" -a "X${DEPRECATED_SYMBOLS}" = "Xno" ; then
   as_fn_error "Removing old public API symbols not allowed when using them as default public API symbols" "$LINENO" 5
 fi
 
@@ -28135,6 +28188,14 @@ fi
 
 
 
+CFLAGS="$saved_user_CFLAGS"
+FCFLAGS="$saved_user_FCFLAGS"
+CXXFLAGS="$saved_user_CXXFLAGS"
+CPPFLAGS="$saved_user_CPPFLAGS"
+LDFLAGS="$saved_user_LDFLAGS"
+
+
+
  if test "X$HDF_CXX" = "Xyes"; then
   BUILD_CXX_CONDITIONAL_TRUE=
   BUILD_CXX_CONDITIONAL_FALSE='#'
@@ -28181,7 +28242,7 @@ else
    SETX="set -x"
 fi
 
-rm -f conftest conftest.o conftest.c dummy.o
+rm -f conftest conftest.o conftest.c dummy.o *.mod
 
 
 # First the stamp1 file for H5config.h.in
@@ -28784,7 +28845,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by HDF5 $as_me 1.9.47-FA_a4, which was
+This file was extended by HDF5 $as_me 1.9.51-FA_a4, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -28848,7 +28909,7 @@ Report bugs to <help@hdfgroup.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-HDF5 config.status 1.9.47-FA_a4
+HDF5 config.status 1.9.51-FA_a4
 configured by $0, generated by GNU Autoconf 2.64,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -31204,201 +31265,3 @@ cat >> src/H5config.h <<EOF
 EOF
 
 cat src/libhdf5.settings
-
-if false; then
-if test -z "$ECHO_N" -o -z "$ECHO_C"; then
-  if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-    if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-      ECHO_N=''
-      ECHO_C='
-'
-    else
-      ECHO_N=-n
-      ECHO_C=''
-    fi
-  else
-    ECHO_N=''
-    ECHO_C='\c'
-  fi
-fi
-
-PRINT_PLAIN() {
-  echo $ECHO_N "$1$ECHO_C"
-  echo $ECHO_N "$1$ECHO_C" 1>>src/libhdf5.settings
-}
-
-PRINT_N() {
-  echo $ECHO_N "$1:  $ECHO_C"
-  echo $ECHO_N "$1:  $ECHO_C" 1>>src/libhdf5.settings
-}
-
-PRINT() {
-  echo "$1"
-  echo "$1" 1>>src/libhdf5.settings
-}
-
-IF_YES_NO() {
-  if test $# -lt 1; then
-    PRINT "No"
-    return
-  else
-    while test $# -gt 0; do
-      if test "$1" != "yes"; then
-        PRINT "No"
-        return
-      fi
-      shift
-    done
-  fi
-  PRINT "Yes"
-}
-
-IF_ENABLED_DISABLED() {
-  if test "$1" = "yes"; then
-    PRINT "Enabled"
-  else
-    PRINT "Disabled"
-  fi
-}
-
-PRINT ""
-PRINT "                       Configure Summary"
-PRINT "                       ================="
-PRINT ""
-PRINT "Compiling Options:"
-PRINT "------------------"
-
-PRINT_N "               Compilation Mode"
-case "X-$enable_production" in
-  X-yes)        PRINT "Production" ;;
-  X-no)         PRINT "Development" ;;
-  X-profile)    PRINT "Profile" ;;
-  *)            PRINT "$enable_production" ;;
-esac
-
-PRINT_N "                     C Compiler"
-PRINT "$CC"
-
-PRINT_N "                         CFLAGS / H5_CFLAGS"
-PRINT "$CFLAGS"
-PRINT "                         $H5_CFLAGS"
-
-PRINT_N "                       CPPFLAGS / H5_CPPFLAGS"
-PRINT "$CPPFLAGS"
-PRINT "                         $H5_CPPFLAGS"
-
-PRINT_N "                        LDFLAGS"
-PRINT "$LDFLAGS"
-
-PRINT_N "                     Debug Mode"
-
-if test "X$DEBUG_PKG" = "X$all_packages"; then
-  PRINT "All"
-elif test "X$DEBUG_PKG" = "X"; then
-  PRINT "None"
-else
-  PRINT $DEBUG_PKG
-fi
-
-PRINT_N "               Shared Libraries"
-IF_YES_NO "$enable_shared"
-
-PRINT_N "               Static Libraries"
-IF_YES_NO "$enable_static"
-
-PRINT_N "  Statically Linked Executables"
-IF_YES_NO "$STATIC_EXEC"
-
-PRINT_N "Default Version of Public Symbols"
-PRINT $DEFAULT_API_VERSION
-
-PRINT_N " With Deprecated Public Symbols"
-IF_YES_NO "$DEPRECATED_SYMBOLS"
-
-PRINT_N "                        Tracing"
-IF_YES_NO "$TRACE_API"
-
-PRINT_N "Clear file buffers before write"
-IF_YES_NO "$CLEARFILEBUF"
-
-PRINT_N "           Using memory checker"
-IF_YES_NO "$USINGMEMCHECKER"
-
-PRINT_N "   Optimization Instrumentation"
-IF_YES_NO "$INSTRUMENT"
-
-PRINT ""
-PRINT "Languages:"
-PRINT "----------"
-
-PRINT_N "                            C++"
-IF_YES_NO "$HDF_CXX"
-if test X$HDF_CXX = Xyes; then
-    PRINT_N "                   C++ Compiler"
-    PRINT "$CXX"
-
-    PRINT_N "                       CXXFLAGS / H5_CXXFLAGS"
-    PRINT "$CXXFLAGS"
-    PRINT "                       $H5_CXXFLAGS"
-fi
-
-PRINT_N "                        Fortran"
-IF_YES_NO "$HDF_FORTRAN"
-if test X$HDF_FORTRAN = Xyes; then
-    PRINT_N "               Fortran Compiler"
-    PRINT "$FC"
-
-    PRINT_N "                         FCFLAGS / H5_FCFLAGS"
-    PRINT "$FCFLAGS"
-    PRINT "                         $H5_FCFLAGS"
-fi
-
-PRINT ""
-PRINT "Features:"
-PRINT "---------"
-
-PRINT_N "                        dmalloc"
-IF_YES_NO "$HAVE_DMALLOC"
-
-PRINT_N "         Function Stack Tracing"
-IF_ENABLED_DISABLED "$CODESTACK"
-
-PRINT_N "                           GPFS"
-IF_YES_NO "$GPFS"
-
-PRINT_N "      Strict File Format Checks"
-IF_ENABLED_DISABLED "$STRICT_FORMAT_CHECKS"
-
-PRINT_N "            Default API Mapping"
-PRINT "$DEFAULT_API_VERSION"
-
-PRINT_N "         I/O filters (external)"
-PRINT "$EXTERNAL_FILTERS"
-
-PRINT_N "         I/O filters (internal)"
-PRINT "$FILTERS"
-
-PRINT_N " Linux Large File Support (LFS)"
-IF_ENABLED_DISABLED "$LINUX_LFS"
-
-PRINT_N "                            MPE"
-IF_YES_NO "$MPE"
-
-
-PRINT_N "                  Parallel HDF5"
-if test "$PARALLEL" != "no"; then
-  PRINT "Yes"
-else
-  PRINT "No"
-fi
-
-
-PRINT_N "                     Direct VFD"
-IF_ENABLED_DISABLED "$DIRECT_VFD"
-
-PRINT_N "                   Threadsafety"
-IF_ENABLED_DISABLED "$THREADSAFE"
-
-PRINT_N "             High Level library"
-IF_ENABLED_DISABLED "$HDF5_HL"
-fi