[svn-r27680] Merge of r27675, 27641, and 27645 from trunk

- Changes AC_CONFIG_HEADER to AC_CONFIG_HEADERS

- Removes nsl and socket library checks on Solaris (no longer needed)

- Removes obsolete and/or unmaintained configuration files from config/

Fixes HDFFV-9284, HDFFV-9118, HDFFV-9116

Tested on: h5committest

15 files changed, 32 insertions, 1384 deletions

diff --git a/MANIFEST b/MANIFEST
index 3316184..5f01ed5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -97,16 +97,12 @@
 ./config/cce-flags
 ./config/commence.am
 ./config/conclude.am
-./config/craynv
-./config/dec-flags
 ./config/examples.am
 ./config/freebsd
 ./config/gnu-fflags
 ./config/gnu-flags
-./config/hpux11.23
 ./config/i386-pc-cygwin32
 ./config/i686-pc-cygwin
-./config/ia64-linux-gnu
 ./config/ibm-aix
 ./config/ibm-flags
 ./config/intel-fflags
@@ -116,15 +112,12 @@
 ./config/linux-gnulibc1
 ./config/linux-gnulibc2
 ./config/lt_vers.am
-./config/nec-superux14.1
 ./config/Makefile.am.blank
 ./config/pgi-fflags
 ./config/pgi-flags
 ./config/powerpc-ibm-aix5.x
-./config/solaris2.x
-./config/sv1-cray
+./config/solaris
 ./config/x86_64-pc-cygwin
-./config/x86_64-redstorm-linux-gnu
 
 ./config/site-specific/BlankForm
 
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 39f3378..7b64821 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -184,15 +184,9 @@
 /* Define to 1 if you have the `mpe' library (-lmpe). */
 #cmakedefine H5_HAVE_LIBMPE @H5_HAVE_LIBMPE@
 
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-#cmakedefine H5_HAVE_LIBNSL @H5_HAVE_LIBNSL@
-
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 #cmakedefine H5_HAVE_LIBPTHREAD @H5_HAVE_LIBPTHREAD@
 
-/* Define to 1 if you have the `socket' library (-lsocket). */
-#cmakedefine H5_HAVE_LIBSOCKET @H5_HAVE_LIBSOCKET@
-
 /* Define to 1 if you have the `sz' library (-lsz). */
 #cmakedefine H5_HAVE_LIBSZ @H5_HAVE_LIBSZ@
 
diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake
index e058b10..6885187 100644
--- a/config/cmake_ext_mod/ConfigureChecks.cmake
+++ b/config/cmake_ext_mod/ConfigureChecks.cmake
@@ -117,13 +117,8 @@ if (NOT WINDOWS)
   CHECK_LIBRARY_EXISTS_CONCAT ("wsock32" gethostbyname ${HDF_PREFIX}_HAVE_LIBWSOCK32)
 endif (NOT WINDOWS)
 
+# UCB (BSD) compatibility library
 CHECK_LIBRARY_EXISTS_CONCAT ("ucb"    gethostname  ${HDF_PREFIX}_HAVE_LIBUCB)
-CHECK_LIBRARY_EXISTS_CONCAT ("socket" connect      ${HDF_PREFIX}_HAVE_LIBSOCKET)
-CHECK_LIBRARY_EXISTS ("c" gethostbyname "" NOT_NEED_LIBNSL)
-
-if (NOT NOT_NEED_LIBNSL)
-  CHECK_LIBRARY_EXISTS_CONCAT ("nsl"    gethostbyname  ${HDF_PREFIX}_HAVE_LIBNSL)
-endif (NOT NOT_NEED_LIBNSL)
 
 # For other tests to use the same libraries
 set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LINK_LIBS})
