[svn-r7269] Purpose:

    Update

Description:
    Revamped the configuration system. The configurations for the Fortran
    and C++ libraries are no longer separate from the "main"
    configuration system. This involved removing the "configure*" and
    "aclocal.m4" files from the fortran/ and c++/ subdirectories. Also
    merging settings in the config/ subdirectories into the main config/
    subdirectory.

    Fortran header files had to be modified a little for Linux. It was
    checking if it was a Linux machine by some #defines, however with the
    -std=c99 switch, these defines weren't there. I added a check for
    some other ones which should be there whether the -std=c99 switch is
    used or not.

Platforms tested:
    Verbena (Fortran & C++)
    Sol (Fortran & C++)
    Copper (Fortran & C++)
    Modi4 (Parallel, Fortran, & C++)

Misc. update:

2 files changed, 350 insertions, 4 deletions

diff --git a/c++/test/Dependencies b/c++/test/Dependencies
index f29a269..aaba9fe 100644
--- a/c++/test/Dependencies
+++ b/c++/test/Dependencies
@@ -1,3 +1,347 @@
 ## This file is machine generated on GNU systems.
 ## Only temporary changes may be made here.
 
+dsets.lo: \
+   $(srcdir)/dsets.cpp \
+   $(top_builddir)/../../hdf5/c++/src/H5Cpp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Include.h \
+   $(top_builddir)/../../hdf5/src/hdf5.h \
+   $(top_builddir)/../../hdf5/src/H5public.h \
+   $(top_builddir)/src/H5pubconf.h \
+   $(top_builddir)/../../hdf5/src/H5api_adpt.h \
+   $(top_builddir)/../../hdf5/src/H5Ipublic.h \
+   $(top_builddir)/../../hdf5/src/H5Apublic.h \
+   $(top_builddir)/../../hdf5/src/H5ACpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Bpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Dpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Epublic.h \
+   $(top_builddir)/../../hdf5/src/H5Fpublic.h \
+   $(top_builddir)/../../hdf5/src/H5FDpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Gpublic.h \
+   $(top_builddir)/../../hdf5/src/H5HGpublic.h \
+   $(top_builddir)/../../hdf5/src/H5HLpublic.h \
+   $(top_builddir)/../../hdf5/src/H5MMpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Opublic.h \
+   $(top_builddir)/../../hdf5/src/H5Ppublic.h \
+   $(top_builddir)/../../hdf5/src/H5Zpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Rpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Spublic.h \
+   $(top_builddir)/../../hdf5/src/H5Tpublic.h \
+   $(top_builddir)/../../hdf5/src/H5FDcore.h \
+   $(top_builddir)/../../hdf5/src/H5FDfamily.h \
+   $(top_builddir)/../../hdf5/src/H5FDfphdf5.h \
+   $(top_builddir)/../../hdf5/src/H5FDmpio.h \
+   $(top_builddir)/../../hdf5/src/H5FDgass.h \
+   $(top_builddir)/../../hdf5/src/H5FDlog.h \
+   $(top_builddir)/../../hdf5/src/H5FDmpiposix.h \
+   $(top_builddir)/../../hdf5/src/H5FDmulti.h \
+   $(top_builddir)/../../hdf5/src/H5FDsec2.h \
+   $(top_builddir)/../../hdf5/src/H5FDsrb.h \
+   $(top_builddir)/../../hdf5/src/H5FDstdio.h \
+   $(top_builddir)/../../hdf5/src/H5FDstream.h \
+   $(top_builddir)/../../hdf5/c++/src/H5RefCounter.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Exception.h \
+   $(top_builddir)/../../hdf5/c++/src/H5IdComponent.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DataSpace.h \
+   $(top_builddir)/../../hdf5/c++/src/H5PropList.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Object.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Classes.h \
+   $(top_builddir)/../../hdf5/c++/src/H5AbstractDs.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Attribute.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DataType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DcreatProp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DxferProp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5FaccProp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5FcreatProp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5AtomType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5PredType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5EnumType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5IntType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5FloatType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5StrType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5CompType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DataSet.h \
+   $(top_builddir)/../../hdf5/c++/src/H5CommonFG.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Group.h \
+   $(top_builddir)/../../hdf5/c++/src/H5File.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Library.h \
+   $(top_builddir)/../../hdf5/test/h5test.h \
+   $(top_builddir)/../../hdf5/src/H5private.h \
+   $(top_builddir)/../../hdf5/src/H5MPprivate.h \
+   $(top_builddir)/../../hdf5/src/H5FSprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Tpkg.h \
+   $(top_builddir)/../../hdf5/src/H5Tprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Gprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Bprivate.h \
+   $(top_builddir)/../../hdf5/src/H5ACprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Fprivate.h \
+   $(top_builddir)/../../hdf5/src/H5RSprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Rprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Dprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Oprivate.h \
+   $(top_builddir)/../../hdf5/src/H5HGprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Zprivate.h \
+   $(top_builddir)/../../hdf5/test/testhdf5.h \
+   $(top_builddir)/../../hdf5/src/H5Eprivate.h \
+   $(srcdir)/h5cpputil.h
+testhdf5.lo: \
+   $(srcdir)/testhdf5.cpp \
+   $(top_builddir)/../../hdf5/test/testhdf5.h \
+   $(top_builddir)/../../hdf5/src/H5private.h \
+   $(top_builddir)/../../hdf5/src/H5public.h \
+   $(top_builddir)/src/H5pubconf.h \
+   $(top_builddir)/../../hdf5/src/H5api_adpt.h \
+   $(top_builddir)/../../hdf5/src/H5MPprivate.h \
+   $(top_builddir)/../../hdf5/src/H5FSprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Eprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Epublic.h \
+   $(top_builddir)/../../hdf5/src/H5Ipublic.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Cpp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Include.h \
+   $(top_builddir)/../../hdf5/src/hdf5.h \
+   $(top_builddir)/../../hdf5/src/H5Apublic.h \
+   $(top_builddir)/../../hdf5/src/H5ACpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Bpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Dpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Fpublic.h \
+   $(top_builddir)/../../hdf5/src/H5FDpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Gpublic.h \
+   $(top_builddir)/../../hdf5/src/H5HGpublic.h \
+   $(top_builddir)/../../hdf5/src/H5HLpublic.h \
+   $(top_builddir)/../../hdf5/src/H5MMpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Opublic.h \
+   $(top_builddir)/../../hdf5/src/H5Ppublic.h \
+   $(top_builddir)/../../hdf5/src/H5Zpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Rpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Spublic.h \
+   $(top_builddir)/../../hdf5/src/H5Tpublic.h \
+   $(top_builddir)/../../hdf5/src/H5FDcore.h \
+   $(top_builddir)/../../hdf5/src/H5FDfamily.h \
+   $(top_builddir)/../../hdf5/src/H5FDfphdf5.h \
+   $(top_builddir)/../../hdf5/src/H5FDmpio.h \
+   $(top_builddir)/../../hdf5/src/H5FDgass.h \
+   $(top_builddir)/../../hdf5/src/H5FDlog.h \
+   $(top_builddir)/../../hdf5/src/H5FDmpiposix.h \
+   $(top_builddir)/../../hdf5/src/H5FDmulti.h \
+   $(top_builddir)/../../hdf5/src/H5FDsec2.h \
+   $(top_builddir)/../../hdf5/src/H5FDsrb.h \
+   $(top_builddir)/../../hdf5/src/H5FDstdio.h \
+   $(top_builddir)/../../hdf5/src/H5FDstream.h \
+   $(top_builddir)/../../hdf5/c++/src/H5RefCounter.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Exception.h \
+   $(top_builddir)/../../hdf5/c++/src/H5IdComponent.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DataSpace.h \
+   $(top_builddir)/../../hdf5/c++/src/H5PropList.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Object.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Classes.h \
+   $(top_builddir)/../../hdf5/c++/src/H5AbstractDs.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Attribute.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DataType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DcreatProp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DxferProp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5FaccProp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5FcreatProp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5AtomType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5PredType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5EnumType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5IntType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5FloatType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5StrType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5CompType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DataSet.h \
+   $(top_builddir)/../../hdf5/c++/src/H5CommonFG.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Group.h \
+   $(top_builddir)/../../hdf5/c++/src/H5File.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Library.h \
+   $(srcdir)/h5cpputil.h
+tfile.lo: \
+   $(srcdir)/tfile.cpp \
+   $(top_builddir)/../../hdf5/c++/src/H5Cpp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Include.h \
+   $(top_builddir)/../../hdf5/src/hdf5.h \
+   $(top_builddir)/../../hdf5/src/H5public.h \
+   $(top_builddir)/src/H5pubconf.h \
+   $(top_builddir)/../../hdf5/src/H5api_adpt.h \
+   $(top_builddir)/../../hdf5/src/H5Ipublic.h \
+   $(top_builddir)/../../hdf5/src/H5Apublic.h \
+   $(top_builddir)/../../hdf5/src/H5ACpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Bpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Dpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Epublic.h \
+   $(top_builddir)/../../hdf5/src/H5Fpublic.h \
+   $(top_builddir)/../../hdf5/src/H5FDpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Gpublic.h \
+   $(top_builddir)/../../hdf5/src/H5HGpublic.h \
+   $(top_builddir)/../../hdf5/src/H5HLpublic.h \
+   $(top_builddir)/../../hdf5/src/H5MMpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Opublic.h \
+   $(top_builddir)/../../hdf5/src/H5Ppublic.h \
+   $(top_builddir)/../../hdf5/src/H5Zpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Rpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Spublic.h \
+   $(top_builddir)/../../hdf5/src/H5Tpublic.h \
+   $(top_builddir)/../../hdf5/src/H5FDcore.h \
+   $(top_builddir)/../../hdf5/src/H5FDfamily.h \
+   $(top_builddir)/../../hdf5/src/H5FDfphdf5.h \
+   $(top_builddir)/../../hdf5/src/H5FDmpio.h \
+   $(top_builddir)/../../hdf5/src/H5FDgass.h \
+   $(top_builddir)/../../hdf5/src/H5FDlog.h \
+   $(top_builddir)/../../hdf5/src/H5FDmpiposix.h \
+   $(top_builddir)/../../hdf5/src/H5FDmulti.h \
+   $(top_builddir)/../../hdf5/src/H5FDsec2.h \
+   $(top_builddir)/../../hdf5/src/H5FDsrb.h \
+   $(top_builddir)/../../hdf5/src/H5FDstdio.h \
+   $(top_builddir)/../../hdf5/src/H5FDstream.h \
+   $(top_builddir)/../../hdf5/c++/src/H5RefCounter.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Exception.h \
+   $(top_builddir)/../../hdf5/c++/src/H5IdComponent.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DataSpace.h \
+   $(top_builddir)/../../hdf5/c++/src/H5PropList.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Object.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Classes.h \
+   $(top_builddir)/../../hdf5/c++/src/H5AbstractDs.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Attribute.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DataType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DcreatProp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DxferProp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5FaccProp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5FcreatProp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5AtomType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5PredType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5EnumType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5IntType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5FloatType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5StrType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5CompType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DataSet.h \
+   $(top_builddir)/../../hdf5/c++/src/H5CommonFG.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Group.h \
+   $(top_builddir)/../../hdf5/c++/src/H5File.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Library.h \
+   $(top_builddir)/../../hdf5/test/testhdf5.h \
+   $(top_builddir)/../../hdf5/src/H5private.h \
+   $(top_builddir)/../../hdf5/src/H5MPprivate.h \
+   $(top_builddir)/../../hdf5/src/H5FSprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Eprivate.h
+th5s.lo: \
+   $(srcdir)/th5s.cpp \
+   $(top_builddir)/../../hdf5/c++/src/H5Cpp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Include.h \
+   $(top_builddir)/../../hdf5/src/hdf5.h \
+   $(top_builddir)/../../hdf5/src/H5public.h \
+   $(top_builddir)/src/H5pubconf.h \
+   $(top_builddir)/../../hdf5/src/H5api_adpt.h \
+   $(top_builddir)/../../hdf5/src/H5Ipublic.h \
+   $(top_builddir)/../../hdf5/src/H5Apublic.h \
+   $(top_builddir)/../../hdf5/src/H5ACpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Bpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Dpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Epublic.h \
+   $(top_builddir)/../../hdf5/src/H5Fpublic.h \
+   $(top_builddir)/../../hdf5/src/H5FDpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Gpublic.h \
+   $(top_builddir)/../../hdf5/src/H5HGpublic.h \
+   $(top_builddir)/../../hdf5/src/H5HLpublic.h \
+   $(top_builddir)/../../hdf5/src/H5MMpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Opublic.h \
+   $(top_builddir)/../../hdf5/src/H5Ppublic.h \
+   $(top_builddir)/../../hdf5/src/H5Zpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Rpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Spublic.h \
+   $(top_builddir)/../../hdf5/src/H5Tpublic.h \
+   $(top_builddir)/../../hdf5/src/H5FDcore.h \
+   $(top_builddir)/../../hdf5/src/H5FDfamily.h \
+   $(top_builddir)/../../hdf5/src/H5FDfphdf5.h \
+   $(top_builddir)/../../hdf5/src/H5FDmpio.h \
+   $(top_builddir)/../../hdf5/src/H5FDgass.h \
+   $(top_builddir)/../../hdf5/src/H5FDlog.h \
+   $(top_builddir)/../../hdf5/src/H5FDmpiposix.h \
+   $(top_builddir)/../../hdf5/src/H5FDmulti.h \
+   $(top_builddir)/../../hdf5/src/H5FDsec2.h \
+   $(top_builddir)/../../hdf5/src/H5FDsrb.h \
+   $(top_builddir)/../../hdf5/src/H5FDstdio.h \
+   $(top_builddir)/../../hdf5/src/H5FDstream.h \
+   $(top_builddir)/../../hdf5/c++/src/H5RefCounter.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Exception.h \
+   $(top_builddir)/../../hdf5/c++/src/H5IdComponent.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DataSpace.h \
+   $(top_builddir)/../../hdf5/c++/src/H5PropList.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Object.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Classes.h \
+   $(top_builddir)/../../hdf5/c++/src/H5AbstractDs.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Attribute.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DataType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DcreatProp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DxferProp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5FaccProp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5FcreatProp.h \
+   $(top_builddir)/../../hdf5/c++/src/H5AtomType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5PredType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5EnumType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5IntType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5FloatType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5StrType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5CompType.h \
+   $(top_builddir)/../../hdf5/c++/src/H5DataSet.h \
+   $(top_builddir)/../../hdf5/c++/src/H5CommonFG.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Group.h \
+   $(top_builddir)/../../hdf5/c++/src/H5File.h \
+   $(top_builddir)/../../hdf5/c++/src/H5Library.h \
+   $(top_builddir)/../../hdf5/test/testhdf5.h \
+   $(top_builddir)/../../hdf5/src/H5private.h \
+   $(top_builddir)/../../hdf5/src/H5MPprivate.h \
+   $(top_builddir)/../../hdf5/src/H5FSprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Eprivate.h
+h5cpputil.lo: \
+   $(srcdir)/h5cpputil.cpp \
+   $(srcdir)/h5cpputil.h \
+   $(top_builddir)/../../hdf5/test/h5test.h \
+   $(top_builddir)/../../hdf5/src/hdf5.h \
+   $(top_builddir)/../../hdf5/src/H5public.h \
+   $(top_builddir)/src/H5pubconf.h \
+   $(top_builddir)/../../hdf5/src/H5api_adpt.h \
+   $(top_builddir)/../../hdf5/src/H5Ipublic.h \
+   $(top_builddir)/../../hdf5/src/H5Apublic.h \
+   $(top_builddir)/../../hdf5/src/H5ACpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Bpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Dpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Epublic.h \
+   $(top_builddir)/../../hdf5/src/H5Fpublic.h \
+   $(top_builddir)/../../hdf5/src/H5FDpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Gpublic.h \
+   $(top_builddir)/../../hdf5/src/H5HGpublic.h \
+   $(top_builddir)/../../hdf5/src/H5HLpublic.h \
+   $(top_builddir)/../../hdf5/src/H5MMpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Opublic.h \
+   $(top_builddir)/../../hdf5/src/H5Ppublic.h \
+   $(top_builddir)/../../hdf5/src/H5Zpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Rpublic.h \
+   $(top_builddir)/../../hdf5/src/H5Spublic.h \
+   $(top_builddir)/../../hdf5/src/H5Tpublic.h \
+   $(top_builddir)/../../hdf5/src/H5FDcore.h \
+   $(top_builddir)/../../hdf5/src/H5FDfamily.h \
+   $(top_builddir)/../../hdf5/src/H5FDfphdf5.h \
+   $(top_builddir)/../../hdf5/src/H5FDmpio.h \
+   $(top_builddir)/../../hdf5/src/H5FDgass.h \
+   $(top_builddir)/../../hdf5/src/H5FDlog.h \
+   $(top_builddir)/../../hdf5/src/H5FDmpiposix.h \
+   $(top_builddir)/../../hdf5/src/H5FDmulti.h \
+   $(top_builddir)/../../hdf5/src/H5FDsec2.h \
+   $(top_builddir)/../../hdf5/src/H5FDsrb.h \
+   $(top_builddir)/../../hdf5/src/H5FDstdio.h \
+   $(top_builddir)/../../hdf5/src/H5FDstream.h \
+   $(top_builddir)/../../hdf5/src/H5private.h \
+   $(top_builddir)/../../hdf5/src/H5MPprivate.h \
+   $(top_builddir)/../../hdf5/src/H5FSprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Tpkg.h \
+   $(top_builddir)/../../hdf5/src/H5Tprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Gprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Bprivate.h \
+   $(top_builddir)/../../hdf5/src/H5ACprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Fprivate.h \
+   $(top_builddir)/../../hdf5/src/H5RSprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Rprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Dprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Oprivate.h \
+   $(top_builddir)/../../hdf5/src/H5HGprivate.h \
+   $(top_builddir)/../../hdf5/src/H5Zprivate.h
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index 8c4fcf0..fbe8ca3 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -15,11 +15,13 @@
 ##
 ##
 ##
