[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

33 files changed, 152 insertions, 1867 deletions

diff --git a/config/BlankForm b/config/BlankForm
index a70762c..31116bf 100644
--- a/config/BlankForm
+++ b/config/BlankForm
@@ -72,7 +72,7 @@ fi
 # 			`-pg').  This may or may not include debugging 
 # 			or production flags.
 #			
-# CFLAGS		Flags can be added to this variable which
+# H5_CFLAGS		Flags can be added to this variable which
 #			might already be partially initialized.  These 
 #			flags will always be passed to the compiler
 #			and should include switches to turn on full
@@ -81,16 +81,14 @@ fi
 #			practices resulting in few if any
 #			warnings.
 #
-#			Warning flags do not have to be added to CFLAGS
+#			Warning flags do not have to be added to H5_CFLAGS
 #			variable if the compiler is the GNU gcc
 #			compiler or a descendent of gcc such as EGCS or PGCC.
 #
-#			The CFLAGS should contains *something* or else 
-#			configure will probably add `-g'.  For most
-#			systems this isn't a problem but some systems
-#			will disable optimizations in favor of the
-#			`-g'.
-#			
+# AM_CFLAGS             Flags added directly into this variable will
+#                       be propogated to the compiler wrapper scripts (h5cc,
+#                       h5c++, et cetera) in addition to being used to compile 
+#                       the library.
 #
 # These flags should be set according to the compiler being used.
 # There are two ways to check the compiler.  You can try using `-v' or 
@@ -101,7 +99,7 @@ fi
 
 case $CC_BASENAME in
     gcc)
-	CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
+	H5_CFLAGS="$H5_CFLAGS -Wsign-compare" #Only works for some versions
 	DEBUG_CFLAGS="-g -fverbose-asm"
 	DEBUG_CPPFLAGS=
 	PROD_CFLAGS="-O3 -fomit-frame-pointer"
@@ -111,7 +109,7 @@ case $CC_BASENAME in
 	;;
 
     *)
-	CFLAGS="$CFLAGS -ansi"
+	H5_CFLAGS="$H5_CFLAGS -ansi"
 	DEBUG_CFLAGS="-g"
 	DEBUG_CPPFLAGS=
 	PROD_CFLAGS="-O"
diff --git a/config/apple b/config/apple
index 14504bb..8c4cc8e 100644
--- a/config/apple
+++ b/config/apple
@@ -28,54 +28,30 @@ fi
 
 # Figure out compiler flags
 . $srcdir/config/gnu-flags
-
-# The default Fortran 90 compiler
+ 
+. $srcdir/config/intel-flags
 if test "X-" = "X-$FC"; then
-    # Assume Absoft compiler
-    FC=xlf
-    FC_BASENAME=xlf
-  else
-
-    # Neither xlf nor f95 have a working "version" command.
-    # If FC is set, try to guess which one is being used by examining
-    # the last element in the path to the compiler.
-
-    TEMP_BASENAME=`basename $FC`
-    if test "xlf" = "${TEMP_BASENAME}"; then
-      FC_BASENAME=xlf
-    else
-      FC_BASENAME=f95
-    fi
+    case $CC_BASENAME in
+        gcc*)
+            FC=gfortran
+            FC_BASENAME=gfortran
+            ;;
+        icc*)
+            FC=ifort
+            FC_BASENAME=ifort
+            ;;
+    esac
 fi
-
-case $FC_BASENAME in
-    xlf) 
-        F9XSUFFIXFLAG="-qsuffix=f=f90 -qfree=f90"
-        FCFLAGS="$FCFLAGS ${F9XSUFFIXFLAG}"
-        H5_FCFLAGS="$H5_FCFLAGS -qmoddir=./ "
-        FSEARCH_DIRS="-I./ -I../src"
-        DEBUG_FCFLAGS="-g"
-        PROD_FCFLAGS="-O"
-        PROFILE_FCFLAGS="-g"
-        f9x_flags_set=yes
-        ;;
-
-    f95)
-
-        F9XSUFFIXFLAG=""
-# We force compiler to use upper case for external names 
-# (just in case since this should be a default EIP)
-        H5_FCFLAGS="$H5_FCFLAGS"
-        FSEARCH_DIRS=""
-        DEBUG_FCFLAGS="-g"
-        PROD_FCFLAGS="-O"
-        PROFILE_FCFLAGS="-g -pg"
-        f9x_flags_set=yes
-
-# f95 doesn't support shared libraries
-        echo '    warning: shared libraries are not supported for f95!'
-        echo '    disabling shared libraries'
+# Figure out compiler flags
+. $srcdir/config/gnu-fflags
+ 
+. $srcdir/config/intel-fflags
+
+# Fortran doesn't work with shared libraries
+# 
+if test "X-" != "X-$enable_fortran"; then
+        echo '    Warning: shared libraries are not supported with Fortran'
+        echo '    Disabling shared libraries'
         enable_shared="no"
-        ;;
+fi
 
-esac  
diff --git a/config/commence.am b/config/commence.am
index e5e4de9..667dbb2 100644
--- a/config/commence.am
+++ b/config/commence.am
@@ -55,13 +55,15 @@ H5FC_PP=$(bindir)/h5pfc
 H5CPP=$(bindir)/h5c++
   
 
-# H5_CFLAGS holds flags that should be used as CFLAGS when building hdf5,
-# but which shouldn't be exported to h5cc for building other programs.
-
-CFLAGS=@CFLAGS@ @H5_CFLAGS@
-CPPFLAGS=@CPPFLAGS@ @H5_CPPFLAGS@
-FCFLAGS=@FCFLAGS@ @H5_FCFLAGS@
-CXXFLAGS=@CXXFLAGS@ @H5_CXXFLAGS@
+# H5_CFLAGS holds flags that should be used when building hdf5,
+# but which should not be exported to h5cc for building other programs.
+# AM_CFLAGS is an automake construct which should be used by Makefiles 
+# instead of CFLAGS, as CFLAGS is reserved solely for the user to define.
+
+AM_CFLAGS=@AM_CFLAGS@ @H5_CFLAGS@
+AM_FCFLAGS=@AM_FCFLAGS@ @H5_FCFLAGS@
+AM_CXXFLAGS=@AM_CXXFLAGS@ @H5_CXXFLAGS@
+AM_CPPFLAGS=@AM_CPPFLAGS@ @H5_CPPFLAGS@
 
 # The trace script; this is used on source files from the C library to
 # insert tracing macros.
diff --git a/config/craynv b/config/craynv
index 9371ac3..479d5c8 100644
--- a/config/craynv
+++ b/config/craynv
@@ -68,25 +68,23 @@ RANLIB=:
 #                      `-pg').  This may or may not include debugging 
 #                      or production flags.
 #                      
-# CFLAGS               Flags can be added to this variable which
-#                      might already be partially initialized.  These 
-#                      flags will always be passed to the compiler
-#                      and should include switches to turn on full
-#                      warnings.  HDF5 attempts to be ANSI and Posix
-#                      compliant and employ good programming
-#                      practices resulting in few if any
-#                      warnings.
+# H5_CFLAGS		Flags can be added to this variable which
+#			might already be partially initialized.  These 
+#			flags will always be passed to the compiler
+#			and should include switches to turn on full
+#			warnings.  HDF5 attempts to be ANSI and Posix
+#			compliant and employ good programming
+#			practices resulting in few if any
+#			warnings.
 #
-#                      Warning flags do not have to be added to CFLAGS
-#                      variable if the compiler is the GNU gcc
-#                      compiler or a descendent of gcc such as EGCS or PGCC.
+#			Warning flags do not have to be added to H5_CFLAGS
+#			variable if the compiler is the GNU gcc
+#			compiler or a descendent of gcc such as EGCS or PGCC.
 #
-#                      The CFLAGS should contains *something* or else 
-#                      configure will probably add `-g'.  For most
-#                      systems this isn't a problem but some systems
-#                      will disable optimizations in favor of the
-#                      `-g'.
-#                      
+# AM_CFLAGS             Flags added directly into this variable will
+#                       be propogated to the compiler wrapper scripts (h5cc,
+#                       h5c++, et cetera) in addition to being used to compile 
+#                       the library.
 #
 # These flags should be set according to the compiler being used.
 # There are two ways to check the compiler.  You can try using `-v' or 
@@ -162,7 +160,7 @@ if test "X-" = "X-$f9x_flags_set"; then
     # The -em flag enables .mod files, which is what HDF5 builds.
     F9XSUFFIXFLAG=""
     FSEARCH_DIRS=""
-    FCFLAGS="$FCFLAGS -em"
+    H5_FCFLAGS="$H5_FCFLAGS -em"
     DEBUG_FCFLAGS="-g"
     PROD_FCFLAGS=""
     PROFILE_FCFLAGS=""
diff --git a/config/dec-flags b/config/dec-flags
index fe9ee87..8f3fa1a 100644
--- a/config/dec-flags
+++ b/config/dec-flags
@@ -26,7 +26,7 @@
 #
 if test X = "X$cc_flags_set"; then
     cc_vendor=DEC
-    cc_version="`$CC $CFLAGS -V 2>&1 |head -1`"
+    cc_version="`$CC $CFLAGS $H5_CFLAGS -V 2>&1 |head -1`"
     case "$cc_version" in
 	DEC*)
 	    cc_version="`echo $cc_version |\
@@ -111,7 +111,7 @@ fi
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FCFLAGS="$FCFLAGS -Olimit 2048 -std1"
+  H5_FCFLAGS="$H5_FCFLAGS -Olimit 2048 -std1"
   DEBUG_FCFLAGS="-Olimit 2048 -std1"
   PROD_FCFLAGS="-Olimit 2048 -std1"
   PROFILE_FCFLAGS="-Olimit 2048 -std1"
@@ -128,7 +128,7 @@ fi
 
 case $CXX_BASENAME in
     g++)
-	CXXFLAGS="$CXXFLAGS -Wsign-compare" #Only works for some versions
+	H5_CXXFLAGS="$H5_CXXFLAGS -Wsign-compare" #Only works for some versions
 	DEBUG_CXXFLAGS="-g -fverbose-asm"
 	DEBUG_CPPFLAGS=
 	PROD_CXXFLAGS="-O3 -fomit-frame-pointer"
@@ -138,7 +138,7 @@ case $CXX_BASENAME in
 	;;
 
     *)
-	CXXFLAGS="$CXXFLAGS -tlocal -D__USE_STD_IOSTREAM"
+	H5_CXXFLAGS="$H5_CXXFLAGS -tlocal -D__USE_STD_IOSTREAM"
 	DEBUG_CXXFLAGS="-g"
 	DEBUG_CPPFLAGS=
 	PROD_CXXFLAGS="-O"
diff --git a/config/dec-osf4.x b/config/dec-osf4.x
deleted file mode 100644
index 3b93ed9..0000000
--- a/config/dec-osf4.x
+++ /dev/null
@@ -1,37 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-#
-# See BlankForm in this directory for detailed information.
-
-# The default compiler is `cc'
-if test "X-" =  "X-$CC"; then
-    CC=cc
-    CC_BASENAME=cc
-fi
-
-# Try GNU compiler flags.
-. $srcdir/config/gnu-flags
-
-# Try native DEC compiler
-ARCH=${ARCH:='-arch host -tune host'}
-. $srcdir/config/dec-flags
-# DEC MPI-IO implementation has a bug,
-#it cannot generate correct MPI derived datatype.                                                   
-hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'}  
diff --git a/config/dec-osf5.x b/config/dec-osf5.x
deleted file mode 100644
index 2d875ff..0000000
--- a/config/dec-osf5.x
+++ /dev/null
@@ -1,40 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-#
-# See BlankForm in this directory for detailed information.
-
-# The default compiler is `cc'
-if test "X-" =  "X-$CC"; then
-    CC=cc
-    CC_BASENAME=cc
-fi
-
-# Try GNU compiler flags.
-. $srcdir/config/gnu-flags
-
-# Try native DEC compiler
-ARCH=${ARCH:='-arch host -tune host'}
-. $srcdir/config/dec-flags
-
-# DEC MPI-IO implementation has a bug, it cannot generate correct MPI
-# derived datatype.
-hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'}  
-# It does not do all collective IO correctly.
-hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'} 
diff --git a/config/freebsd b/config/freebsd
index 8f2e5e4..7452ff0 100644
--- a/config/freebsd
+++ b/config/freebsd
@@ -68,7 +68,7 @@ fi
 if test "X-" != "X-$enable_threadsafe"; then
   H5_CFLAGS="$H5_CFLAGS -D_THREAD_SAFE" 
   H5_CXXFLAGS="$H5_CXXFLAGS -D_THREAD_SAFE" 