diff --git a/config/craynv b/config/craynv
deleted file mode 100644
index 479d5c8..0000000
--- a/config/craynv
+++ /dev/null
@@ -1,198 +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.
-
-# Disabling Dependency Tracking
-# ---------------------
-#
-# The Cray X1 machines that The HDF Group tests on seem to have trouble doing
-# dependency tracking (probably because they use Cray's C++ compiler,
-# which autoconf may not recognize).  Until this is fixed by autoconf
-# or a user complains, disable dependency tracking on Crays.
-enable_dependency_tracking="no"
-
-# 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
-# PROFILE_CPPFLAGS     library suitable for performance testing (like 
-#                      `-pg').  This may or may not include debugging 
-#                      or production flags.
-#                      
-# 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 H5_CFLAGS
-#			variable if the compiler is the GNU gcc
-#			compiler or a descendent of gcc such as EGCS or PGCC.
-#
-# 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 
-# `--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)
-       H5_CFLAGS="$H5_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)
-       H5_CFLAGS="$H5_CFLAGS" 
-       DEBUG_CFLAGS="-g"
-       DEBUG_CPPFLAGS=
-       PROD_CFLAGS=""
-       PROD_CPPFLAGS=
-       PROFILE_CFLAGS=
-       PROFILE_CPPFLAGS=
-       ;;
-
-    *)
-       H5_CFLAGS="$H5_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-$F9X"; then
-    F9X=ftn
-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.
-    # The -em flag enables .mod files, which is what HDF5 builds.
-    F9XSUFFIXFLAG=""
-    FSEARCH_DIRS=""
-    H5_FCFLAGS="$H5_FCFLAGS -em"
-    DEBUG_FCFLAGS="-g"
-    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++)
-       H5_CXXFLAGS="$H5_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=
-       ;;
-
-    *)
-       H5_CXXFLAGS="$H5_CXXFLAGS" 
-       DEBUG_CXXFLAGS="-g"
-       DEBUG_CPPFLAGS=
-       PROD_CXXFLAGS=""
-       PROD_CPPFLAGS=
-       PROFILE_CXXFLAGS=
-       PROFILE_CPPFLAGS=
-       ;;
-esac
-
diff --git a/config/dec-flags b/config/dec-flags
deleted file mode 100644
index 8f3fa1a..0000000
--- a/config/dec-flags
+++ /dev/null
@@ -1,150 +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 should be sourced into configure if the compiler is a DEC
-# compiler.  It is careful not to do anything if the compiler is not
-# DEC; otherwise `cc_flags_set' is set to `yes'
-#
-
-# Get the compiler version unless it's already known.
-#
-#   cc_vendor:    The compiler vendor: DEC
-#   cc_version:   Version number, like: V5.2-038
-#
-if test X = "X$cc_flags_set"; then
-    cc_vendor=DEC
-    cc_version="`$CC $CFLAGS $H5_CFLAGS -V 2>&1 |head -1`"
-    case "$cc_version" in
-	DEC*)
-	    cc_version="`echo $cc_version |\
-			sed 's/.*DEC C \(V[0-9][-\.0-9]*\).*/\1/'`"
-	;;
-	Compaq*)
-	    cc_version="`echo $cc_version |\
-			sed 's/.*Compaq C \(V[0-9][-\.0-9]*\).*/\1/'`"
-	;;
-    esac
-
-    if test X != "$gcc_version"; then
-	echo "compiler '$CC' is $cc_vendor-$cc_version"
-    else
-        cc_vendor=
-    fi
-fi
-
-# Warn about old compilers that don't work right.
-case "$cc_vendor-$cc_version" in
-    DEC-V5.2-038)
-        cat <<EOF
-    **
-    ** This compiler may generate incorrect code when optimizations are
-    ** enabled. Please upgrade to a newer version (we're not sure which
-    ** version actually works) before reporting bugs to the HDF5 team.
-    **
-EOF
-	sleep 5
-	;;
-esac
-
-# Compiler flags
-case "$cc_vendor-$cc_version" in
-    DEC-V5.*)
-	# Production
-	PROD_CFLAGS="-std -verbose -warnprotos -ieee -misalign -O4  -ansi_args -fp_reorder -readonly_strings -inline speed"
-	PROD_CPPFLAGS="-D_INTRINSICS -D_INLINE_INTRINSICS"
-
-	# Debug
-	DEBUG_CFLAGS="-g -std -verbose -warnprotos -ieee -misalign"
-	DEBUG_CPPFLAGS=
-
-	# Profile
-	PROFILE_CFLAGS="-pg -std -verbose -warnprotos -ieee -misalign"
-	PROFILE_CPPFLAGS=
-
-	# Flags are set
-	cc_flags_set=yes
-	;;
-
-    DEC-V6.*)
-	# Production
-	PROD_CFLAGS="-c99 -verbose -warnprotos -ieee -misalign -O4 -fp_reorder -readonly_strings -inline speed"
-	PROD_CPPFLAGS="-D_INTRINSICS -D_INLINE_INTRINSICS"
-
-	# Debug
-	DEBUG_CFLAGS="-g -c99 -verbose -warnprotos -ieee -misalign"
-	DEBUG_CPPFLAGS=
-
-	# Profile
-	PROFILE_CFLAGS="-pg -c99 -verbose -warnprotos -ieee -misalign"
-	PROFILE_CPPFLAGS=
-
-	# Flags are set
-	cc_flags_set=yes
-	;;
-esac
-
-# If no flags were set then clear the compiler vendor and version info.
-if test X = "X$cc_flags_set"; then
-    cc_vendor=
-    cc_version=
-fi
-
-# 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=""
-  H5_FCFLAGS="$H5_FCFLAGS -Olimit 2048 -std1"
-  DEBUG_FCFLAGS="-Olimit 2048 -std1"
-  PROD_FCFLAGS="-Olimit 2048 -std1"
-  PROFILE_FCFLAGS="-Olimit 2048 -std1"
-  f9x_flags_set=yes
-fi
-
-# The default C++ compiler
-
-if test -z "$CXX"; then
-    CXX=cxx
-    CXX_BASENAME=cxx
-fi
-
-
-case $CXX_BASENAME in
-    g++)
-	H5_CXXFLAGS="$H5_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=
-	;;
-
-    *)
-	H5_CXXFLAGS="$H5_CXXFLAGS -tlocal -D__USE_STD_IOSTREAM"
-	DEBUG_CXXFLAGS="-g"
-	DEBUG_CPPFLAGS=
-	PROD_CXXFLAGS="-O"
-	PROD_CPPFLAGS=
-	PROFILE_CXXFLAGS="-pg"
-	PROFILE_CPPFLAGS=
-	;;
-esac
-
diff --git a/config/hpux11.23 b/config/hpux11.23
deleted file mode 100644
index 339cc84..0000000
--- a/config/hpux11.23
+++ /dev/null
@@ -1,96 +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.
-
-# Default compiler is `cc'
-if test "X-" =  "X-$CC"; then
-  CC=cc
-  CC_BASENAME=cc
-fi
-
-# Flags
-case "X-$CC" 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=
-    ;;
-
-  *)
-    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
-    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=""
-  H5_FCFLAGS="$H5_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
-    H5_CXXFLAGS="$H5_CXXFLAGS +Z  -D_INCLUDE_LONGLONG"
-    H5_CFLAGS="$H5_CFLAGS -g +O2"
-    DEBUG_CXXFLAGS=-g
-    DEBUG_CPPFLAGS=
-    PROD_CXXFLAGS="-O -s"
-    PROD_CPPFLAGS=
-    PROFILE_CPPFLAGS=
-    ;;
-
-  *)
-    H5_CXXFLAGS="$H5_CXXFLAGS -D_INCLUDE_LONGLONG"
-    H5_CFLAGS="$H5_CFLAGS"
-    DEBUG_CXXFLAGS=
-    DEBUG_CPPFLAGS=
-    PROD_CXXFLAGS=
-    PROD_CPPFLAGS=
-    PROFILE_CPPFLAGS=
-    ;;
-esac
diff --git a/config/ia64-linux-gnu b/config/ia64-linux-gnu
deleted file mode 100644
index 9f1b262..0000000
--- a/config/ia64-linux-gnu
+++ /dev/null
@@ -1,144 +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.
-
-# Use Intel C compiler by default (if it's available).
-# Use mpicc for parallel by default.
-if test "X$CC" = "X"; then
-    if test "X-$enable_parallel" = "X-yes"; then
-	CC=mpicc
-	CC_BASENAME=mpicc
-    elif which icc > /dev/null; then
-	CC=icc
-	CC_BASENAME=icc
-    fi
-fi
-
-# Define RUNPARALLEL if parallel mode is enabled or a parallel compiler used.
-if test "X-$enable_parallel" = "X-yes" -o X-$CC_BASENAME = X-mpicc; then
-    RUNPARALLEL=${RUNPARALLEL="mpirun -np \$\${NPROCS:=6}"}
-fi
-
-#----------------------------------------------------------------------------
-# 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.
-
-case $CC_BASENAME in
-    ecc|icc)
-	. $srcdir/config/intel-flags
-	;;
-
-    gcc)
-	. $srcdir/config/gnu-flags
-	;;
-
-    *)
-	H5_CFLAGS="$H5_CFLAGS -ansi"
-	DEBUG_CFLAGS="-g"
-	DEBUG_CPPFLAGS=
-	PROD_CFLAGS="-O"
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS="-pg"
-	PROFILE_CPPFLAGS=
-	;;
-esac
-
-# The default Fortran 90 compiler
-
-# Use Intel Fortran compiler by default.
-if test X-$enable_fortran = X-yes -a "X-$FC" = "X-"; then
-    if test "X-$enable_parallel" = "X-yes"; then
-	FC=mpif90
-    else
-	FC="ifort"
-    fi
-fi
-
-case $FC in
-  *efc|*ifort)
-    # 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'
-    H5_FCFLAGS="$H5_FCFLAGS $MORE_FCFLAGS"
-    f9x_flags_set=yes
-    ;;
-
-  *)
-    f9x_flags_set=yes
-    ;;
-esac
-
-# The following is not right and need work.
-if test "X$f9x_flags_set" = "X"; then
-  F9XSUFFIXFLAG=""
-  FSEARCH_DIRS=""
-  H5_FCFLAGS="$H5_FCFLAGS"
-  DEBUG_FCFLAGS=""
-  PROD_FCFLAGS=""
-  PROFILE_FCFLAGS=""
-  f9x_flags_set=yes
-fi
-
-# The Default settings for C++
-# Intel changed C++ compiler's name from "icc" to "icpc" in version 8.1
-if test -z "$CXX"; then
-    CXX=icpc
-    CXX_BASENAME=icpc
-fi
-
-# A patch to make g++ getting the default settings.
-# CXX_BASENAME should have been set in configure.
-if test "X$CXX" = "Xg++"; then
-    CXX_BASENAME=g++
-fi
-
-
-case $CXX_BASENAME in
-    ecc|icc)	# Intel compilers
-	# Default to C99 standard.
-	H5_CXXFLAGS="${H5_CXXFLAGS:--std=c99}"
-	DEBUG_CXXFLAGS="-g -w2 -Wall"
-	DEBUG_CPPFLAGS=
-	PROD_CXXFLAGS=""     #Default optimization O2 is used
-	PROD_CPPFLAGS=
-	PROFILE_CXXFLAGS="-pg"
-	PROFILE_CPPFLAGS=
-	;;
-    g++)
-	H5_CXXFLAGS="$H5_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=
-	;;
-
-    *)
-	# Default to C99 standard.
-	H5_CXXFLAGS="${H5_CXXFLAGS:--std=c99}"
-	DEBUG_CXXFLAGS="-g"
-	DEBUG_CPPFLAGS=
-	PROD_CXXFLAGS="-O"
-	PROD_CPPFLAGS=
-	PROFILE_CXXFLAGS="-pg"
-	PROFILE_CPPFLAGS=
-	;;
-esac
diff --git a/config/nec-superux14.1 b/config/nec-superux14.1
deleted file mode 100644
index dc1a15d..0000000
--- a/config/nec-superux14.1
+++ /dev/null
@@ -1,179 +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.
-# [ak] created for a nec sx6 running superux with native compilers
-# [ak] -xint is neccessary because of src/H5FDmulti.c[H5Pset_fapl_multi]
-# [ak]  integer division of unsigned longs for _memb_addr
- 
-#----------------------------------------------------------------------------
-# 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="sxc++ -Xa -size_t64 -xint -K c99"
-    CC_BASENAME=sxc++
-fi
-# The default archiver is `sxar'
-AR=${AR:-sxar}
-RANLIB=${RANLIB:=":"}
-
-if test "X-" = "X-$CXX"; then
-    CXX="sxc++ -size_t64 -xint -Kexceptions"
-    CXX_BASENAME=sxc++
-fi
-
-if test "X-" = "X-$F9X"; then
-    FC="sxf90 -size_t64 -ew "
-    FC_BASENAME=sxf90
-fi
-
-# 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.
-#
-# 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 H5_CFLAGS
-#			variable if the compiler is the GNU gcc
-#			compiler or a descendent of gcc such as EGCS or PGCC.
-#
-# 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 
-# `--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
-    cc)
-        H5_CFLAGS="$H5_CFLAGS"
-	DEBUG_CFLAGS="-Cdebug -g -wall"
-	DEBUG_CPPFLAGS=
-	PROD_CFLAGS="-Cnoopt"
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS="-p"
-	PROFILE_CPPFLAGS=
-	;;
-
-    *)
-	H5_CFLAGS="$H5_CFLAGS"
-	DEBUG_CFLAGS="-g"
-	DEBUG_CPPFLAGS=
-	PROD_CFLAGS=""
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS="-p"
-	PROFILE_CPPFLAGS=
-	;;
-esac
-
-case $CXX_BASENAME in
-    c++)
-         H5_CXXFLAGS="$H5_CXXFLAGS -Tlocal"
-         ;;
-
-    *)
-         H5_CXXFLAGS="$H5_CXXFLAGS"
-         ;;
-esac
- 
-case $FC_BASENAME in
-    f90)
-         H5_FCFLAGS="$F9XFLAGS"
-         ;;
-
-    *)
-         H5_FCFLAGS="$F9XFLAGS"
-         ;;
-esac
-
-# Overriding Configure Tests
-# --------------------------
-#
-ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=0}
-hdf5_cv_gettimeofday_tz=no
-# I have to add the follwoing two lines when -K c99 was used
-ac_cv_func_getrusage=no
-ac_cv_func_gethostname=no
-hdf5_cv_vsnprintf_works=no
-hdf5_cv_printf_ll=l
-hdf5_cv_system_scope_threads=no
-hdf5_cv_sw_ldouble_to_integer_works=no
-hdf5_cv_fp_to_ullong_right_maximum=no
-hdf5_cv_fp_to_ullong_bottom_bit_works=yes
-hdf5_cv_fp_to_ullong_right_maximum=no
-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_cv_fp_to_ullong_accurate=no
-hdf5_cv_fp_to_ullong_right_maximum=no
-CONFIGURE_LIBS=/usr/lib/libi90sxe.a
-
-
diff --git a/config/solaris2.x b/config/solaris
index 310c373..310c373 100644
--- a/config/solaris2.x
+++ b/config/solaris
diff --git a/config/sv1-cray b/config/sv1-cray
deleted file mode 100644
index 1bae48d..0000000
--- a/config/sv1-cray
+++ /dev/null
@@ -1,199 +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.
-#
-# 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 H5_CFLAGS
-#			variable if the compiler is the GNU gcc
-#			compiler or a descendent of gcc such as EGCS or PGCC.
-#
-# 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 
-# `--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)
-    H5_CFLAGS="$H5_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)
-    H5_CFLAGS="$H5_CFLAGS"
-    DEBUG_CFLAGS="-g -h zero"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O2 -h scalar0 -h vector0 -h task1"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-
-  *)
-    H5_CFLAGS="$H5_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=""
-  H5_FCFLAGS="$H5_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++)
-    H5_CXXFLAGS="$H5_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=
-    ;;
-
-  *)
-    H5_CXXFLAGS="$H5_CXXFLAGS -h instantiate=used"
-    DEBUG_CXXFLAGS="-g"
-    DEBUG_CPPFLAGS=
-    PROD_CXXFLAGS="-O"
-    PROD_CPPFLAGS=
-    PROFILE_CXXFLAGS="-pg"
-    PROFILE_CPPFLAGS=
-    ;;
-esac
diff --git a/config/x86_64-redstorm-linux-gnu b/config/x86_64-redstorm-linux-gnu
deleted file mode 100644
index 76f9711..0000000
--- a/config/x86_64-redstorm-linux-gnu
+++ /dev/null
@@ -1,164 +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 STORM machine
-
-# Define RUNPARALLEL and RUNSERIAL if parallel mode is enabled or a parallel
-# compiler is used.
-if test "X-$enable_parallel" = "X-yes" -o X-$CC_BASENAME = X-mpicc; then
-    RUNSERIAL=${RUNSERIAL:-"yod -sz 1"}
-    RUNPARALLEL=${RUNPARALLEL:-"yod -sz 3"}
-    # Disable stream-vfd option.  It does not work in parallel mode.
-    enable_stream_vfd="${enable_stream_vfd:-no}"
-    # Turn off shared lib option.  It does not work in parallel mode.
-    enable_shared="${enable_shared:-no}"
-fi
-
-H5_CFLAGS="$H5_CFLAGS -DRED_STORM"
-
-# 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=
-
-# 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='8'}
-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}
-# no cache for long double which varies in size in different compilers.
-# gcc defines it as 12 bytes but pgcc defines it as 8 bytes.
-#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='8'}
-ac_cv_type_ssize_t=${ac_cv_type_ssize_t=yes}
-ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t='8'}
-ac_cv_type_off_t=${ac_cv_type_off_t=yes}
-ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t='8'}
-
-# 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'}
-
-# Cache the sizeof of the following types to save configure time.
-# These are verified in test/tconfig in case they change.
-ac_cv_type_int8_t=${ac_cv_type_int8_t=yes}
-ac_cv_type_int16_t=${ac_cv_type_int16_t=yes}
-ac_cv_type_int32_t=${ac_cv_type_int32_t=yes}
-ac_cv_type_int64_t=${ac_cv_type_int64_t=yes}
-ac_cv_type_uint8_t=${ac_cv_type_uint8_t=yes}
-ac_cv_type_uint16_t=${ac_cv_type_uint16_t=yes}
-ac_cv_type_uint32_t=${ac_cv_type_uint32_t=yes}
-ac_cv_type_uint64_t=${ac_cv_type_uint64_t=yes}
-ac_cv_sizeof_int8_t=${ac_cv_sizeof_int8_t='1'}
-ac_cv_sizeof_int16_t=${ac_cv_sizeof_int16_t='2'}
-ac_cv_sizeof_int32_t=${ac_cv_sizeof_int32_t='4'}
-ac_cv_sizeof_int64_t=${ac_cv_sizeof_int64_t='8'}
-ac_cv_sizeof_uint8_t=${ac_cv_sizeof_uint8_t='1'}
-ac_cv_sizeof_uint16_t=${ac_cv_sizeof_uint16_t='2'}
-ac_cv_sizeof_uint32_t=${ac_cv_sizeof_uint32_t='4'}
-ac_cv_sizeof_uint64_t=${ac_cv_sizeof_uint64_t='8'}
-
-# Cache the sizeof of the following types to save configure time.
-# These are verified in test/tconfig in case they change.
-ac_cv_type_int_least8_t=${ac_cv_type_int_least8_t=yes}
-ac_cv_type_int_least16_t=${ac_cv_type_int_least16_t=yes}
-ac_cv_type_int_least32_t=${ac_cv_type_int_least32_t=yes}
-ac_cv_type_int_least64_t=${ac_cv_type_int_least64_t=yes}
-ac_cv_type_uint_least8_t=${ac_cv_type_uint_least8_t=yes}
-ac_cv_type_uint_least16_t=${ac_cv_type_uint_least16_t=yes}
-ac_cv_type_uint_least32_t=${ac_cv_type_uint_least32_t=yes}
-ac_cv_type_uint_least64_t=${ac_cv_type_uint_least64_t=yes}
-ac_cv_sizeof_int_least8_t=${ac_cv_sizeof_int_least8_t='1'}
-ac_cv_sizeof_int_least16_t=${ac_cv_sizeof_int_least16_t='2'}
-ac_cv_sizeof_int_least32_t=${ac_cv_sizeof_int_least32_t='4'}
-ac_cv_sizeof_int_least64_t=${ac_cv_sizeof_int_least64_t='8'}
-ac_cv_sizeof_uint_least8_t=${ac_cv_sizeof_uint_least8_t='1'}
-ac_cv_sizeof_uint_least16_t=${ac_cv_sizeof_uint_least16_t='2'}
-ac_cv_sizeof_uint_least32_t=${ac_cv_sizeof_uint_least32_t='4'}
-ac_cv_sizeof_uint_least64_t=${ac_cv_sizeof_uint_least64_t='8'}
-
-# Cache the sizeof of the following types to save configure time.
-# These are verified in test/tconfig in case they change.
-ac_cv_type_int_fast8_t=${ac_cv_type_int_fast8_t=yes}
-ac_cv_type_int_fast16_t=${ac_cv_type_int_fast16_t=yes}
-ac_cv_type_int_fast32_t=${ac_cv_type_int_fast32_t=yes}
-ac_cv_type_int_fast64_t=${ac_cv_type_int_fast64_t=yes}
-ac_cv_type_uint_fast8_t=${ac_cv_type_uint_fast8_t=yes}
-ac_cv_type_uint_fast16_t=${ac_cv_type_uint_fast16_t=yes}
-ac_cv_type_uint_fast32_t=${ac_cv_type_uint_fast32_t=yes}
-ac_cv_type_uint_fast64_t=${ac_cv_type_uint_fast64_t=yes}
-ac_cv_sizeof_int_fast8_t=${ac_cv_sizeof_int_fast8_t='1'}
-ac_cv_sizeof_int_fast16_t=${ac_cv_sizeof_int_fast16_t='8'}
-ac_cv_sizeof_int_fast32_t=${ac_cv_sizeof_int_fast32_t='8'}
-ac_cv_sizeof_int_fast64_t=${ac_cv_sizeof_int_fast64_t='8'}
-ac_cv_sizeof_uint_fast8_t=${ac_cv_sizeof_uint_fast8_t='1'}
-ac_cv_sizeof_uint_fast16_t=${ac_cv_sizeof_uint_fast16_t='8'}
-ac_cv_sizeof_uint_fast32_t=${ac_cv_sizeof_uint_fast32_t='8'}
-ac_cv_sizeof_uint_fast64_t=${ac_cv_sizeof_uint_fast64_t='8'}
-
-hdf5_cv_system_scope_threads=${hdf5_cv_system_scope_threads="no"}
-
-# Hard set MPI_File_set_size() working for files over 2GB to yes
-hdf5_cv_mpi_file_set_size_big=${hdf5_cv_mpi_file_set_size_big='yes'}
-
-# 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_vsnprintf_works=${hdf5_cv_vsnprintf_works='yes'}
-hdf5_cv_fp_to_integer_overflow_works=${hdf5_cv_fp_to_integer_overflow_works='yes'}
diff --git a/configure b/configure
index f9d538b..27df0aa 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Id: configure.ac 27550 2015-08-23 09:37:42Z hdftest .
+# From configure.ac Id: configure.ac 27621 2015-08-30 09:59:29Z hdftest .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for HDF5 1.8.16-snap15.
 #