-top_srcdir=@top_srcdir@/..
+top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
 @COMMENCE@
 
+HDF_CXX="yes"
+
 hdf5_srcdir=$(top_srcdir)/src
 hdf5_builddir=$(top_builddir)/src
 
@@ -31,7 +33,7 @@ CPPFLAGS=-I. -I../src -I$(srcdir)/../src -I$(top_srcdir)/test -I$(hdf5_builddir)
 LIB=../src/libhdf5_cpp.la
 LIBHDF5=$(hdf5_builddir)/libhdf5.la
 
-LT_LINK_LIB=$(LT) --mode=link $(CXX) -rpath $(libdir)
+LT_LINK_CXX_LIB=$(LT) --mode=link $(CXX) -static -rpath $(libdir)
 
 ## These are our main targets. They should be listed in the order to be
 ## executed, generally most specific tests to least specific tests.
@@ -52,9 +54,9 @@ DISTCLEAN=$(TEST_PROGS_SRC:.cpp=.lo) $(TEST_PROGS_SRC:.cpp=.o)
 $(TEST_PROGS): $(LIB) $(LIBHDF5)
 
 testhdf5: $(TEST_OBJ)
-	@$(LT_LINK_EXE) $(CFLAGS) -o $@ $(TESTHDF5_OBJ) $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) $(DEFAULT_LIBS)
+	@$(LT_LINK_CXX_EXE) -static $(CXXFLAGS) -o $@ $(TESTHDF5_OBJ) $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) $(DEFAULT_LIBS)
 
 dsets: dsets.lo h5cpputil.lo
-	@$(LT_LINK_EXE) $(CFLAGS) -o $@ dsets.lo h5cpputil.lo $(hdf5_builddir)/../test/h5test.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) $(DEFAULT_LIBS)
+	@$(LT_LINK_CXX_EXE) -static $(CXXFLAGS) -o $@ dsets.lo h5cpputil.lo $(hdf5_builddir)/../test/h5test.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) $(DEFAULT_LIBS)
 
 @CONCLUDE@