-  LDFLAGS="$LDFLAGS -pthread"
+  AM_LDFLAGS="$AM_LDFLAGS -pthread"
 fi
 
 # Temporarily hard set this variable.  The problem of loss of the last 2 bytes of mantissa
diff --git a/config/hpux11.00 b/config/hpux11.00
deleted file mode 100644
index 1a80091..0000000
--- a/config/hpux11.00
+++ /dev/null
@@ -1,101 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-#
-# See BlankForm in this directory for details.
-
-# Shared libraries don't work for all compilers under HPUX11.00.  This is a
-# known bug in libtool (as of June 2006).
-# Disable shared libraries until we can be sure they work.
-enable_shared="${enable_shared:-no}"
-
-# Default compiler is `cc'
-if test "X-" =  "X-$CC"; then
-  CC=cc
-  CC_BASENAME=cc
-fi
-
-# Flags
-case "X-$CC" in
-  X-gcc)
-    CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
-    DEBUG_CFLAGS="-g -fverbose-asm"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O3"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-
-  *)
-    CFLAGS="$CFLAGS -Ae -Wp,-H65536" #increase the size of macro definition table. For test/dtypes.c
-    DEBUG_CFLAGS=-g
-    DEBUG_CPPFLAGS="-Ae"
-    PROD_CFLAGS=-O
-    PROD_CPPFLAGS="-Ae"
-    PROFILE_CFLAGS=
-    PROFILE_CPPFLAGS="-Ae"
-    ;;
-esac
-
-# The default Fortran 90 compiler
-
-if test "X$FC" = "X"; then
-  FC=f90
-fi
-
-if test "X$f9x_flags_set" = "X"; then
-  F9XSUFFIXFLAG=""
-  FSEARCH_DIRS=""
-  FCFLAGS="$FCFLAGS -O"
-  DEBUG_FCFLAGS="-O"
-  PROD_FCFLAGS="-O"
-  PROFILE_FCFLAGS="-O"
-  f9x_flags_set=yes
-fi
-
-# The default C++ compiler
-
-if test -z "$CXX"; then
-  CXX=aCC
-  CXX_BASENAME=aCC
-fi
-
-case "X-$CXX" in
-  X-aCC)
-    # +Z for PIC, +A for using archived libraries
-    CXXFLAGS="$CXXFLAGS +Z +A -D_INCLUDE_LONGLONG"
-    CFLAGS="$CFLAGS -g +O2"
-    DEBUG_CXXFLAGS=-g
-    DEBUG_CPPFLAGS=
-    PROD_CXXFLAGS="-O -s"
-    PROD_CPPFLAGS=
-    PROFILE_CPPFLAGS=
-    ;;
-
-  *)
-    CXXFLAGS="$CXXFLAGS -D_INCLUDE_LONGLONG"
-    CFLAGS="$CFLAGS"
-    DEBUG_CXXFLAGS=
-    DEBUG_CPPFLAGS=
-    PROD_CXXFLAGS=
-    PROD_CPPFLAGS=
-    PROFILE_CPPFLAGS=
-    ;;
-esac
diff --git a/config/hpux11.23 b/config/hpux11.23
index 0e3bc2a..339cc84 100644
--- a/config/hpux11.23
+++ b/config/hpux11.23
@@ -29,7 +29,7 @@ fi
 # Flags
 case "X-$CC" in
   X-gcc)
-    CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
+    H5_CFLAGS="$H5_CFLAGS -Wsign-compare" #Only works for some versions
     DEBUG_CFLAGS="-g -fverbose-asm"
     DEBUG_CPPFLAGS=
     PROD_CFLAGS="-O3"
@@ -39,7 +39,7 @@ case "X-$CC" in
     ;;
 
   *)
-    CFLAGS="$CFLAGS -Ae -Wp,-H65536" #increase the size of macro definition table. For test/dtypes.c
+    H5_CFLAGS="$H5_CFLAGS -Ae -Wp,-H65536" #increase the size of macro definition table. For test/dtypes.c
     DEBUG_CFLAGS=-g
     DEBUG_CPPFLAGS="-Ae"
     PROD_CFLAGS=-O
@@ -58,7 +58,7 @@ fi
 if test "X$f9x_flags_set" = "X"; then
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FCFLAGS="$FCFLAGS -O"
+  H5_FCFLAGS="$H5_FCFLAGS -O"
   DEBUG_FCFLAGS="-O"
   PROD_FCFLAGS="-O"
   PROFILE_FCFLAGS="-O"
@@ -75,8 +75,8 @@ fi
 case "X-$CXX" in
   X-aCC)
     # +Z for PIC
-    CXXFLAGS="$CXXFLAGS +Z  -D_INCLUDE_LONGLONG"
-    CFLAGS="$CFLAGS -g +O2"
+    H5_CXXFLAGS="$H5_CXXFLAGS +Z  -D_INCLUDE_LONGLONG"
+    H5_CFLAGS="$H5_CFLAGS -g +O2"
     DEBUG_CXXFLAGS=-g
     DEBUG_CPPFLAGS=
     PROD_CXXFLAGS="-O -s"
@@ -85,8 +85,8 @@ case "X-$CXX" in
     ;;
 
   *)
-    CXXFLAGS="$CXXFLAGS -D_INCLUDE_LONGLONG"
-    CFLAGS="$CFLAGS"
+    H5_CXXFLAGS="$H5_CXXFLAGS -D_INCLUDE_LONGLONG"
+    H5_CFLAGS="$H5_CFLAGS"
     DEBUG_CXXFLAGS=
     DEBUG_CPPFLAGS=
     PROD_CXXFLAGS=
diff --git a/config/i686-pc-cygwin b/config/i686-pc-cygwin
index 555d9cd..a51adc3 100644
--- a/config/i686-pc-cygwin
+++ b/config/i686-pc-cygwin
@@ -94,12 +94,12 @@ case $FC_BASENAME in
     #
     f95)
         # Set required flag for compiling C stubs
-        CFLAGS="$CFLAGS -DH5_ABSOFT" 
+        H5_CFLAGS="$H5_CFLAGS -DH5_ABSOFT" 
 
         F9XSUFFIXFLAG=""
 # We force compiler to use upper case for external names 
 # (just in case since this should be a default EIP)
-        FCFLAGS="$FCFLAGS -YEXT_NAMES=UCS"
+        H5_FCFLAGS="$H5_FCFLAGS -YEXT_NAMES=UCS"
         FSEARCH_DIRS=""
         DEBUG_FCFLAGS="-g"
         PROD_FCFLAGS="-O"
diff --git a/config/ia64-linux-gnu b/config/ia64-linux-gnu
index 9bebd37..1961119 100644
--- a/config/ia64-linux-gnu
+++ b/config/ia64-linux-gnu
@@ -50,7 +50,7 @@ case $CC_BASENAME in
 	;;
 
     *)
-	CFLAGS="$CFLAGS -ansi"
+	H5_CFLAGS="$H5_CFLAGS -ansi"
 	DEBUG_CFLAGS="-g"
 	DEBUG_CPPFLAGS=
 	PROD_CFLAGS="-O"
@@ -76,7 +76,7 @@ case $FC in
     # this is for efc v7.  Older efc do not work with these.
     # -Vaxlib is for non-standard fortran calls like exit().
     MORE_FCFLAGS='-fpp -DDEC$=DEC_ -DMS$=MS_ -Vaxlib'
-    FCFLAGS="$FCFLAGS $MORE_FCFLAGS"
+    H5_FCFLAGS="$H5_FCFLAGS $MORE_FCFLAGS"
     f9x_flags_set=yes
     ;;
 
@@ -89,7 +89,7 @@ esac
 if test "X$f9x_flags_set" = "X"; then
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FCFLAGS="$FCFLAGS"
+  H5_FCFLAGS="$H5_FCFLAGS"
   DEBUG_FCFLAGS=""
   PROD_FCFLAGS=""
   PROFILE_FCFLAGS=""
@@ -113,7 +113,7 @@ fi
 case $CXX_BASENAME in
     ecc|icc)	# Intel compilers
 	# Default to C99 standard.
-	CXXFLAGS="${CXXFLAGS:--std=c99}"
+	H5_CXXFLAGS="${H5_CXXFLAGS:--std=c99}"
 	DEBUG_CXXFLAGS="-g -w2 -Wall"
 	DEBUG_CPPFLAGS=
 	PROD_CXXFLAGS=""     #Default optimization O2 is used
@@ -122,7 +122,7 @@ case $CXX_BASENAME in
 	PROFILE_CPPFLAGS=
 	;;
     g++)
-	CXXFLAGS="$CXXFLAGS -Wsign-compare" #Only works for some versions
+	H5_CXXFLAGS="$H5_CXXFLAGS -Wsign-compare" #Only works for some versions
 	DEBUG_CXXFLAGS="-g -fverbose-asm"
 	DEBUG_CPPFLAGS=
 	PROD_CXXFLAGS="-O3 -fomit-frame-pointer"
@@ -133,7 +133,7 @@ case $CXX_BASENAME in
 
     *)
 	# Default to C99 standard.
-	CXXFLAGS="${CXXFLAGS:--std=c99}"
+	H5_CXXFLAGS="${H5_CXXFLAGS:--std=c99}"
 	DEBUG_CXXFLAGS="-g"
 	DEBUG_CPPFLAGS=
 	PROD_CXXFLAGS="-O"
@@ -146,8 +146,8 @@ esac
 # Check MPICH settings
 . $srcdir/config/mpich
 #Uncomment the next line if your system doesn't support MPI complex derived datatype.
-#hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'}
+#hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'}
 #Comment out the following line if your system supports collective IO when some processes
 #don't have any contributions to IOs.
-hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'}
+hdf5_cv_mpi_special_collective_io_works=${hdf5_cv_mpi_special_collective_io_works='no'}
 
diff --git a/config/intel-fflags b/config/intel-fflags
index 998e569..3e33fc9 100644
--- a/config/intel-fflags
+++ b/config/intel-fflags
@@ -70,7 +70,7 @@ if test "X-ifort" = "X-$f9x_vendor"; then
     FC_BASENAME=ifort
     F9XSUFFIXFLAG=""
     FSEARCH_DIRS=""
-    FCFLAGS="$FCFLAGS"
+    H5_FCFLAGS="$H5_FCFLAGS"
 
     # Production
     PROD_FCFLAGS="-O3"