@@ -3725,12 +3725,6 @@ ac_config_commands="$ac_config_commands pubconf"
 ## configure is currently running by using the --host=foo flag.
 ## For machines on which HDF5 is often configured, it can be convenient
 ## to specify the name of the machine rather than its canonical type.
-case $host_alias in
-  redstorm)
-    host_alias=x86_64-redstorm-linux-gnu
-    ;;
-esac
-
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
@@ -3968,14 +3962,8 @@ case $host_os in
   freebsd*)
     host_os_novers=freebsd
     ;;
-  osf4.*)
-    host_os_novers=osf4.x
-    ;;
-  osf5.*)
-    host_os_novers=osf5.x
-    ;;
-  solaris2.*)
-    host_os_novers=solaris2.x
+  solaris*)
+    host_os_novers=solaris
     ;;
   *)
     host_os_novers=$host_os
@@ -21703,116 +21691,6 @@ _ACEOF
 fi
 
 
-if test "`uname`" = "SunOS" -o "`uname -sr`" = "HP-UX B.11.00"; then
-  ## ...for Solaris
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
-$as_echo_n "checking for socket in -lsocket... " >&6; }
-if ${ac_cv_lib_socket_socket+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char socket ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return socket ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_socket_socket=yes
-else
-  ac_cv_lib_socket_socket=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
-$as_echo "$ac_cv_lib_socket_socket" >&6; }
-if test "x$ac_cv_lib_socket_socket" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBSOCKET 1
-_ACEOF
-
-  LIBS="-lsocket $LIBS"
-
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xdr_int in -lnsl" >&5
-$as_echo_n "checking for xdr_int in -lnsl... " >&6; }
-if ${ac_cv_lib_nsl_xdr_int+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char xdr_int ();
-#ifdef FC_DUMMY_MAIN
-#ifndef FC_DUMMY_MAIN_EQ_F77
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int FC_DUMMY_MAIN() { return 1; }
-#endif
-#endif
-int
-main ()
-{
-return xdr_int ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_nsl_xdr_int=yes
-else
-  ac_cv_lib_nsl_xdr_int=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_xdr_int" >&5
-$as_echo "$ac_cv_lib_nsl_xdr_int" >&6; }
-if test "x$ac_cv_lib_nsl_xdr_int" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBNSL 1
-_ACEOF
-
-  LIBS="-lnsl $LIBS"
-
-fi
-
-fi
-
 ## ----------------------------------------------------------------------
 ## Check for system header files.
 ##
@@ -22164,57 +22042,6 @@ done
     ;;
 esac
 
-case "$host" in
-  alpha*-dec*-osf*)
-    ## The <sys/sysinfo.h> and <sys/proc.h> are needed on the DEC
-    ## Alpha to turn off UAC fixing. We do *not* attempt to
-    ## locate these files on other systems because there are too
-    ## many problems with including them.
-    for ac_header in sys/sysinfo.h sys/proc.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-    ;;
-  mips*-sgi*)
-    ## The <sys/fpu.h> is needed on the SGI machines to turn off
-    ## denormalized floating-point values going to zero.  We do *not*
-    ## attempt to locate these files on other systems because there
-    ## may be problems with including them.
-    for ac_header in sys/fpu.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "sys/fpu.h" "ac_cv_header_sys_fpu_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_fpu_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_FPU_H 1
-_ACEOF
-
-fi
-
-done
-
-    for ac_func in get_fpc_csr
-do :
-  ac_fn_c_check_func "$LINENO" "get_fpc_csr" "ac_cv_func_get_fpc_csr"
-if test "x$ac_cv_func_get_fpc_csr" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GET_FPC_CSR 1
-_ACEOF
-
-fi
-done
-
-    ;;
-esac
-
 ## ----------------------------------------------------------------------
 ## Some platforms require that all symbols are resolved when a library
 ## is linked. We can use the -no-undefined flag to tell libtool that