diff --git a/config/intel-osf1 b/config/intel-osf1
deleted file mode 100644
index 27d89cf..0000000
--- a/config/intel-osf1
+++ /dev/null
@@ -1,180 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-#
-# See BlankForm in this directory for details.
-
-# This is for the ASCI RED TFLOPS machine
-
-# The default compiler is `cicc'
-if test "X-" = "X-$CC"; then
-    CC=cicc
-    CC_BASENAME=cicc
-fi
-
-# The default archiver is `xar'
-AR=${AR:-xar}
-
-# There is no ranlib
-RANLIB=:
-
-# Additional libraries
-LIBS="$LIBS -lnoop_stubs"
-
-# How to run serial and parallel test programs
-# Default parallel tests can fit within 1 processor in -proc 3 mode.
-# You may want to use -proc 3 to use fewer physical nodes. 
-RUNSERIAL=${RUNSERIAL:-"yod -sz 1"}
-RUNPARALLEL=${RUNPARALLEL:-"yod -sz 8"}
-
-# CFLAGS must be set else configure set it to -g
-CFLAGS="$CFLAGS"
-
-# What must *always* be present for things to compile correctly?
-# -DH5_TFLOPS: for the Sandia Tflops machine.  Had used the builtin
-# __PUMAGON__ but H5_TFLOPS is more meaningful.
-CPPFLAGS="$CPPFLAGS -DH5_TFLOPS"
-
-# What compiler flags should be used for code development?
-DEBUG_CFLAGS=-g
-DEBUG_CPPFLAGS=
-
-# What compiler flags should be used for building a production
-# library?
-PROD_CFLAGS=-O
-PROD_CPPFLAGS=
-
-# What compiler flags enable code profiling?
-PROFILE_CFLAGS=-pg
-PROFILE_CPPFLAGS=
-
-# Turn off shared lib option.  It does not work for TFLOPS yet.
-enable_shared="${enable_shared:-no}"
-
-# Disable stream-vfd option.  It does not work for TFLOPS.
-enable_stream_vfd="${enable_stream_vfd:-no}"
-
-# Set this to the width required by printf() to print type `long
-# long'.  For instance, if the format would be `%lld' then set it to
-# `ll' or if the format would be `%qd' set it to `q'.
-hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'}
-
-# Cache the sizeof of the following types to save configure time.
-# These are verified in test/tconfig in case they change.
-ac_cv_type_char=${ac_cv_type_char=yes}
-ac_cv_sizeof_char=${ac_cv_sizeof_char='1'}
-ac_cv_type_short=${ac_cv_type_short=yes}
-ac_cv_sizeof_short=${ac_cv_sizeof_short='2'}
-ac_cv_type_int=${ac_cv_type_int=yes}
-ac_cv_sizeof_int=${ac_cv_sizeof_int='4'}
-ac_cv_type_long=${ac_cv_type_long=yes}
-ac_cv_sizeof_long=${ac_cv_sizeof_long='4'}
-ac_cv_type_float=${ac_cv_type_float=yes}
-ac_cv_sizeof_float=${ac_cv_sizeof_float='4'}
-ac_cv_type_double=${ac_cv_type_double=yes}
-ac_cv_sizeof_double=${ac_cv_sizeof_double='8'}
-ac_cv_type_long_double=${ac_cv_type_long_double=yes}
-ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double='8'}
-ac_cv_type_long_long=${ac_cv_type_long_long=yes}
-ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long='8'}
-ac_cv_type_size_t=${ac_cv_type_size_t=yes}
-ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t='4'}
-ac_cv_type_ssize_t=${ac_cv_type_ssize_t=yes}
-ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t='4'}
-ac_cv_type_off_t=${ac_cv_type_off_t=yes}
-ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t='4'}
-
-# Hard set sizeof of the following types to 0 because they are not supported.
-ac_cv_type___int64=${ac_cv_type___int64=no}
-ac_cv_sizeof___int64=${ac_cv_sizeof___int64='0'}
-
-# Hard set malloc of zero bytes to no because it does not work.
-hdf5_cv_malloc_works=${hdf5_cv_malloc_works='no'}
-
-# Hard set sizeof_intN_t to 0 because they are not supported.
-ac_cv_type_int8_t=${ac_cv_type_int8_t=no}
-ac_cv_type_int16_t=${ac_cv_type_int16_t=no}
-ac_cv_type_int32_t=${ac_cv_type_int32_t=no}
-ac_cv_type_int64_t=${ac_cv_type_int64_t=no}
-ac_cv_type_uint8_t=${ac_cv_type_uint8_t=no}
-ac_cv_type_uint16_t=${ac_cv_type_uint16_t=no}
-ac_cv_type_uint32_t=${ac_cv_type_uint32_t=no}
-ac_cv_type_uint64_t=${ac_cv_type_uint64_t=no}
-ac_cv_sizeof_int8_t=${ac_cv_sizeof_int8_t='0'}
-ac_cv_sizeof_int16_t=${ac_cv_sizeof_int16_t='0'}
-ac_cv_sizeof_int32_t=${ac_cv_sizeof_int32_t='0'}
-ac_cv_sizeof_int64_t=${ac_cv_sizeof_int64_t='0'}
-ac_cv_sizeof_uint8_t=${ac_cv_sizeof_uint8_t='0'}
-ac_cv_sizeof_uint16_t=${ac_cv_sizeof_uint16_t='0'}
-ac_cv_sizeof_uint32_t=${ac_cv_sizeof_uint32_t='0'}
-ac_cv_sizeof_uint64_t=${ac_cv_sizeof_uint64_t='0'}
-
-# Hard set sizeof_int_leastN_t to 0 because they are not supported.
-ac_cv_type_int_least8_t=${ac_cv_type_int_least8_t=no}
-ac_cv_type_int_least16_t=${ac_cv_type_int_least16_t=no}
-ac_cv_type_int_least32_t=${ac_cv_type_int_least32_t=no}
-ac_cv_type_int_least64_t=${ac_cv_type_int_least64_t=no}
-ac_cv_type_uint_least8_t=${ac_cv_type_uint_least8_t=no}
-ac_cv_type_uint_least16_t=${ac_cv_type_uint_least16_t=no}
-ac_cv_type_uint_least32_t=${ac_cv_type_uint_least32_t=no}
-ac_cv_type_uint_least64_t=${ac_cv_type_uint_least64_t=no}
-ac_cv_sizeof_int_least8_t=${ac_cv_sizeof_int_least8_t='0'}
-ac_cv_sizeof_int_least16_t=${ac_cv_sizeof_int_least16_t='0'}
-ac_cv_sizeof_int_least32_t=${ac_cv_sizeof_int_least32_t='0'}
-ac_cv_sizeof_int_least64_t=${ac_cv_sizeof_int_least64_t='0'}
-ac_cv_sizeof_uint_least8_t=${ac_cv_sizeof_uint_least8_t='0'}
-ac_cv_sizeof_uint_least16_t=${ac_cv_sizeof_uint_least16_t='0'}
-ac_cv_sizeof_uint_least32_t=${ac_cv_sizeof_uint_least32_t='0'}
-ac_cv_sizeof_uint_least64_t=${ac_cv_sizeof_uint_least64_t='0'}
-
-# Hard set sizeof_int_fastN_t to 0 because they are not supported.
-ac_cv_type_int_fast8_t=${ac_cv_type_int_fast8_t=no}
-ac_cv_type_int_fast16_t=${ac_cv_type_int_fast16_t=no}
-ac_cv_type_int_fast32_t=${ac_cv_type_int_fast32_t=no}
-ac_cv_type_int_fast64_t=${ac_cv_type_int_fast64_t=no}
-ac_cv_type_uint_fast8_t=${ac_cv_type_uint_fast8_t=no}
-ac_cv_type_uint_fast16_t=${ac_cv_type_uint_fast16_t=no}
-ac_cv_type_uint_fast32_t=${ac_cv_type_uint_fast32_t=no}
-ac_cv_type_uint_fast64_t=${ac_cv_type_uint_fast64_t=no}
-ac_cv_sizeof_int_fast8_t=${ac_cv_sizeof_int_fast8_t='0'}
-ac_cv_sizeof_int_fast16_t=${ac_cv_sizeof_int_fast16_t='0'}
-ac_cv_sizeof_int_fast32_t=${ac_cv_sizeof_int_fast32_t='0'}
-ac_cv_sizeof_int_fast64_t=${ac_cv_sizeof_int_fast64_t='0'}
-ac_cv_sizeof_uint_fast8_t=${ac_cv_sizeof_uint_fast8_t='0'}
-ac_cv_sizeof_uint_fast16_t=${ac_cv_sizeof_uint_fast16_t='0'}
-ac_cv_sizeof_uint_fast32_t=${ac_cv_sizeof_uint_fast32_t='0'}
-ac_cv_sizeof_uint_fast64_t=${ac_cv_sizeof_uint_fast64_t='0'}
-
-hdf5_cv_system_scope_threads=${hdf5_cv_system_scope_threads="no"}
-
-# Hard set MPI_File_set_size() working for files over 2GB to no
-hdf5_cv_mpi_file_set_size_big=${hdf5_cv_mpi_file_set_size_big='no'}
-
-# Hard set variables for v1.7 and higher.
-# Set gettimeofday_tz to yes.
-hdf5_cv_gettimeofday_tz=${hdf5_cv_gettimeofday_tz='yes'}
-hdf5_cv_convert_denormal_float=${hdf5_cv_convert_denormal_float='no'}
-hdf5_cv_fp_to_ullong_bottom_bit_works=${hdf5_cv_fp_to_ullong_bottom_bit_works='no'}
-hdf5_cv_fp_to_ullong_right_maximum=${hdf5_cv_fp_to_ullong_right_maximum='yes'}
-hdf5_cv_ldouble_to_uint_works=${hdf5_cv_ldouble_to_uint_works='yes'}
-hdf5_cv_sw_ldouble_to_integer_works=${hdf5_cv_sw_ldouble_to_integer_works='yes'}
-hdf5_cv_sw_ulong_to_fp_bottom_bit_works=${hdf5_cv_sw_ulong_to_fp_bottom_bit_works='no'}
-hdf5_cv_ullong_to_fp_cast_works=${hdf5_cv_ullong_to_fp_cast_works='yes'}
-hdf5_cv_ullong_to_ldouble_precision_works=${hdf5_cv_ullong_to_ldouble_precision_works='yes'}
-hdf5_cv_fp_to_integer_overflow_works=${hdf5_cv_fp_to_integer_overflow_works='yes'}
diff --git a/config/irix5.x b/config/irix5.x
deleted file mode 100644
index bd8a3be..0000000
--- a/config/irix5.x
+++ /dev/null
@@ -1,94 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-#
-# See BlankForm in this directory for details
-
-# Disable dependency tracking on IRIX unless the user specifically asks for
-# it.
-# IRIX's pmake confuses automake (as of version 1.9) if dependency tracking
-# is enabled and it is not an in-place build.  Simply disabling dependency
-# tracking on IRIX is simpler to implement than detecting pmake, detecting
-# when a build is not in-place, and then disabling dependency tracking.
-if test -z "${enable_dependency_tracking}"; then
-  enable_dependency_tracking="no"
-fi
-
-# The default compiler is `cc' and there is no ranlib.
-if test "X-" = "X-$CC"; then
-  CC=cc
-  CC_BASENAME=cc
-fi
-RANLIB=:
-
-case "X-$CC_BASENAME" in
-  X-gcc)
-    H5_CFLAGS="$H5_CFLAGS -Wsign-compare" #Only works for some versions
-    DEBUG_CFLAGS="-g -fverbose-asm"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O3"
-	PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-
-  *)
-    # Do *not* use -ansi because it prevents hdf5 from being able
-    # to read modification dates from the file. On some systems it
-    # can also result in compile errors in system header files
-    # since hdf5 includes a couple non-ANSI header files.
-    #CFLAGS="$CFLAGS -ansi"
-
-    # Always turn off these compiler warnings:
-    H5_CFLAGS="$H5_CFLAGS -woff 799"
-
-    # Extra debugging flags
-    DEBUG_CFLAGS=-g
-    DEBUG_CPPFLAGS=
-
-    # Extra production flags
-    # Note: higher optimizations relax alignment requirements needed.
-    PROD_CFLAGS="-O -s"
-    PROD_CPPFLAGS=
-
-    # Extra profiling flags
-    PROFILE_CFLAGS=-pg
-    PROFILE_CPPFLAGS=
-    ;;
-esac
-
-# Hard set flag to indicate that the 'unsigned long long' to floating-point
-# value conversion are broken by the compilers (as of 4/27/04 - QAK)
-hdf5_cv_ulong_to_fp_bottom_bit_accurate=${hdf5_cv_ulong_to_fp_bottom_bit_accurate='no'}
-
-# Set flags to avoid conversion between 'long double' and integers because of 
-# SGI's compiler problems.  For both IRIX64 6.5 and IRIX 6.5, the compilers
-# have the following problems,
-#       long double -> signed char : incorrect rounding
-#       long double -> unsigned char : incorrect rounding
-#       long double -> short : incorrect rounding
-#       long double -> unsigned short : incorrect rounding
-#       long double -> long or long long: incorrect value
-#       long double -> unsigned long or long long : incorrect value
-#
-#       long or long long -> long double : correct value but incorrect bit pattern
-#       unsigned long or long long -> long double : correct value but incorrect bit pattern
-# (1/5/05 - SLU)
-hdf5_cv_ldouble_to_integer_accurate=${hdf5_cv_ldouble_to_integer_accurate='no'}
-hdf5_cv_integer_to_ldouble_accurate=${hdf5_cv_integer_to_ldouble_accurate='no'}
diff --git a/config/irix6.x b/config/irix6.x
index 05b308c..9bd9c4c 100644
--- a/config/irix6.x
+++ b/config/irix6.x
@@ -73,14 +73,14 @@ case "X-$CC_BASENAME" in
       #    1429:  the `long long' type is not standard
       #    1685:  turn off warnings about turning off invalid warnings
       #    3201:  remark - parameter not referenced