diff --git a/configure.ac b/configure.ac
index c0037fc..9969d9a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AC_PREREQ([2.69])
 ##
 AC_INIT([HDF5], [1.8.16-snap15], [help@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
-AC_CONFIG_HEADER([src/H5config.h])
+AC_CONFIG_HEADERS([src/H5config.h])
 
 AC_CONFIG_AUX_DIR([bin])
 AC_CONFIG_MACRO_DIR([m4])
@@ -85,12 +85,6 @@ AC_CONFIG_COMMANDS([pubconf], [
 ## configure is currently running by using the --host=foo flag.
 ## For machines on which HDF5 is often configured, it can be convenient
 ## to specify the name of the machine rather than its canonical type.
-case $host_alias in
-  redstorm)
-    host_alias=x86_64-redstorm-linux-gnu
-    ;;
-esac
-
 AC_CANONICAL_HOST
 AC_SUBST([CPPFLAGS])
 
@@ -244,14 +238,8 @@ case $host_os in
   freebsd*)
     host_os_novers=freebsd
     ;;
-  osf4.*)
-    host_os_novers=osf4.x
-    ;;
-  osf5.*)
-    host_os_novers=osf5.x
-    ;;
-  solaris2.*)
-    host_os_novers=solaris2.x
+  solaris*)
+    host_os_novers=solaris
     ;;
   *)
     host_os_novers=$host_os
@@ -828,12 +816,6 @@ esac
 AC_CHECK_LIB([m], [ceil])
 AC_CHECK_LIB([dl], [dlopen])
 
-if test "`uname`" = "SunOS" -o "`uname -sr`" = "HP-UX B.11.00"; then
-  ## ...for Solaris
-  AC_CHECK_LIB([socket], [socket])
-  AC_CHECK_LIB([nsl], [xdr_int])
-fi
-
 ## ----------------------------------------------------------------------
 ## Check for system header files.
 ##
@@ -870,24 +852,6 @@ case "`uname`" in
     ;;
 esac
 
-case "$host" in
-  alpha*-dec*-osf*)
-    ## The <sys/sysinfo.h> and <sys/proc.h> are needed on the DEC
-    ## Alpha to turn off UAC fixing. We do *not* attempt to
-    ## locate these files on other systems because there are too
-    ## many problems with including them.
-    AC_CHECK_HEADERS([sys/sysinfo.h sys/proc.h])
-    ;;
-  mips*-sgi*)
-    ## The <sys/fpu.h> is needed on the SGI machines to turn off
-    ## denormalized floating-point values going to zero.  We do *not*
-    ## attempt to locate these files on other systems because there
-    ## may be problems with including them.
-    AC_CHECK_HEADERS([sys/fpu.h])
-    AC_CHECK_FUNCS([get_fpc_csr])
-    ;;
-esac
-
 ## ----------------------------------------------------------------------
 ## Some platforms require that all symbols are resolved when a library
 ## is linked. We can use the -no-undefined flag to tell libtool that
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 497080b..46cca57 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -87,7 +87,30 @@ New Features
 
       (DER - 2015/08/13 HDFFV-9119, HDFFV-9421)
 