-      #CFLAGS="$CFLAGS -woff 1174,1429,1209,1196,1685,3201"
+      #H5_CFLAGS="$H5_CFLAGS -woff 1174,1429,1209,1196,1685,3201"
       H5_CFLAGS="$H5_CFLAGS -woff 1209,3201"
 
       # Always turn off these compiler warnings for the old compiler:
       #    799:   the `long long' type is not standard
       #    803:   turn off warnings about turning off invalid warnings
       #    835:   __vfork() (this is an SGI config problem)
-      #CFLAGS="$CFLAGS -woff 799,803,835"
+      #H5_CFLAGS="$H5_CFLAGS -woff 799,803,835"
 
       # Always turn off these loader warnings:
       # (notice the peculiar syntax)
@@ -133,7 +133,7 @@ fi
 if test -z "$cxx_flags_set"; then
   # -LANG:std required for std use; -ptused causes templates used to be
   # instantiated
-  CPPFLAGS="$CPPFLAGS -LANG:std"
+  AM_CPPFLAGS="$AM_CPPFLAGS -LANG:std"
   H5_CPPFLAGS="$H5_CPPFLAGS -ptused"
 
   # libCio is a default library, since libtool before 1.5 doesn't fully 
@@ -176,18 +176,18 @@ hdf5_cv_integer_to_ldouble_accurate=${hdf5_cv_integer_to_ldouble_accurate='no'}
 # Versions 7.4.2m or newer work.
 # Up to version 7.4.4m, it cannot handle collective IO with non-contribution 
 # of some processes.
-# Fix $hdf5_mpi_complex_derived_datatype_works if it is not set and is using cc.
-if [ -z "$hdf5_mpi_complex_derived_datatype_works" -a $CC_BASENAME = cc ]; then
+# Fix $hdf5_cv_mpi_complex_derived_datatype_works if it is not set and is using cc.
+if [ -z "$hdf5_cv_mpi_complex_derived_datatype_works" -a $CC_BASENAME = cc ]; then
     ccversion=`$CC -version 2>&1 | sed -e 's/.*Version //p'`
     ccversion1=`echo $ccversion | cut -f1 -d.`
     ccversion2=`echo $ccversion | cut -f2 -d.`
     # Assume all versions 7.4.* or newer are okay
     # and assume ccversion2 is never larger than 99.
     ccversionval=`expr $ccversion1 \* 100 + $ccversion2`
-    hdf5_mpi_special_collective_io_works='no'
+    hdf5_cv_mpi_special_collective_io_works='no'
     if [ $ccversionval -lt 704 ]; then
-        hdf5_mpi_complex_derived_datatype_works='no'
-#        hdf5_mpi_special_collective_io_works='no'
+        hdf5_cv_mpi_complex_derived_datatype_works='no'
+#        hdf5_cv_mpi_special_collective_io_works='no'
     fi
 fi
 
diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1
index 8c64734..667f04e 100644
--- a/config/linux-gnulibc1
+++ b/config/linux-gnulibc1
@@ -122,12 +122,12 @@ fi
 #     1. collective I/O when some processes don't have any contributions;
 #     2. complex derived MPI data type.
 if test $CC_BASENAME = cmpicc; then
-  hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'}
-  hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'}
+  hdf5_cv_mpi_special_collective_io_works=${hdf5_cv_mpi_special_collective_io_works='no'}
+  hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'}
 fi
 
 #Comment out the following line if your system supports collective IO when some processes
 #don't have any contributions to IOs.
-hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'}
-hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'}
+hdf5_cv_mpi_special_collective_io_works=${hdf5_cv_mpi_special_collective_io_works='no'}
+hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'}
 
diff --git a/config/lt_vers.am b/config/lt_vers.am
index 79406bb..f784c48 100644
--- a/config/lt_vers.am
+++ b/config/lt_vers.am
@@ -17,7 +17,7 @@
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 37
+LT_VERS_REVISION = 41
 LT_VERS_AGE = 0
 
 ## If the API changes *at all*, increment LT_VERS_INTERFACE and
diff --git a/config/mpich b/config/mpich
index 1ba62ff..575859e 100644
--- a/config/mpich
+++ b/config/mpich
@@ -21,14 +21,14 @@
 # We know that mpich 1.2.4 and 1.2.5 do not support it correctly.  We assume
 # older versions do not work either.  We don't know of a way of testing its
 # correctness without the risk of hanging the configure process.  So, we
-# set the configure variable hdf5_mpi_complex_derived_datatype_works to no.
+# set the configure variable hdf5_cv_mpi_complex_derived_datatype_works to no.
 # Notice that this code works only if the mpicc compiler shows its $MPIVERSION
 # properly.  It is confirmed mpicc does that as far back as v1.2.3.
 
 # mpich2 do not support it correctly.  But mpich2 reports small version number
 # indistiguishable from mpich.  Some mpich2 reports blank, some reports 1.0.2.
 
-if [ -z "$hdf5_mpi_complex_derived_datatype_works" ]; then
+if [ -z "$hdf5_cv_mpi_complex_derived_datatype_works" ]; then
     ccversion=`$CC -v 2>/dev/null`
     # mpich compiler will give "mpicc for 1.2.x ..."
     if echo "$ccversion" | grep '^mpicc for' > /dev/null ; then
@@ -36,16 +36,16 @@ if [ -z "$hdf5_mpi_complex_derived_datatype_works" ]; then
         ccversion=`echo $ccversion | cut -f3 -d' '`
 	case "$ccversion" in
 	    1.2.[0-5]*)
-		hdf5_mpi_complex_derived_datatype_works='no'
+		hdf5_cv_mpi_complex_derived_datatype_works='no'
 		;;
 	    1.0.2)
 		# mpich2 is recycling the version number, some report
 		# 1.0.2, some report blank.
-		hdf5_mpi_complex_derived_datatype_works='no'
+		hdf5_cv_mpi_complex_derived_datatype_works='no'
 		;;
 	    "")
 		# got blank ccversion.  Assume it is bad a mpich2.
-		hdf5_mpi_complex_derived_datatype_works='no'
+		hdf5_cv_mpi_complex_derived_datatype_works='no'
 		;;
 	    *)
 		# assume okay
@@ -54,7 +54,7 @@ if [ -z "$hdf5_mpi_complex_derived_datatype_works" ]; then
     fi
 fi
 
-if [ -z "$hdf5_mpi_special_collective_io_works" ]; then
+if [ -z "$hdf5_cv_mpi_special_collective_io_works" ]; then
     ccversion=`$CC -v 2>/dev/null`
     # mpich compiler will give "mpicc for 1.2.x ..."
     if echo "$ccversion" | grep '^mpicc for' > /dev/null ; then
@@ -62,16 +62,16 @@ if [ -z "$hdf5_mpi_special_collective_io_works" ]; then
         ccversion=`echo $ccversion | cut -f3 -d' '`
 	case "$ccversion" in
 	    1.2.[0-6]*)
-		hdf5_mpi_special_collective_io_works='no'
+		hdf5_cv_mpi_special_collective_io_works='no'
 		;;
 	    1.0.2)
 		# mpich2 is recycling the version number, some report
 		# 1.0.2, some report blank.
-		hdf5_mpi_special_collective_io_works='no'
+		hdf5_cv_mpi_special_collective_io_works='no'
 		;;
 	    "")
 		# got blank ccversion.  Assume it is bad a mpich2.
-		hdf5_mpi_special_collective_io_works='no'
+		hdf5_cv_mpi_special_collective_io_works='no'
 		;;
 	    *)
 		# assume okay
diff --git a/config/nec-superux14.1 b/config/nec-superux14.1
index 7e2c09f..dc1a15d 100644
--- a/config/nec-superux14.1
+++ b/config/nec-superux14.1
@@ -85,8 +85,8 @@ fi
 # PROFILE_CPPFLAGS	library suitable for performance testing (like 
 # 			`-pg').  This may or may not include debugging 
 # 			or production flags.
-#			
-# CFLAGS		Flags can be added to this variable which
+#
+# H5_CFLAGS		Flags can be added to this variable which
 #			might already be partially initialized.  These 
 #			flags will always be passed to the compiler
 #			and should include switches to turn on full
@@ -95,16 +95,14 @@ fi
 #			practices resulting in few if any
 #			warnings.
 #
-#			Warning flags do not have to be added to CFLAGS
+#			Warning flags do not have to be added to H5_CFLAGS
 #			variable if the compiler is the GNU gcc
 #			compiler or a descendent of gcc such as EGCS or PGCC.
 #
-#			The CFLAGS should contains *something* or else 
-#			configure will probably add `-g'.  For most
-#			systems this isn't a problem but some systems
-#			will disable optimizations in favor of the
-#			`-g'.
-#			
+# AM_CFLAGS             Flags added directly into this variable will
+#                       be propogated to the compiler wrapper scripts (h5cc,
+#                       h5c++, et cetera) in addition to being used to compile 
+#                       the library.
 #
 # These flags should be set according to the compiler being used.
 # There are two ways to check the compiler.  You can try using `-v' or 
@@ -115,7 +113,7 @@ fi
 
 case $CC_BASENAME in
     cc)
-        CFLAGS="$CFLAGS"
+        H5_CFLAGS="$H5_CFLAGS"
 	DEBUG_CFLAGS="-Cdebug -g -wall"
 	DEBUG_CPPFLAGS=
 	PROD_CFLAGS="-Cnoopt"
@@ -125,7 +123,7 @@ case $CC_BASENAME in
 	;;
 
     *)
-	CFLAGS="$CFLAGS"
+	H5_CFLAGS="$H5_CFLAGS"
 	DEBUG_CFLAGS="-g"
 	DEBUG_CPPFLAGS=
 	PROD_CFLAGS=""
@@ -137,21 +135,21 @@ esac
 
 case $CXX_BASENAME in
     c++)
-         CXXFLAGS="$CXXFLAGS -Tlocal"
+         H5_CXXFLAGS="$H5_CXXFLAGS -Tlocal"
          ;;
 
     *)
-         CXXFLAGS="$CXXFLAGS"
+         H5_CXXFLAGS="$H5_CXXFLAGS"
          ;;
 esac
  
 case $FC_BASENAME in
     f90)
-         FCFLAGS="$F9XFLAGS"
+         H5_FCFLAGS="$F9XFLAGS"
          ;;
 
     *)
-         FCFLAGS="$F9XFLAGS"
+         H5_FCFLAGS="$F9XFLAGS"
          ;;
 esac
 
@@ -174,8 +172,8 @@ hdf5_cv_ldouble_to_uint_work=no
 hdf5_cv_ullong_to_fp_cast_works=yes
 hdf5_cv_ullong_to_ldouble_precision_works=no
 hdf5_cv_fp_to_integer_overflow_works=yes
-hdf5_fp_to_ullong_accurate=no
-hdf5_fp_to_ullong_right_maximum=no
+hdf5_cv_fp_to_ullong_accurate=no
+hdf5_cv_fp_to_ullong_right_maximum=no
 CONFIGURE_LIBS=/usr/lib/libi90sxe.a
 
 
diff --git a/config/pgi-flags b/config/pgi-flags
index 2611a87..2b03f3d 100644
--- a/config/pgi-flags
+++ b/config/pgi-flags
@@ -68,7 +68,7 @@ if test "X-pgcc" = "X-$cc_vendor"; then
     #esac
 
     # General
-    CFLAGS="$CFLAGS $arch -Minform,warn"
+    H5_CFLAGS="$H5_CFLAGS $arch -Minform,warn"
 
     # Production
     # Check for MPI wrapper being used and tweak down compiler options
diff --git a/config/powerpc-ibm-aix4.x b/config/powerpc-ibm-aix4.x
deleted file mode 100644
index b94f3b5..0000000
--- a/config/powerpc-ibm-aix4.x
+++ /dev/null
@@ -1,120 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-
-
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
-
-# What must *always* be present for things to compile correctly?
-#CFLAGS="$CFLAGS -ansi"
-#CPPFLAGS="$CPPFLAGS -I."
-
-# CFLAGS must be set else configure set it to -g
-CFLAGS="$CFLAGS"
-
-# What compiler flags should be used for code development?
-DEBUG_CFLAGS=
-DEBUG_CPPFLAGS=
-
-# What compiler flags should be used for building a production
-# library?
-PROD_CFLAGS=
-PROD_CPPFLAGS=
-
-# What compiler flags enable code profiling?
-PROFILE_CFLAGS=
-PROFILE_CPPFLAGS=
-
-
-#----------------------------------------------------------------------------
-# Values for overriding configuration tests when cross compiling.
-# This includes compiling on some machines where the serial front end
-# compiles for a parallel back end.
-
-# Set this to `yes' or `no' depending on whether the target is big
-# endian or little endian.
-hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'}
-ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
-ac_cv_header_stdc=${ac_cv_header_stdc='yes'}
-ac_cv_header_sys_ioctl_h=${ac_cv_header_sys_ioctl_h=yes}
-RUNPARALLEL=${RUNPARALLEL="MP_PROCS=3 MP_TASKS_PER_NODE=3 poe"}
-
-# cache the sizeof of "standard C types" so that configure can run faster.
-ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
-ac_cv_sizeof_short=${ac_cv_sizeof_short=2}
-ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
-ac_cv_sizeof_long=${ac_cv_sizeof_long=4}
-ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8}
-ac_cv_sizeof___int64=${ac_cv_sizeof___int64=8}
-ac_cv_sizeof_float=${ac_cv_sizeof_float=4}
-ac_cv_sizeof_double=${ac_cv_sizeof_double=8}
-ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8}
-ac_cv_sizeof_int8_t=${ac_cv_sizeof_int8_t=1}
-ac_cv_sizeof_uint8_t=${ac_cv_sizeof_uint8_t=1}
-ac_cv_sizeof_int_least8_t=${ac_cv_sizeof_int_least8_t=1}
-ac_cv_sizeof_uint_least8_t=${ac_cv_sizeof_uint_least8_t=1}
-ac_cv_sizeof_int_fast8_t=${ac_cv_sizeof_int_fast8_t=1}
-ac_cv_sizeof_uint_fast8_t=${ac_cv_sizeof_uint_fast8_t=4}
-ac_cv_sizeof_int16_t=${ac_cv_sizeof_int16_t=2}
-ac_cv_sizeof_uint16_t=${ac_cv_sizeof_uint16_t=2}
-ac_cv_sizeof_int_least16_t=${ac_cv_sizeof_int_least16_t=2}
-ac_cv_sizeof_uint_least16_t=${ac_cv_sizeof_uint_least16_t=2}
-ac_cv_sizeof_int_fast16_t=${ac_cv_sizeof_int_fast16_t=4}
-ac_cv_sizeof_uint_fast16_t=${ac_cv_sizeof_uint_fast16_t=4}
-ac_cv_sizeof_int32_t=${ac_cv_sizeof_int32_t=4}
-ac_cv_sizeof_uint32_t=${ac_cv_sizeof_uint32_t=4}
-ac_cv_sizeof_int_least32_t=${ac_cv_sizeof_int_least32_t=4}
-ac_cv_sizeof_uint_least32_t=${ac_cv_sizeof_uint_least32_t=4}
-ac_cv_sizeof_int_fast32_t=${ac_cv_sizeof_int_fast32_t=4}
-ac_cv_sizeof_uint_fast32_t=${ac_cv_sizeof_uint_fast32_t=4}
-ac_cv_sizeof_int64_t=${ac_cv_sizeof_int64_t=8}
-ac_cv_sizeof_uint64_t=${ac_cv_sizeof_uint64_t=8}
-ac_cv_sizeof_int_least64_t=${ac_cv_sizeof_int_least64_t=8}
-ac_cv_sizeof_uint_least64_t=${ac_cv_sizeof_uint_least64_t=8}
-ac_cv_sizeof_int_fast64_t=${ac_cv_sizeof_int_fast64_t=8}
-ac_cv_sizeof_uint_fast64_t=${ac_cv_sizeof_uint_fast64_t=8}
-
-# Don't cache size_t and off_t because they depend on if -D_LARGE_FILES is used
-#ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4}
-#ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=8}
-
-# The default Fortran 90 compiler
-
-if test "X-" = "X-$FC"; then
-  FC=xlf
-fi
-
-if test "X-" = "X-$f9x_flags_set"; then
-  F9XSUFFIXFLAG="-qsuffix=f=f90"
-  FCFLAGS="$FCFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
-  FSEARCH_DIRS="-I./ -I../src"
-  DEBUG_FCFLAGS="-O"
-  PROD_FCFLAGS="-O"
-  PROFILE_FCFLAGS="-O"
-  f9x_flags_set=yes
-fi
-
-# The default C++ compiler
-
-# Use AIX supplied C++ compiler by default.
-CXX=${CXX=xlC}
-hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'}
diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x
index 80925f0..ac70bac 100644
--- a/config/powerpc-ibm-aix5.x
+++ b/config/powerpc-ibm-aix5.x
@@ -48,7 +48,8 @@ case $CC_BASENAME in
     enable_shared="${enable_shared:-no}"
     # Use -D_LARGE_FILES by default to support large file size.
     # Make sure this is applied to other API compile options such as C++.
-    CFLAGS="-qlanglvl=stdc99 -D_LARGE_FILES $CFLAGS"
+    AM_CFLAGS="-D_LARGE_FILES $AM_CFLAGS"
+    H5_CFLAGS="-qlanglvl=stdc99 $H5_CFLAGS"
     DEBUG_CFLAGS="-g -qfullpath"
     DEBUG_CPPFLAGS=
     # -O causes test/dtypes to fail badly. Turn it off for now.
@@ -63,7 +64,7 @@ case $CC_BASENAME in
     ;;
 
   *)
-    CFLAGS="$CFLAGS -ansi"
+    H5_CFLAGS="$H5_CFLAGS -ansi"
     DEBUG_CFLAGS="-g"
     DEBUG_CPPFLAGS=
     PROD_CFLAGS="-O"
@@ -128,15 +129,21 @@ ac_cv_sizeof_uint_fast64_t=${ac_cv_sizeof_uint_fast64_t=8}
 
 if test "X-" = "X-$FC"; then
   if test "X-$enable_parallel" = "X-yes"; then
-    FC=mpxlf_r
+    FC=mpxlf90_r
   else
-    FC=xlf
+    FC=xlf90
   fi
 fi
 
+# While we try to avoid setting FCFLAGS directly for use in compilation, in 
+# this case we need the -k flag present for some configure checks. As such, 
+# the configure script saves the user's set FCFLAGS before running, and 
+# restores them when complete. We must then set up both FCFLAGS and H5_FCFLAGS 
+# to ensure the flag is present for both configure as well as for the build.
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG="-qsuffix=f=f90"
-  FCFLAGS="$FCFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
+  FCFLAGS="$FCFLAGS -O ${F9XSUFFIXFLAG}"
+  H5_FCFLAGS="$H5_FCFLAGS -O ${F9XSUFFIXFLAG}"
   FSEARCH_DIRS="-I./ -I../src"
   DEBUG_FCFLAGS="-O"
   PROD_FCFLAGS="-O"
@@ -147,7 +154,7 @@ fi
 # With poe version 3.2.0.19 or lower(using lpp -l all | grep ppe.poe to check the version number, 
 # IBM MPI-IO implementation has a bug, 
 #it cannot generate correct MPI derived datatype. Please uncomment the following line:
-#hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'}
+#hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'}
 
 # The default C++ compiler
 
@@ -157,6 +164,7 @@ CXX=${CXX=xlC}
 # Added -qweaksymbol to suppress linker messages warning of duplicate
 # symbols; these warnings are harmless. - BMR
 # Use -D_LARGE_FILES by default to support large file size.
-CXXFLAGS="$CXXFLAGS -qweaksymbol -D_LARGE_FILES"
+H5_CXXFLAGS="$H5_CXXFLAGS -qweaksymbol"
+AM_CXXFLAGS="$AM_CXXFLAGS -D_LARGE_FILES"
 
 
diff --git a/config/rs6000-ibm-aix4.x b/config/rs6000-ibm-aix4.x
deleted file mode 100644
index 14885d1..0000000
--- a/config/rs6000-ibm-aix4.x
+++ /dev/null
@@ -1,43 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-#
-# See BlankForm in this directory for details.
-
-# Cross compiling defaults
-ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
-hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'}
-
-# The default Fortran 90 compiler
-
-if test "X-" = "X-$FC"; then
-  FC=xlf
-fi
-
-if test "X-" = "X-$f9x_flags_set"; then
-  F9XSUFFIXFLAG="-qsuffix=f=f90"
-  FCFLAGS="$FCFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
-  FSEARCH_DIRS="-I./ -I../src"
-  DEBUG_FCFLAGS="-O"
-  PROD_FCFLAGS="-O"
-  PROFILE_FCFLAGS="-O"
-  f9x_flags_set=yes
-fi
-# IBM MPI-IO doesn't handle complicated derived data type correctly.
-hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'}
diff --git a/config/solaris2.x b/config/solaris2.x
index c81fd61..5ef6415 100644
--- a/config/solaris2.x
+++ b/config/solaris2.x
@@ -45,7 +45,7 @@ if test "X-" = "X-$cc_flags_set"; then
 	5.9*)
 	    # Need the xopenmp flag to build the Fortran library
 	    if test X-$enable_fortran = X-yes; then
-		LDFLAGS="$LDFLAGS -xopenmp=stubs"
+		AM_LDFLAGS="$AM_LDFLAGS -xopenmp=stubs"
 	    fi
 	    ;;
     esac
@@ -56,8 +56,7 @@ if test "X-" = "X-$cc_flags_set"; then
        && PROD_CFLAGS="`echo $PROD_CFLAGS | sed -e 's/-O//'`"
 fi
 
-# Add socket lib for the Stream Virtual File Driver
-LIBS="$LIBS -lsocket"
+LIBS="$LIBS"
 
 # The default Fortran 90 compiler
 