-
+    - Removed obsolete/unmaintained files from config/
+
+      Several files were removed from the config directory. These files
+      represent old operating systems, were no longer necessary, and/or
+      were no longer maintained. configure.ac was updated to reflect the
+      removed files.
+
+      Removed:
+
+        craynv
+        dec-flags
+        hpux11.23
+        ia64-linux-gnu
+        nec-superux14.1
+        sv1-cray
+        x86_64-redstorm-linux-gnu
+
+      As a part of this work, a few lines that deal with locating the
+      sys/fpu.h header on SGI machines and some OSF/1 configure lines
+      were also removed. The Solaris config was also renamed to not have
+      a version number since the version number was ignored by configure
+      as it applies to all Solaris versions.
+
+    (DER - 2015/09/04 HDFFV-9116)
 
     Library
     -------
diff --git a/src/H5config.h.in b/src/H5config.h.in
index c7488d1..9caa309 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -141,9 +141,6 @@
 /* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
-/* Define to 1 if you have the `get_fpc_csr' function. */
-#undef HAVE_GET_FPC_CSR
-
 /* Define if the compiler understands inline */
 #undef HAVE_INLINE
 
@@ -172,15 +169,9 @@
 /* Define to 1 if you have the `mpe' library (-lmpe). */
 #undef HAVE_LIBMPE
 
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-#undef HAVE_LIBNSL
-
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 #undef HAVE_LIBPTHREAD
 
-/* Define to 1 if you have the `socket' library (-lsocket). */
-#undef HAVE_LIBSOCKET
-
 /* Define to 1 if you have the `sz' library (-lsz). */
 #undef HAVE_LIBSZ
 
@@ -292,15 +283,9 @@
 /* Define to 1 if you have the `system' function. */
 #undef HAVE_SYSTEM
 
-/* Define to 1 if you have the <sys/fpu.h> header file. */
-#undef HAVE_SYS_FPU_H
-
 /* Define to 1 if you have the <sys/ioctl.h> header file. */
 #undef HAVE_SYS_IOCTL_H
 
-/* Define to 1 if you have the <sys/proc.h> header file. */
-#undef HAVE_SYS_PROC_H
-
 /* Define to 1 if you have the <sys/resource.h> header file. */
 #undef HAVE_SYS_RESOURCE_H
 
@@ -310,9 +295,6 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
-/* Define to 1 if you have the <sys/sysinfo.h> header file. */
-#undef HAVE_SYS_SYSINFO_H
-
 /* Define to 1 if you have the <sys/timeb.h> header file. */
 #undef HAVE_SYS_TIMEB_H