@@ -68,9 +67,9 @@ fi
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FCFLAGS="$FCFLAGS"
-  DEBUG_FCFLAGS=""
-  PROD_FCFLAGS=""
+  H5_FCFLAGS="$H5_FCFLAGS"
+  DEBUG_FCFLAGS="-g"
+  PROD_FCFLAGS="-O2"
   PROFILE_FCFLAGS=""
   f9x_flags_set=yes
 fi
diff --git a/config/sv1-cray b/config/sv1-cray
index 4e3153f..1bae48d 100644
--- a/config/sv1-cray
+++ b/config/sv1-cray
@@ -73,8 +73,8 @@ RANLIB=:
 # PROFILE_CPPFLAGS	library suitable for performance testing (like 
 # 			`-pg').  This may or may not include debugging 
 # 			or production flags.
-#			
-# CFLAGS		Flags can be added to this variable which
+#
+# H5_CFLAGS		Flags can be added to this variable which
 #			might already be partially initialized.  These 
 #			flags will always be passed to the compiler
 #			and should include switches to turn on full
@@ -83,16 +83,14 @@ RANLIB=:
 #			practices resulting in few if any
 #			warnings.
 #
-#			Warning flags do not have to be added to CFLAGS
+#			Warning flags do not have to be added to H5_CFLAGS
 #			variable if the compiler is the GNU gcc
 #			compiler or a descendent of gcc such as EGCS or PGCC.
 #
-#			The CFLAGS should contains *something* or else 
-#			configure will probably add `-g'.  For most
-#			systems this isn't a problem but some systems
-#			will disable optimizations in favor of the
-#			`-g'.
-#			
+# AM_CFLAGS             Flags added directly into this variable will
+#                       be propogated to the compiler wrapper scripts (h5cc,
+#                       h5c++, et cetera) in addition to being used to compile 
+#                       the library.
 #
 # These flags should be set according to the compiler being used.
 # There are two ways to check the compiler.  You can try using `-v' or 
@@ -103,7 +101,7 @@ RANLIB=:
 
 case $CC_BASENAME in
   gcc)
-    CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
+    H5_CFLAGS="$H5_CFLAGS -Wsign-compare" #Only works for some versions
     DEBUG_CFLAGS="-g -fverbose-asm"
     DEBUG_CPPFLAGS=
     PROD_CFLAGS="-O3 -fomit-frame-pointer"
@@ -113,7 +111,7 @@ case $CC_BASENAME in
     ;;
 
   cc)
-    CFLAGS="$CFLAGS"
+    H5_CFLAGS="$H5_CFLAGS"
     DEBUG_CFLAGS="-g -h zero"
     DEBUG_CPPFLAGS=
     PROD_CFLAGS="-O2 -h scalar0 -h vector0 -h task1"
@@ -123,7 +121,7 @@ case $CC_BASENAME in
     ;;
 
   *)
-    CFLAGS="$CFLAGS -ansi"
+    H5_CFLAGS="$H5_CFLAGS -ansi"
     DEBUG_CFLAGS="-g"
     DEBUG_CPPFLAGS=
     PROD_CFLAGS="-O"
@@ -163,7 +161,7 @@ fi
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FCFLAGS="$FCFLAGS -dp"
+  H5_FCFLAGS="$H5_FCFLAGS -dp"
   DEBUG_FCFLAGS="-dp"
   PROD_FCFLAGS="-dp"
   PROFILE_FCFLAGS="-dp"
@@ -180,7 +178,7 @@ fi
 
 case $CXX_BASENAME in
   g++)
-    CXXFLAGS="$CXXFLAGS -Wsign-compare" #Only works for some versions
+    H5_CXXFLAGS="$H5_CXXFLAGS -Wsign-compare" #Only works for some versions
     DEBUG_CXXFLAGS="-g -fverbose-asm"
     DEBUG_CPPFLAGS=
     PROD_CXXFLAGS="-O3 -fomit-frame-pointer"
@@ -190,7 +188,7 @@ case $CXX_BASENAME in
     ;;
 
   *)
-    CXXFLAGS="$CXXFLAGS -h instantiate=used"
+    H5_CXXFLAGS="$H5_CXXFLAGS -h instantiate=used"
     DEBUG_CXXFLAGS="-g"
     DEBUG_CPPFLAGS=
     PROD_CXXFLAGS="-O"
diff --git a/config/unicos b/config/unicos
deleted file mode 100644
index 4c99bcd..0000000
--- a/config/unicos
+++ /dev/null
@@ -1,165 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-
-
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
-#----------------------------------------------------------------------------
-
-
-# Choosing a C Compiler
-# ---------------------
-#
-# The user should be able to specify the compiler by setting the CC
-# environment variable to the name of the compiler and any switches it 
-# requires for proper operation.  If CC is unset then this script may
-# set it.  If CC is unset by time this script completes then configure 
-# will try `gcc' and `cc' in that order (perhaps some others too).
-#
-# Note: Code later in this file may depend on the value of $CC_BASENAME
-#       in order to distinguish between different compilers when
-#       deciding which compiler command-line switches to use.  This
-#       variable is set based on the incoming value of $CC and is only
-#       used within this file.
-
-if test "X-" =  "X-$CC"; then
-  CC=cc
-  CC_BASENAME=cc
-fi
-# no need to use RANLIB
-RANLIB=:
-
-# C Compiler and Preprocessor Flags
-# ---------------------------------
-#
-# Flags that end with `_CFLAGS' are always passed to the compiler.
-# Flags that end with `_CPPFLAGS' are passed to the compiler when
-# compiling but not when linking.
-#
-# DEBUG_CFLAGS		Flags to pass to the compiler to create a
-# DEBUG_CPPFLAGS	library suitable for use with debugging
-#			tools. Usually this list will exclude
-#			optimization switches (like `-O') and include
-#			switches that turn on symbolic debugging
-#			support (like `-g').
-#
-# PROD_CFLAGS		Flags to pass to the compiler to create a
-# PROD_CPPFLAGS		production version of the library.  These
-#			usualy exclude symbolic debugging switches
-#			(like `-g') and include optimization switches
-#			(like `-O').
-#
-# PROFILE_CFLAGS	Flags to pass to the compiler to create a
-# PROFILE_CPPFLAGS	library suitable for performance testing (like 
-# 			`-pg').  This may or may not include debugging 
-# 			or production flags.
-#			
-# CFLAGS		Flags can be added to this variable which
-#			might already be partially initialized.  These 
-#			flags will always be passed to the compiler
-#			and should include switches to turn on full
-#			warnings.  HDF5 attempts to be ANSI and Posix
-#			compliant and employ good programming
-#			practices resulting in few if any
-#			warnings.
-#
-#			Warning flags do not have to be added to CFLAGS
-#			variable if the compiler is the GNU gcc
-#			compiler or a descendent of gcc such as EGCS or PGCC.
-#
-#			The CFLAGS should contains *something* or else 
-#			configure will probably add `-g'.  For most
-#			systems this isn't a problem but some systems
-#			will disable optimizations in favor of the
-#			`-g'.
-#			
-#
-# These flags should be set according to the compiler being used.
-# There are two ways to check the compiler.  You can try using `-v' or 
-# `--version' to see if the compiler will print a version string.  You 
-# can use the value of $CC_BASENAME which is the base name of the
-# first word in $CC (note that the value of CC may have changed
-# above).
-
-case $CC_BASENAME in
-  gcc)
-    CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
-    DEBUG_CFLAGS="-g -fverbose-asm"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O3 -fomit-frame-pointer"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-
-  cc)
-    CFLAGS="$CFLAGS"
-    DEBUG_CFLAGS="-g -h zero -h scalar0"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O2 -h scalar0"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-
-  *)
-    CFLAGS="$CFLAGS -ansi"
-    DEBUG_CFLAGS="-g"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-esac
-
-# Overriding Configure Tests
-# --------------------------
-#
-# Values for overriding configuration tests when cross compiling.
-# This includes compiling on some machines where the serial front end
-# compiles for a parallel back end.
-
-# Set this to `yes' or `no' depending on whether the target is big
-# endian or little endian.
-ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
-
-# Set this to the width required by printf() to print type `long
-# long'.  For instance, if the format would be `%lld' then set it to
-# `ll' or if the format would be `%qd' set it to `q'.
-#hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'}
-
-# The default Fortran 90 compiler
-
-if test "X-" = "X-$FC"; then
-  FC=f90
-fi
-
-if test "X-" = "X-$f9x_flags_set"; then
-  F9XSUFFIXFLAG=""
-  FSEARCH_DIRS=""
-  FCFLAGS="$FCFLAGS -dp"
-  DEBUG_FCFLAGS="-dp"
-  PROD_FCFLAGS="-dp"
-  PROFILE_FCFLAGS="-dp"
-  f9x_flags_set=yes
-fi
diff --git a/config/unicos10.0.X b/config/unicos10.0.X
deleted file mode 100644
index 09f5871..0000000
--- a/config/unicos10.0.X
+++ /dev/null
@@ -1,201 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-
-
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
-#----------------------------------------------------------------------------
-
-
-# Choosing a C Compiler
-# ---------------------
-#
-# The user should be able to specify the compiler by setting the CC
-# environment variable to the name of the compiler and any switches it 
-# requires for proper operation.  If CC is unset then this script may
-# set it.  If CC is unset by time this script completes then configure 
-# will try `gcc' and `cc' in that order (perhaps some others too).
-#
-# Note: Code later in this file may depend on the value of $CC_BASENAME
-#       in order to distinguish between different compilers when
-#       deciding which compiler command-line switches to use.  This
-#       variable is set based on the incoming value of $CC and is only
-#       used within this file.
-
-if test "X-" =  "X-$CC"; then
-  CC=cc
-  CC_BASENAME=cc
-fi
-# no need to use RANLIB
-RANLIB=:
-
-
-# C Compiler and Preprocessor Flags
-# ---------------------------------
-#
-# Flags that end with `_CFLAGS' are always passed to the compiler.
-# Flags that end with `_CPPFLAGS' are passed to the compiler when
-# compiling but not when linking.
-#
-# DEBUG_CFLAGS		Flags to pass to the compiler to create a
-# DEBUG_CPPFLAGS	library suitable for use with debugging
-#			tools. Usually this list will exclude
-#			optimization switches (like `-O') and include
-#			switches that turn on symbolic debugging
-#			support (like `-g').
-#
-# PROD_CFLAGS		Flags to pass to the compiler to create a
-# PROD_CPPFLAGS		production version of the library.  These
-#			usualy exclude symbolic debugging switches
-#			(like `-g') and include optimization switches
-#			(like `-O').
-#
-# PROFILE_CFLAGS	Flags to pass to the compiler to create a
-# PROFILE_CPPFLAGS	library suitable for performance testing (like 
-# 			`-pg').  This may or may not include debugging 
-# 			or production flags.
-#			
-# CFLAGS		Flags can be added to this variable which
-#			might already be partially initialized.  These 
-#			flags will always be passed to the compiler
-#			and should include switches to turn on full
-#			warnings.  HDF5 attempts to be ANSI and Posix
-#			compliant and employ good programming
-#			practices resulting in few if any
-#			warnings.
-#
-#			Warning flags do not have to be added to CFLAGS
-#			variable if the compiler is the GNU gcc
-#			compiler or a descendent of gcc such as EGCS or PGCC.
-#
-#			The CFLAGS should contains *something* or else 
-#			configure will probably add `-g'.  For most
-#			systems this isn't a problem but some systems
-#			will disable optimizations in favor of the
-#			`-g'.
-#			
-#
-# These flags should be set according to the compiler being used.
-# There are two ways to check the compiler.  You can try using `-v' or 
-# `--version' to see if the compiler will print a version string.  You 
-# can use the value of $CC_BASENAME which is the base name of the
-# first word in $CC (note that the value of CC may have changed
-# above).
-
-case $CC_BASENAME in
-  gcc)
-    CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
-    DEBUG_CFLAGS="-g -fverbose-asm"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O3 -fomit-frame-pointer"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-
-  cc)
-    CFLAGS="$CFLAGS"
-    DEBUG_CFLAGS="-g -h zero -h scalar0"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O2 -h scalar0"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-
-  *)
-    CFLAGS="$CFLAGS -ansi"
-    DEBUG_CFLAGS="-g"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-esac
-
-
-
-# Overriding Configure Tests
-# --------------------------
-#
-# Values for overriding configuration tests when cross compiling.
-# This includes compiling on some machines where the serial front end
-# compiles for a parallel back end.
-
-# Set this to `yes' or `no' depending on whether the target is big
-# endian or little endian.
-ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
-
-# Set this to the width required by printf() to print type `long
-# long'.  For instance, if the format would be `%lld' then set it to
-# `ll' or if the format would be `%qd' set it to `q'.
-#hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'}
-
-# Hard set the flag to indicate that converting denormalized floating-point
-# values doesn't work.
-hdf5_cv_convert_denormal_float=${hdf5_cv_convert_denormal_float='no'}
-
-# The default Fortran 90 compiler
-
-if test "X-" = "X-$FC"; then
-  FC=f90
-fi
-
-if test "X-" = "X-$f9x_flags_set"; then
-  F9XSUFFIXFLAG=""
-  FSEARCH_DIRS=""
-  FCFLAGS="$FCFLAGS -dp"
-  DEBUG_FCFLAGS="-dp"
-  PROD_FCFLAGS="-dp"
-  PROFILE_FCFLAGS="-dp"
-  f9x_flags_set=yes
-fi
-
-# The default C++ compiler
-
-if test -z "$CXX"; then
-  CXX="CC"
-  CXX_BASENAME=CC
-fi
-
-case $CXX_BASENAME in
-  g++)
-    CXXFLAGS="$CXXFLAGS -Wsign-compare" #Only works for some versions
-    DEBUG_CXXFLAGS="-g -fverbose-asm"
-    DEBUG_CPPFLAGS=
-    PROD_CXXFLAGS="-O3 -fomit-frame-pointer"
-    PROD_CPPFLAGS=
-    PROFILE_CXXFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-
-  *)
-    CXXFLAGS="$CXXFLAGS -h instantiate=used"
-    DEBUG_CXXFLAGS="-g"
-    DEBUG_CPPFLAGS=
-    PROD_CXXFLAGS="-O"
-    PROD_CPPFLAGS=
-    PROFILE_CXXFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-esac
diff --git a/config/unicosmk b/config/unicosmk
deleted file mode 100644
index 7c279a7..0000000
--- a/config/unicosmk
+++ /dev/null
@@ -1,168 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-
-
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
-#----------------------------------------------------------------------------
-
-
-# Choosing a C Compiler
-# ---------------------
-#
-# The user should be able to specify the compiler by setting the CC
-# environment variable to the name of the compiler and any switches it 
-# requires for proper operation.  If CC is unset then this script may
-# set it.  If CC is unset by time this script completes then configure 
-# will try `gcc' and `cc' in that order (perhaps some others too).
-#
-# Note: Code later in this file may depend on the value of $CC_BASENAME
-#       in order to distinguish between different compilers when
-#       deciding which compiler command-line switches to use.  This
-#       variable is set based on the incoming value of $CC and is only
-#       used within this file.
-
-if test "X-" =  "X-$CC"; then
-  CC=cc
-  CC_BASENAME=cc
-fi
-# no need to use RANLIB
-RANLIB=:
-
-
-# C Compiler and Preprocessor Flags
-# ---------------------------------
-#
-# Flags that end with `_CFLAGS' are always passed to the compiler.
-# Flags that end with `_CPPFLAGS' are passed to the compiler when
-# compiling but not when linking.
-#
-# DEBUG_CFLAGS		Flags to pass to the compiler to create a
-# DEBUG_CPPFLAGS	library suitable for use with debugging
-#			tools. Usually this list will exclude
-#			optimization switches (like `-O') and include
-#			switches that turn on symbolic debugging
-#			support (like `-g').
-#
-# PROD_CFLAGS		Flags to pass to the compiler to create a
-# PROD_CPPFLAGS		production version of the library.  These
-#			usualy exclude symbolic debugging switches
-#			(like `-g') and include optimization switches
-#			(like `-O').
-#
-# PROFILE_CFLAGS	Flags to pass to the compiler to create a
-# PROFILE_CPPFLAGS	library suitable for performance testing (like 
-# 			`-pg').  This may or may not include debugging 
-# 			or production flags.
-#			
-# CFLAGS		Flags can be added to this variable which
-#			might already be partially initialized.  These 
-#			flags will always be passed to the compiler
-#			and should include switches to turn on full
-#			warnings.  HDF5 attempts to be ANSI and Posix
-#			compliant and employ good programming
-#			practices resulting in few if any
-#			warnings.
-#
-#			Warning flags do not have to be added to CFLAGS
-#			variable if the compiler is the GNU gcc
-#			compiler or a descendent of gcc such as EGCS or PGCC.
-#
-#			The CFLAGS should contains *something* or else 
-#			configure will probably add `-g'.  For most
-#			systems this isn't a problem but some systems
-#			will disable optimizations in favor of the
-#			`-g'.
-#			
-#
-# These flags should be set according to the compiler being used.
-# There are two ways to check the compiler.  You can try using `-v' or 
-# `--version' to see if the compiler will print a version string.  You 
-# can use the value of $CC_BASENAME which is the base name of the
-# first word in $CC (note that the value of CC may have changed
-# above).
-
-case $CC_BASENAME in
-  gcc)
-    CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
-    DEBUG_CFLAGS="-g -fverbose-asm"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O3 -fomit-frame-pointer"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-
-  cc)
-    CFLAGS="$CFLAGS"
-    DEBUG_CFLAGS="-g -h zero"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O2 -h scalar0"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-
-  *)
-    CFLAGS="$CFLAGS -ansi"
-    DEBUG_CFLAGS="-g"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-esac
-
-
-
-# Overriding Configure Tests
-# --------------------------
-#
-# Values for overriding configuration tests when cross compiling.
-# This includes compiling on some machines where the serial front end
-# compiles for a parallel back end.
-
-# Set this to `yes' or `no' depending on whether the target is big
-# endian or little endian.
-#ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
-
-# Set this to the width required by printf() to print type `long
-# long'.  For instance, if the format would be `%lld' then set it to
-# `ll' or if the format would be `%qd' set it to `q'.
-#hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'}
-
-# The default Fortran 90 compiler
-
-if test "X-" = "X-$FC"; then
-  FC=f90
-fi
-
-if test "X-" = "X-$f9x_flags_set"; then
-  F9XSUFFIXFLAG=""
-  FSEARCH_DIRS=""
-  FCFLAGS="$FCFLAGS -dp"
-  DEBUG_FCFLAGS="-dp"
-  PROD_FCFLAGS="-dp"
-  PROFILE_FCFLAGS="-dp"
-  f9x_flags_set=yes
-fi
diff --git a/config/unicosmk2.0.5.X b/config/unicosmk2.0.5.X
deleted file mode 100644
index c76cd42..0000000
--- a/config/unicosmk2.0.5.X
+++ /dev/null
@@ -1,170 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-
-
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
-#----------------------------------------------------------------------------
-
-
-# Choosing a C Compiler
-# ---------------------
-#
-# The user should be able to specify the compiler by setting the CC
-# environment variable to the name of the compiler and any switches it 
-# requires for proper operation.  If CC is unset then this script may
-# set it.  If CC is unset by time this script completes then configure 
-# will try `gcc' and `cc' in that order (perhaps some others too).
-#
-# Note: Code later in this file may depend on the value of $CC_BASENAME
-#       in order to distinguish between different compilers when
-#       deciding which compiler command-line switches to use.  This
-#       variable is set based on the incoming value of $CC and is only
-#       used within this file.
-
-if test "X-" =  "X-$CC"; then
-  CC=cc
-  CC_BASENAME=cc
-fi
-# no need to use RANLIB
-RANLIB=:
-
-
-# C Compiler and Preprocessor Flags
-# ---------------------------------
-#
-# Flags that end with `_CFLAGS' are always passed to the compiler.
-# Flags that end with `_CPPFLAGS' are passed to the compiler when
-# compiling but not when linking.
-#
-# DEBUG_CFLAGS		Flags to pass to the compiler to create a
-# DEBUG_CPPFLAGS	library suitable for use with debugging
-#			tools. Usually this list will exclude
-#			optimization switches (like `-O') and include
-#			switches that turn on symbolic debugging
-#			support (like `-g').
-#
-# PROD_CFLAGS		Flags to pass to the compiler to create a
-# PROD_CPPFLAGS		production version of the library.  These
-#			usualy exclude symbolic debugging switches
-#			(like `-g') and include optimization switches
-#			(like `-O').
-#
-# PROFILE_CFLAGS	Flags to pass to the compiler to create a
-# PROFILE_CPPFLAGS	library suitable for performance testing (like 
-# 			`-pg').  This may or may not include debugging 
-# 			or production flags.
-#			
-# CFLAGS		Flags can be added to this variable which
-#			might already be partially initialized.  These 
-#			flags will always be passed to the compiler
-#			and should include switches to turn on full
-#			warnings.  HDF5 attempts to be ANSI and Posix
-#			compliant and employ good programming
-#			practices resulting in few if any
-#			warnings.
-#
-#			Warning flags do not have to be added to CFLAGS
-#			variable if the compiler is the GNU gcc
-#			compiler or a descendent of gcc such as EGCS or PGCC.
-#
-#			The CFLAGS should contains *something* or else 
-#			configure will probably add `-g'.  For most
-#			systems this isn't a problem but some systems
-#			will disable optimizations in favor of the
-#			`-g'.
-#			
-#
-# These flags should be set according to the compiler being used.
-# There are two ways to check the compiler.  You can try using `-v' or 
-# `--version' to see if the compiler will print a version string.  You 
-# can use the value of $CC_BASENAME which is the base name of the
-# first word in $CC (note that the value of CC may have changed
-# above).
-
-case $CC_BASENAME in
-  gcc)
-    CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
-    DEBUG_CFLAGS="-g -fverbose-asm"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O3 -fomit-frame-pointer"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-
-  cc)
-    CFLAGS="$CFLAGS"
-    DEBUG_CFLAGS="-g -h zero"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O2 -h scalar0"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-
-  *)
-    CFLAGS="$CFLAGS -ansi"
-    DEBUG_CFLAGS="-g"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-esac
-
-
-
-# Overriding Configure Tests
-# --------------------------
-#
-# Values for overriding configuration tests when cross compiling.
-# This includes compiling on some machines where the serial front end
-# compiles for a parallel back end.
-
-# Set this to `yes' or `no' depending on whether the target is big
-# endian or little endian.
-#ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
-
-# Set this to the width required by printf() to print type `long
-# long'.  For instance, if the format would be `%lld' then set it to
-# `ll' or if the format would be `%qd' set it to `q'.
-#hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'}
-
-# The default Fortran 90 compiler
-
-if test "X-" = "X-$FC"; then
-  FC=f90
-fi
-
-if test "X-" = "X-$f9x_flags_set"; then
-  # -Wl passes flags to the linker and -M# will ignore warnings with
-  # number #. Warning 405 was stopping the executable from being built.
-  F9XSUFFIXFLAG=""
-  FSEARCH_DIRS=""
-  FCFLAGS="$FCFLAGS -dp -Wl-M405"
-  DEBUG_FCFLAGS=""
-  PROD_FCFLAGS=""
-  PROFILE_FCFLAGS=""
-  f9x_flags_set=yes
-fi
diff --git a/config/unicosmk2.0.6.X b/config/unicosmk2.0.6.X
deleted file mode 100644
index 861b205..0000000
--- a/config/unicosmk2.0.6.X
+++ /dev/null
@@ -1,203 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-
-
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
-#----------------------------------------------------------------------------
-
-
-# Choosing a C Compiler
-# ---------------------
-#
-# The user should be able to specify the compiler by setting the CC
-# environment variable to the name of the compiler and any switches it 
-# requires for proper operation.  If CC is unset then this script may
-# set it.  If CC is unset by time this script completes then configure 
-# will try `gcc' and `cc' in that order (perhaps some others too).
-#
-# Note: Code later in this file may depend on the value of $CC_BASENAME
-#       in order to distinguish between different compilers when
-#       deciding which compiler command-line switches to use.  This
-#       variable is set based on the incoming value of $CC and is only
-#       used within this file.
-
-if test "X-" =  "X-$CC"; then
-  CC=cc
-  CC_BASENAME=cc
-fi
-# no need to use RANLIB
-RANLIB=:
-
-
-# C Compiler and Preprocessor Flags
-# ---------------------------------
-#
-# Flags that end with `_CFLAGS' are always passed to the compiler.
-# Flags that end with `_CPPFLAGS' are passed to the compiler when
-# compiling but not when linking.
-#
-# DEBUG_CFLAGS		Flags to pass to the compiler to create a
-# DEBUG_CPPFLAGS	library suitable for use with debugging
-#			tools. Usually this list will exclude
-#			optimization switches (like `-O') and include
-#			switches that turn on symbolic debugging
-#			support (like `-g').
-#
-# PROD_CFLAGS		Flags to pass to the compiler to create a
-# PROD_CPPFLAGS		production version of the library.  These
-#			usualy exclude symbolic debugging switches
-#			(like `-g') and include optimization switches
-#			(like `-O').
-#
-# PROFILE_CFLAGS	Flags to pass to the compiler to create a
-# PROFILE_CPPFLAGS	library suitable for performance testing (like 
-# 			`-pg').  This may or may not include debugging 
-# 			or production flags.
-#			
-# CFLAGS		Flags can be added to this variable which
-#			might already be partially initialized.  These 
-#			flags will always be passed to the compiler
-#			and should include switches to turn on full
-#			warnings.  HDF5 attempts to be ANSI and Posix
-#			compliant and employ good programming
-#			practices resulting in few if any
-#			warnings.
-#
-#			Warning flags do not have to be added to CFLAGS
-#			variable if the compiler is the GNU gcc
-#			compiler or a descendent of gcc such as EGCS or PGCC.
-#
-#			The CFLAGS should contains *something* or else 
-#			configure will probably add `-g'.  For most
-#			systems this isn't a problem but some systems
-#			will disable optimizations in favor of the
-#			`-g'.
-#			
-#
-# These flags should be set according to the compiler being used.
-# There are two ways to check the compiler.  You can try using `-v' or 
-# `--version' to see if the compiler will print a version string.  You 
-# can use the value of $CC_BASENAME which is the base name of the
-# first word in $CC (note that the value of CC may have changed
-# above).
-
-case $CC_BASENAME in
-  gcc)
-    CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
-    DEBUG_CFLAGS="-g -fverbose-asm"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O3 -fomit-frame-pointer"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-
-  cc)
-    CFLAGS="$CFLAGS"
-    DEBUG_CFLAGS="-g -h zero"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O2 -h scalar0"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-
-  *)
-    CFLAGS="$CFLAGS -ansi"
-    DEBUG_CFLAGS="-g"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-esac
-
-
-
-# Overriding Configure Tests
-# --------------------------
-#
-# Values for overriding configuration tests when cross compiling.
-# This includes compiling on some machines where the serial front end
-# compiles for a parallel back end.
-
-# Set this to `yes' or `no' depending on whether the target is big
-# endian or little endian.
-#ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
-
-# Set this to the width required by printf() to print type `long
-# long'.  For instance, if the format would be `%lld' then set it to
-# `ll' or if the format would be `%qd' set it to `q'.
-#hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'}
-
-# Hard set the flag to indicate that converting denormalized floating-point
-# values doesn't work.
-hdf5_cv_convert_denormal_float=${hdf5_cv_convert_denormal_float='no'}
-
-# The default Fortran 90 compiler
-
-if test "X-" = "X-$FC"; then
-  FC=f90
-fi
-
-if test "X-" = "X-$f9x_flags_set"; then
-  # -Wl passes flags to the linker and -M# will ignore warnings with
-  # number #. Warning 405 and 412 were stopping the executable from being built.
-  F9XSUFFIXFLAG=""
-  FSEARCH_DIRS=""
-  FCFLAGS="$FCFLAGS -dp -Wl-M405,412"
-  DEBUG_FCFLAGS=""
-  PROD_FCFLAGS=""
-  PROFILE_FCFLAGS=""
-  f9x_flags_set=yes
-fi
-
-# The default C++ compiler
-
-if test -z "$CXX"; then
-  CXX="CC"
-  CXX_BASENAME=CC
-fi
-
-case $CXX_BASENAME in
-  g++)
-    CXXFLAGS="$CXXFLAGS -Wsign-compare" #Only works for some versions
-    DEBUG_CXXFLAGS="-g -fverbose-asm"
-    DEBUG_CPPFLAGS=
-    PROD_CXXFLAGS="-O3 -fomit-frame-pointer"
-    PROD_CPPFLAGS=
-    PROFILE_CXXFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-
-  *)
-    CXXFLAGS="$CXXFLAGS -h instantiate=used"
-    DEBUG_CXXFLAGS="-g"
-    DEBUG_CPPFLAGS=
-    PROD_CXXFLAGS="-O"
-    PROD_CPPFLAGS=
-    PROFILE_CXXFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-esac
diff --git a/config/unicosmk2.0.X b/config/unicosmk2.0.X
deleted file mode 100644
index f400a10..0000000
--- a/config/unicosmk2.0.X
+++ /dev/null
@@ -1,170 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-
-
-#----------------------------------------------------------------------------
-# Compiler flags. The CPPFLAGS values should not include package debug
-# flags like `-DH5G_DEBUG' since these are added with the
-# `--enable-debug' switch of configure.
-#----------------------------------------------------------------------------
-
-
-# Choosing a C Compiler
-# ---------------------
-#
-# The user should be able to specify the compiler by setting the CC
-# environment variable to the name of the compiler and any switches it 
-# requires for proper operation.  If CC is unset then this script may
-# set it.  If CC is unset by time this script completes then configure 
-# will try `gcc' and `cc' in that order (perhaps some others too).
-#
-# Note: Code later in this file may depend on the value of $CC_BASENAME
-#       in order to distinguish between different compilers when
-#       deciding which compiler command-line switches to use.  This
-#       variable is set based on the incoming value of $CC and is only
-#       used within this file.
-
-if test "X-" =  "X-$CC"; then
-  CC=cc
-  CC_BASENAME=cc
-fi
-# no need to use RANLIB
-RANLIB=:
-
-
-# C Compiler and Preprocessor Flags
-# ---------------------------------
-#
-# Flags that end with `_CFLAGS' are always passed to the compiler.
-# Flags that end with `_CPPFLAGS' are passed to the compiler when
-# compiling but not when linking.
-#
-# DEBUG_CFLAGS		Flags to pass to the compiler to create a
-# DEBUG_CPPFLAGS	library suitable for use with debugging
-#			tools. Usually this list will exclude
-#			optimization switches (like `-O') and include
-#			switches that turn on symbolic debugging
-#			support (like `-g').
-#
-# PROD_CFLAGS		Flags to pass to the compiler to create a
-# PROD_CPPFLAGS		production version of the library.  These
-#			usualy exclude symbolic debugging switches
-#			(like `-g') and include optimization switches
-#			(like `-O').
-#
-# PROFILE_CFLAGS	Flags to pass to the compiler to create a
-# PROFILE_CPPFLAGS	library suitable for performance testing (like 
-# 			`-pg').  This may or may not include debugging 
-# 			or production flags.
-#			
-# CFLAGS		Flags can be added to this variable which
-#			might already be partially initialized.  These 
-#			flags will always be passed to the compiler
-#			and should include switches to turn on full
-#			warnings.  HDF5 attempts to be ANSI and Posix
-#			compliant and employ good programming
-#			practices resulting in few if any
-#			warnings.
-#
-#			Warning flags do not have to be added to CFLAGS
-#			variable if the compiler is the GNU gcc
-#			compiler or a descendent of gcc such as EGCS or PGCC.
-#
-#			The CFLAGS should contains *something* or else 
-#			configure will probably add `-g'.  For most
-#			systems this isn't a problem but some systems
-#			will disable optimizations in favor of the
-#			`-g'.
-#			
-#
-# These flags should be set according to the compiler being used.
-# There are two ways to check the compiler.  You can try using `-v' or 
-# `--version' to see if the compiler will print a version string.  You 
-# can use the value of $CC_BASENAME which is the base name of the
-# first word in $CC (note that the value of CC may have changed
-# above).
-
-case $CC_BASENAME in
-  gcc)
-    CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
-    DEBUG_CFLAGS="-g -fverbose-asm"
-    DEBUG_CPPFLAGS=
-	PROD_CFLAGS="-O3 -fomit-frame-pointer"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-
-  cc)
-    CFLAGS="$CFLAGS"
-    DEBUG_CFLAGS="-g -h zero"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O2 -h scalar0"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-
-  *)
-    CFLAGS="$CFLAGS -ansi"
-    DEBUG_CFLAGS="-g"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-esac
-
-
-
-# Overriding Configure Tests
-# --------------------------
-#
-# Values for overriding configuration tests when cross compiling.
-# This includes compiling on some machines where the serial front end
-# compiles for a parallel back end.
-
-# Set this to `yes' or `no' depending on whether the target is big
-# endian or little endian.
-#ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
-
-# Set this to the width required by printf() to print type `long
-# long'.  For instance, if the format would be `%lld' then set it to
-# `ll' or if the format would be `%qd' set it to `q'.
-#hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'}
-
-# The default Fortran 90 compiler
-
-if test "X-" = "X-$FC"; then
-  FC=f90
-fi
-
-if test "X-" = "X-$f9x_flags_set"; then
-  # -Wl passes flags to the linker and -M# will ignore warnings with
-  # number #. Warning 405 was stopping the executable from being built.
-  F9XSUFFIXFLAG=""
-  FSEARCH_DIRS=""
-  FCFLAGS="$FCFLAGS -dp -Wl-M405"
-  DEBUG_FCFLAGS=""
-  PROD_FCFLAGS=""
-  PROFILE_FCFLAGS=""
-  f9x_flags_set=yes
-fi
diff --git a/config/x86_64-redstorm-linux-gnu b/config/x86_64-redstorm-linux-gnu
index eb8f520..0cd2d73 100644
--- a/config/x86_64-redstorm-linux-gnu
+++ b/config/x86_64-redstorm-linux-gnu
@@ -33,7 +33,7 @@ if test "X-$enable_parallel" = "X-yes" -o X-$CC_BASENAME = X-mpicc; then
     enable_shared="${enable_shared:-no}"
 fi
 
-CFLAGS="$CFLAGS -DRED_STORM"
+H5_CFLAGS="$H5_CFLAGS -DRED_STORM"
 
 # What compiler flags should be used for code development?
 DEBUG_CFLAGS=-g
@@ -163,4 +163,4 @@ hdf5_cv_ullong_to_ldouble_precision_works=${hdf5_cv_ullong_to_ldouble_precision_
 hdf5_cv_vsnprintf_works=${hdf5_cv_vsnprintf_works='yes'}
 hdf5_cv_fp_to_integer_overflow_works=${hdf5_cv_fp_to_integer_overflow_works='yes'}
 # mpich2 used has derived datatype errors.
-hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype_works='no'}
+hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'}