[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:

26 files changed, 1515 insertions, 680 deletions

diff --git a/config/commence.in b/config/commence.in
index af1275c..bb8392d 100644
--- a/config/commence.in
+++ b/config/commence.in
@@ -6,7 +6,7 @@
 
 ## Things that Make needs
 .SUFFIXES:
-.SUFFIXES: .c .o .lo
+.SUFFIXES: .c .f90 .cpp .o .lo
 @SET_MAKE@
 
 ## Directories to search
@@ -15,7 +15,14 @@
 ## Programs
 SHELL=/bin/sh
 CC=@CC@
+CXX=@CXX@
+F9X=@F9X@
+F9XMODEXT=@F9XMODEXT@
+F9XMODFLAG=@F9XMODFLAG@
+FSEARCH_DIRS=@FSEARCH_DIRS@
 CFLAGS=@CFLAGS@
+CXXFLAGS=@CXXFLAGS@
+FFLAGS=@FFLAGS@
 CPPFLAGS=@CPPFLAGS@
 LDFLAGS=@LDFLAGS@
 ROOT=@ROOT@
@@ -33,6 +40,10 @@ RUNPARALLEL=@RUNPARALLEL@
 RUNTEST=$(RUNSERIAL)
 TRACE=:
 
+## Languages
+HDF_FORTRAN="no"
+HDF_CXX="no"
+
 ## Installation points
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -54,6 +65,16 @@ LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
 LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA)
 LT_UNINSTALL=$(LT) --mode=uninstall $(RM)
 
+# Fortran compilation/linking stuff
+LT_FCOMPILE=$(LT) --mode=compile $(F9X)
+LT_LINK_FLIB=$(LT) --mode=link $(F9X) -static $(DYNAMIC_DIRS)
+LT_LINK_FEXE=$(LT) --mode=link $(F9X) $(LT_STATIC_EXEC) $(DYNAMIC_DIRS)
+
+# C++ compilation/linking stuff
+LT_CXX_COMPILE=$(LT) --mode=compile $(CXX)
+LT_LINK_CXX_LIB=$(LT) --mode=link $(CXX) -static -rpath $(libdir) $(DYNAMIC_DIRS)
+LT_LINK_CXX_EXE=$(LT) --mode=link $(CXX) -static $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS)
+
 ## Optional variables. We must declare them here because Irix pmake
 ## complains if it sees a reference to a variable which has never been
 ## defined. The main makefile is free to redefine these to something else.
diff --git a/config/conclude.in b/config/conclude.in
index ad90169..8f14856 100644
--- a/config/conclude.in
+++ b/config/conclude.in
@@ -9,11 +9,17 @@
 ##
 lib: $(LIB)
 $(LIB) __no_library__: $(LIB_OBJ)
-	@$(LT_LINK_LIB) -o $@ $(CFLAGS) $(LIB_OBJ) $(LDFLAGS) $(LIBS)
-	@for d in X $(SUBDIRS); do                                      \
-	    if test $$d != X; then                                      \
-	        (set -x; cd $$d && $(MAKE) lib) || exit 1;              \
-	    fi;                                                         \
+	@if test "X$(HDF_FORTRAN)" = "Xyes"; then				\
+	  $(LT_LINK_FLIB) -o $@ $(FFLAGS) $(LIB_OBJ) $(LDFLAGS) $(LIBS);	\
+	elif test "X$(HDF_CXX)" = "Xyes"; then					\
+	  $(LT_LINK_CXX_LIB) -o $@ $(CXXFLAGS) $(LIB_OBJ) $(LDFLAGS) $(LIBS);	\
+	else									\
+	  $(LT_LINK_LIB) -o $@ $(CFLAGS) $(LIB_OBJ) $(LDFLAGS) $(LIBS);		\
+	fi
+	@for d in X $(SUBDIRS); do						\
+	    if test $$d != X; then						\
+	        (set -x; cd $$d && $(MAKE) lib) || exit 1;			\
+	    fi;									\
 	done
 
 progs: $(LIB) $(PROGS)
@@ -108,31 +114,42 @@ check-vfd:
 ## Make installation directories directories if they don't exist.
 ##
 $(libdir):
-	$(top_srcdir)/bin/mkdirs $@
+	-$(top_srcdir)/bin/mkdirs $@
 
 $(includedir):
-	$(top_srcdir)/bin/mkdirs $@
+	-$(top_srcdir)/bin/mkdirs $@
 
 $(bindir):
-	$(top_srcdir)/bin/mkdirs $@
+	-$(top_srcdir)/bin/mkdirs $@
 
 $(DOCDIR):
-	$(top_srcdir)/bin/mkdirs $@
+	-$(top_srcdir)/bin/mkdirs $@
 
 $(EXAMPLEDIR):
-	$(top_srcdir)/bin/mkdirs $@
+	-$(top_srcdir)/bin/mkdirs $@
 
 ## Install the library, the public header files, and public programs.
 ##
 install: $(AUX_LIB) $(PUB_LIB) $(PUB_HDR) $(PUB_PROGS) $(libdir) $(includedir) $(bindir)
 	@for f in X $(PUB_LIB); do					      \
-	   if test $$f != X; then					      \
-	      ($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1);		      \
-	   fi;								      \
+	  if test $$f != X; then					      \
+	    if test "X$(HDF_FORTRAN)" = "Xyes"; then			      \
+	      (cd .libs && rm -f $(PUB_LIB)i && ln -s ../$(PUB_LIB) $(PUB_LIB)i); \
+	    fi;								      \
+	    ($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1);		      \
+	  fi;								      \
 	done
+	@if test "X$(HDF_FORTRAN)" = "Xyes" -a -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
+	   if test -f "hdf5.$(F9XMODEXT)" || test -f "HDF5.$(F9XMODEXT)"; then \
+	      ((cp *.$(F9XMODEXT) $(libdir)/. && chmod 644 $(libdir)/*.$(F9XMODEXT)) || exit 1); \
+	   fi;                                                                \
+	fi
 	@if test -f libhdf5.settings; then				      \
 	   (set -x; $(INSTALL_DATA) libhdf5.settings $(libdir)/. || exit 1);  \
 	fi
+	@if test "X$(HDF_FORTRAN)" = "Xyes" -a -f libhdf5_fortran.settings; then \
+	   (set -x; $(INSTALL_DATA) libhdf5_fortran.settings $(libdir)/. || exit 1);  \
+	fi
 	@for f in X $(PUB_HDR); do					      \
 	   if test $$f != X; then					      \
 	      if test -f $$f; then					      \
@@ -213,30 +230,38 @@ install-doc: $(PUB_DOCS) $(DOCDIR)
 ##
 uninstall:
 	@for f in libhdf5.settings $(LIB); do				      \
-            $(LT_UNINSTALL) $(libdir)/$$f;				      \
+          $(LT_UNINSTALL) $(libdir)/$$f;				      \
 	done
 	@if test -n "$(PUB_HDR)"; then                                        \
-	   set -x; cd $(includedir) && $(RM) $(PUB_HDR);		      \
+	  set -x; cd $(includedir) && $(RM) $(PUB_HDR);			      \
 	fi
-	@for f in X $(PUB_PROGS); do					      \
-	    if test $$f != X; then					      \
-	        $(LT_UNINSTALL) $(bindir)/$$f;				      \
-	    fi;								      \
+	@for f in dummy $(PUB_PROGS); do				      \
+	  if test $$f != dummy; then					      \
+	    $(LT_UNINSTALL) $(bindir)/$$f;				      \
+	  fi;								      \
 	done
+	@if test "X$(HDF_FORTRAN)" = "Xyes"; then			      \
+          $(LT_UNINSTALL) $(libdir)/libhdf5_fortran.settings;		      \
+	  if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then	      \
+	    if test -f "$(libdir)/hdf5.$(F9XMODEXT)" -o -f "$(libdir)/HDF5.$(F9XMODEXT)"; then \
+	      set -x; $(RM) $(libdir)/*.$(F9XMODEXT);			      \
+	    fi;								      \
+	  fi;								      \
+	fi
 
 ## Removes those things that `make install-doc' (would have) installed.
 ##
 uninstall-doc:
 	@for d in X $(SUBDIRS); do					      \
-	    if test $$d != X; then					      \
-	       (set -x; cd $$d && $(MAKE) $@) || exit 1;                      \
-	    fi;								      \
+	  if test $$d != X; then					      \
+	    (set -x; cd $$d && $(MAKE) $@) || exit 1;                         \
+	  fi;								      \
 	done
 	@if test -n "$(PUB_DOCS)"; then 				      \
-	   set -x; cd $(DOCDIR) && $(RM) $(PUB_DOCS);			      \
+	  set -x; cd $(DOCDIR) && $(RM) $(PUB_DOCS);			      \
 	fi
-	@if test -n "$(PUB_SUBDOCS)"; then						\
-		set -x; cd $(DOCDIR) && $(RM) $(PUB_SUBDOCS);			    \
+	@if test -n "$(PUB_SUBDOCS)"; then				      \
+	  set -x; cd $(DOCDIR) && $(RM) $(PUB_SUBDOCS);			      \
 	fi
 
 ## Removes temporary files without removing the final target files.  That is,
@@ -269,8 +294,11 @@ clean: mostlyclean
 	    fi;                                                               \
 	done
 	@if test -n "$(LIB)" -o -n "$(TEST_PROGS)" -o -n "$(TEST_PROGS_PARA)" -o -n "$(PROGS)" -o -n "$(CLEAN)"; then \
-	    $(RM) $(LIB) $(TEST_PROGS) $(TEST_PROGS_PARA) $(PROGS) $(CLEAN);                     \
-	fi;
+	    $(RM) $(LIB) $(TEST_PROGS) $(TEST_PROGS_PARA) $(PROGS) $(CLEAN);  \
+	fi
+	@if test "X$(HDF_FORTRAN)" = "Xyes"; then			      \
+	  $(RM) -f *.M *.a *.mod;					      \
+	fi
 	-$(RM) -r .libs
 
 ## Like `clean' except it also removes files that were created by running
@@ -280,10 +308,10 @@ clean: mostlyclean
 ##
 distclean: clean
 	-$(RM) .depend TAGS *~ core *.core *.bak *.old *.new $(DISTCLEAN)
-	@for d in X $(SUBDIRS); do                                            \
-	    if test $$d != X; then                                            \
-	        (set -x; cd $$d; $(MAKE) $@) || exit 1;                       \
-	    fi;                                                               \
+	@for d in X $(SUBDIRS); do					      \
+	  if test $$d != X; then					      \
+	    (set -x; cd $$d; $(MAKE) $@) || exit 1;			      \
+	  fi;								      \
 	done
 	@if test -f $(srcdir)/Makefile.in; then				      \
 	   (set -x; $(RM) Makefile);					      \
@@ -308,6 +336,18 @@ maintainer-clean: distclean
 .c.lo:
 	@$(LT_COMPILE) $(CFLAGS) $(CPPFLAGS) -c $<
 
+.f90.o:
+	$(F9X) $(FFLAGS) $(FSEARCH_DIRS) -c $<
+
+.f90.lo:
+	@$(LT_FCOMPILE) $(FFLAGS) $(FSEARCH_DIRS) -c $<
+
+.cpp.o:
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+
+.cpp.lo:
+	@$(LT_CXX_COMPILE) $(CXXFLAGS) $(CPPFLAGS) -c $<
+
 ##-----------------------------------------------------------------------------
 ## The following section of this makefile contains dependencies between the
 ## source files and the header files.
diff --git a/config/dec-flags b/config/dec-flags
index 7b2b182..33924ee 100644
--- a/config/dec-flags
+++ b/config/dec-flags
@@ -60,3 +60,38 @@ if test X = "X$cc_flags_set"; then
     cc_vendor=
     cc_version=
 fi
+
+# The default Fortran 90 compiler
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the Digital UNIX architechture)
+#
+R_LARGE=18
+R_INTEGER=9
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_LARGE)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+if test "X-" = "X-$F9X"; then
+  F9X=f90
+fi
+
+if test "X-" = "X-$f9x_flags_set"; then
+  F9XSUFFIXFLAG=""
+  FSEARCH_DIRS=""
+  FFLAGS="-Olimit 2048 -std1"
+  DEBUG_FFLAGS="-Olimit 2048 -std1"
+  PROD_FFLAGS="-Olimit 2048 -std1"
+  PROFILE_FFLAGS="-Olimit 2048 -std1"
+  f9x_flags_set=yes
+fi
+
+# The default C++ compiler
+
diff --git a/config/depend1.in b/config/depend1.in
index eaa7488..c34720a 100644
--- a/config/depend1.in
+++ b/config/depend1.in
@@ -21,31 +21,39 @@
 ## tilde to the file name.
 ##
 $(srcdir)/Dependencies: .depend
-	@if test "$(srcdir)" != "."; then                                     \
-      echo '## This file is machine generated on GNU systems.' >$@;       \
-      echo '## Only temporary changes may be made here.' >>$@;            \
-      echo >>$@;                                                          \
-      $(PERL) -p $(top_srcdir)/bin/distdep .depend >>$@;                  \
-    else                                                                  \
-      echo 'Dependencies cannot be built when $$srcdir == $$builddir';    \
-    fi
+	@if test "$(srcdir)" != "."; then					\
+	  echo '## This file is machine generated on GNU systems.' >$@;		\
+	  echo '## Only temporary changes may be made here.' >>$@;		\
+	  echo >>$@;								\
+	  $(PERL) -p $(top_srcdir)/bin/distdep .depend >>$@;			\
+	else									\
+	  echo 'Dependencies cannot be built when $$srcdir == $$builddir';	\
+	fi
 
 .depend: $(LIB_SRC) $(TEST_SRC) $(PROG_SRC)
 	@touch .depend
-	@for dep in $? dummy; do                                              \
-      if test $$dep != "dummy" -a -n "$(PERL)"; then                      \
-        case "$$dep" in                                                   \
-          *.c)                                                            \
-            echo Building dependencies for $$dep;                         \
-            obj=`basename $$dep .c`.lo;                                   \
-            sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@;       \
-            $(TRACE) $$dep;                                               \
-            $(CC) -MM -MG $(CPPFLAGS) $$dep 2>/dev/null >>$@;             \
-            $(PERL) -w $(top_srcdir)/bin/dependencies --srcdir=$(srcdir) --top_srcdir=$(top_srcdir) --top_builddir=$(top_builddir) $@; \
-            ;;                                                            \
-        esac;                                                             \
-      fi;                                                                 \
-    done
+	@for dep in $? dummy; do						\
+	  if test $$dep != "dummy" -a -n "$(PERL)"; then			\
+	    case "$$dep" in							\
+	      *.c)								\
+	        echo Building dependencies for $$dep;				\
+	        obj=`basename $$dep .c`.lo;					\
+	        sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@;		\
+	        $(TRACE) $$dep;							\
+	        $(CC) -MM -MG $(CPPFLAGS) $$dep 2>/dev/null >>$@;		\
+	        $(PERL) -w $(top_srcdir)/bin/dependencies --srcdir=$(srcdir) --top_srcdir=$(top_srcdir) --top_builddir=$(top_builddir) $@; \
+	        ;;								\
+	      *.cpp)								\
+	        echo Building dependencies for $$dep;				\
+	        obj=`basename $$dep .cpp`.lo;					\
+	        sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@;		\
+	        $(TRACE) $$dep;							\
+	        $(CXX) -MM -MG $(CPPFLAGS) $$dep 2>/dev/null >>$@;		\
+	        $(PERL) -w $(top_srcdir)/bin/dependencies --srcdir=$(srcdir) --top_srcdir=$(top_srcdir)/.. --top_builddir=$(top_builddir) $@; \
+	        ;;								\
+	    esac;								\
+	  fi;									\
+	done
 
 -include .depend
 
diff --git a/config/freebsd b/config/freebsd
index f35aa5b..b7598cc 100644
--- a/config/freebsd
+++ b/config/freebsd
@@ -7,8 +7,8 @@
 
 # The default compiler is `gcc'
 if test "X-" = "X-$CC"; then
-    CC=gcc
-    CC_BASENAME=gcc
+  CC=gcc
+  CC_BASENAME=gcc
 fi
 
 # Architecture-specific flags
@@ -27,8 +27,8 @@ NOFP=${NOFP:=-fomit-frame-pointer}
 # Special setup to use pthread support if enable-threadsafe is on.
 # Works with static executable only.
 if test "X-" != "X-$enable_threadsafe"; then
-    CFLAGS="$CFLAGS -pthread -D_THREAD_SAFE" 
-    LDFLAGS="$LDFLAGS -pthread"
-    LIBS="$LIBS -lcipher"
-    enable_static_exec=yes
+  CFLAGS="$CFLAGS -pthread -D_THREAD_SAFE" 
+  LDFLAGS="$LDFLAGS -pthread"
+  LIBS="$LIBS -lcipher"
+  enable_static_exec=yes
 fi
diff --git a/config/gnu-flags b/config/gnu-flags
index 7833aaf..afb451a 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -12,129 +12,129 @@
 #   cc_version:   Version number: 2.91.60, 2.7.2.1
 #
 if test X = "X$cc_flags_set"; then
-    cc_version="`$CC $CFLAGS -v 2>&1 |grep 'gcc version' |\
-	        sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"
-    cc_vendor=`echo $cc_version |sed 's/\([a-z]*\).*/\1/'`
-    cc_version=`echo $cc_version |sed 's/[-a-z]//g'`
-    if test X = "X$cc_vendor" -a X != "X$cc_version"; then
-	cc_vendor=gcc
-    fi
-    if test "-" != "$cc_vendor-$cc_version"; then
-	echo "compiler '$CC' is GNU $cc_vendor-$cc_version"
-    fi
-
-    # Some version numbers
-    cc_vers_major=`echo $cc_version | cut -f1 -d.`
-    cc_vers_minor=`echo $cc_version | cut -f2 -d.`
-    cc_vers_patch=`echo $cc_version | cut -f3 -d.`
-    test -n "$cc_vers_major" || cc_vers_major=0
-    test -n "$cc_vers_minor" || cc_vers_minor=0
-    test -n "$cc_vers_patch" || cc_vers_patch=0
-    cc_vers_all=`expr $cc_vers_major '*' 1000000 + $cc_vers_minor '*' 1000 + $cc_vers_patch`
+  cc_version="`$CC $CFLAGS -v 2>&1 |grep 'gcc version' |\
+          sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"
+  cc_vendor=`echo $cc_version |sed 's/\([a-z]*\).*/\1/'`
+  cc_version=`echo $cc_version |sed 's/[-a-z]//g'`
+  if test X = "X$cc_vendor" -a X != "X$cc_version"; then
+    cc_vendor=gcc
+  fi
+  if test "-" != "$cc_vendor-$cc_version"; then
+    echo "compiler '$CC' is GNU $cc_vendor-$cc_version"
+  fi
+
+  # Some version numbers
+  cc_vers_major=`echo $cc_version | cut -f1 -d.`
+  cc_vers_minor=`echo $cc_version | cut -f2 -d.`
+  cc_vers_patch=`echo $cc_version | cut -f3 -d.`
+  test -n "$cc_vers_major" || cc_vers_major=0
+  test -n "$cc_vers_minor" || cc_vers_minor=0
+  test -n "$cc_vers_patch" || cc_vers_patch=0
+  cc_vers_all=`expr $cc_vers_major '*' 1000000 + $cc_vers_minor '*' 1000 + $cc_vers_patch`
 fi
 
 # GCC compilers before gcc-2.8.1 have problems with `long long'.
 if test gcc = "$cc_vendor" -a "$cc_vers_all" -lt 2008001; then
-    cat <<EOF
-    **
-    ** This compiler may be unable to properly compile the long long
-    ** data type used extensively by hdf5, although specifying
-    ** --disable-hsizet for configure may work around those bugs.
-    ** There may be other code generation problems also, especially
-    ** when optimizations are enabled.  Please upgrade to at least GNU
-    ** gcc version 2.8.1 before reporting bugs to the HDF5 team.
-    **
+  cat <<EOF
+  **
+  ** This compiler may be unable to properly compile the long long
+  ** data type used extensively by hdf5, although specifying
+  ** --disable-hsizet for configure may work around those bugs.
+  ** There may be other code generation problems also, especially
+  ** when optimizations are enabled.  Please upgrade to at least GNU
+  ** gcc version 2.8.1 before reporting bugs to the HDF5 team.
+  **
 EOF
-    sleep 5
+  sleep 5
 
 # Current EGCS compilers have problems with `long long' and register
 # allocation when optimizations are turned on for x86 systems.
 elif test egcs = "$cc_vendor" -a "$cc_vers_all" -le 2091066; then
-    if test "$HSIZET" != "large"; then
-       cat <<EOF
-    **
-    ** This compiler may have problems allocating registers when
-    ** optimizations are enabled on some platforms. Specifying
-    ** --disable-hsizet usually avoids the bug.
-    **
+  if test "$HSIZET" != "large"; then
+    cat <<EOF
+  **
+  ** This compiler may have problems allocating registers when
+  ** optimizations are enabled on some platforms. Specifying
+  ** --disable-hsizet usually avoids the bug.
+  **
 EOF
-       sleep 5
-    fi
+    sleep 5
+  fi
 
 # All current versions of PGCC have problems also.
 elif test pgcc = "$cc_vendor" -a "$cc_vers_all" -le 2091066; then	    
-    cat <<EOF
-    **
-    ** This compiler may have problems allocating registers for long
-    ** long data types when optimizations are enabled. There may be
-    ** other code generation problems as well. We know of no version
-    ** of pgcc which is capable of compiling HDF5 in production mode.
-    ** Please use gcc-2.8 or egcs-1.1.1 before reporting bugs.
-    **
+  cat <<EOF
+  **
+  ** This compiler may have problems allocating registers for long
+  ** long data types when optimizations are enabled. There may be
+  ** other code generation problems as well. We know of no version
+  ** of pgcc which is capable of compiling HDF5 in production mode.
+  ** Please use gcc-2.8 or egcs-1.1.1 before reporting bugs.
+  **
 EOF
-    sleep 5
+  sleep 5
 
 fi
 
 # Architecture-specific flags
 case "$host_os-$host_cpu" in
-    # FreeBSD sets the information from "hostname -m" to the general machine
-    # architecture, not the specific CPU for the machine, so even our
-    # Pentium II Xeon server is set to "i386".  Once we know we are on a FreeBSD
-    # machine, use the "sysctl" command to get the CPU hardware model.
-    freebsd*)
-        host_cpu_model=`sysctl -n hw.model`
-        case "$host_cpu_model" in
-            # Hmm.. this might not catch Celerons, but it won't hurt them either...
-            *Pro*|*II*|*III*|*IV*|*Athlon*)
-                ARCH=${ARCH:="-march=i686"}
-            ;;
-        esac
-        ;;
-
-    *-i686)
-        ARCH=${ARCH:="-march=i686"}
-        ;;
+  # FreeBSD sets the information from "hostname -m" to the general machine
+  # architecture, not the specific CPU for the machine, so even our
+  # Pentium II Xeon server is set to "i386".  Once we know we are on a FreeBSD
+  # machine, use the "sysctl" command to get the CPU hardware model.
+  freebsd*)
+    host_cpu_model=`sysctl -n hw.model`
+    case "$host_cpu_model" in
+      # Hmm.. this might not catch Celerons, but it won't hurt them either...
+      *Pro*|*II*|*III*|*IV*|*Athlon*)
+         ARCH=${ARCH:="-march=i686"}
+         ;;
+    esac
+    ;;
+
+  *-i686)
+    ARCH=${ARCH:="-march=i686"}
+    ;;
 esac
 
 # Host-specific flags
 case "`hostname`" in
-    sleipnir.ncsa.uiuc.edu)
-#        case "$cc_vendor-$cc_version" in
-#            gcc-3*)
-#                ARCH="`echo $ARCH | sed -e 's/i686/athlon-mp/g'`"
-#            ;;
-#        esac
-        ARCH="$ARCH -pipe"
-        ;;
+  sleipnir.ncsa.uiuc.edu)
+#    case "$cc_vendor-$cc_version" in
+#      gcc-3*)
+#        ARCH="`echo $ARCH | sed -e 's/i686/athlon-mp/g'`"
+#        ;;
+#    esac
+    ARCH="$ARCH -pipe"
+    ;;
 esac
 
 # Common GCC flags for various situations
 case "$cc_vendor-$cc_version" in
-    gcc*|egcs*|pgcc*)
-	# General
-	CFLAGS="$CFLAGS $ARCH -ansi -pedantic -Wall -W -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline"
-
-	# Production
-        case "$cc_vendor-$cc_version" in
-            gcc-2.95.[34]|gcc-3*)
-                PROD_CFLAGS="-O3 $NOFP"
-                ;;
-            *)
-                PROD_CFLAGS="-O $NOFP -finline-functions"
-                ;;
-        esac
-	PROD_CPPFLAGS=
-
-	# Debug
-	DEBUG_CFLAGS="-g -fverbose-asm"
-	DEBUG_CPPFLAGS=
-
-	# Profile
-	PROFILE_CFLAGS=-pg
-	PROFILE_CPPFLAGS=
-
+  gcc*|egcs*|pgcc*)
+    # General
+    CFLAGS="$CFLAGS $ARCH -ansi -pedantic -Wall -W -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline"
+
+    # Production
+    case "$cc_vendor-$cc_version" in
+      gcc-2.95.[34]|gcc-3*)
+        PROD_CFLAGS="-O3 $NOFP"
+        ;;
+      *)
+        PROD_CFLAGS="-O $NOFP -finline-functions"
         ;;
+    esac
+
+    PROD_CPPFLAGS=
+
+    # Debug
+    DEBUG_CFLAGS="-g -fverbose-asm"
+    DEBUG_CPPFLAGS=
+
+    # Profile
+    PROFILE_CFLAGS=-pg
+    PROFILE_CPPFLAGS=
+    ;;
 esac
 
 # Version specific GCC flags
@@ -142,78 +142,82 @@ esac
 # Please follow the pattern below by adding new versions at the top, copying
 # the information from the previous version and adding modifications to that.
 case "$cc_vendor-$cc_version" in
-    gcc-3.3*)
-        # Replace -ansi flag with -std=c99 flag
-	CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-
-        # Append warning flags from gcc-2.95.* case
-	CFLAGS="$CFLAGS -Wno-long-long"
-
-        # Append warning flags from gcc-3* case
-	CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-
-        # Append warning flags from gcc-3.2* case
-	CFLAGS="$CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
-        # The "format=2" warning generates too many warnings about valid
-        # usage in the library.
-	#CFLAGS="$CFLAGS -Wformat=2"
-        # The "unreachable code" warning does not appear to be reliable yet...
-	#CFLAGS="$CFLAGS -Wunreachable-code"
-
-        # Append more extra warning flags that only gcc3.3+ know about
-	CFLAGS="$CFLAGS -Wendif-labels"
-
-	# Flags are set
-	cc_flags_set=yes
-	;;
-
-    gcc-3.2*)
-        # Replace -ansi flag with -std=c99 flag
-	CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-
-        # Append warning flags from gcc-2.95.* case
-	CFLAGS="$CFLAGS -Wno-long-long"
-
-        # Append warning flags from gcc-3* case
-	CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-
-        # Append more extra warning flags that only gcc3.2+ know about
-	CFLAGS="$CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
-        # The "format=2" warning generates too many warnings about valid
-        # usage in the library.
-	#CFLAGS="$CFLAGS -Wformat=2"
-        # The "unreachable code" warning does not appear to be reliable yet...
-	#CFLAGS="$CFLAGS -Wunreachable-code"
-
-	# Flags are set
-	cc_flags_set=yes
-	;;
-
-    gcc-3*)
-        # Replace -ansi flag with -std=c99 flag
-	CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-
-        # Append warning flags from gcc-2.95.* case
-	CFLAGS="$CFLAGS -Wno-long-long"
-
-        # Append some extra warning flags that only gcc3+ know about
-	CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-
-	# Flags are set
-	cc_flags_set=yes
-	;;
-
-    gcc-2.95*)
-        # Append some extra warning flags that only gcc2.95+ know about
-	CFLAGS="$CFLAGS -Wno-long-long"
-
-	# Flags are set
-	cc_flags_set=yes
-	;;
+  gcc-3.3*)
+    # Replace -ansi flag with -std=c99 flag
+    CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
+
+    # Append warning flags from gcc-2.95.* case
+    CFLAGS="$CFLAGS -Wno-long-long"
+
+    # Append warning flags from gcc-3* case
+    CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
+
+    # Append warning flags from gcc-3.2* case
+    CFLAGS="$CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
+
+    # The "format=2" warning generates too many warnings about valid
+    # usage in the library.
+    #CFLAGS="$CFLAGS -Wformat=2"
+
+    # The "unreachable code" warning does not appear to be reliable yet...
+    #CFLAGS="$CFLAGS -Wunreachable-code"
+
+    # Append more extra warning flags that only gcc3.3+ know about
+    CFLAGS="$CFLAGS -Wendif-labels"
+
+    # Flags are set
+    cc_flags_set=yes
+    ;;
+
+  gcc-3.2*)
+    # Replace -ansi flag with -std=c99 flag
+    CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
+
+    # Append warning flags from gcc-2.95.* case
+    CFLAGS="$CFLAGS -Wno-long-long"
+
+    # Append warning flags from gcc-3* case
+    CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
+
+    # Append more extra warning flags that only gcc3.2+ know about
+    CFLAGS="$CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization"
+
+    # The "format=2" warning generates too many warnings about valid
+    # usage in the library.
+    #CFLAGS="$CFLAGS -Wformat=2"
+
+    # The "unreachable code" warning does not appear to be reliable yet...
+    #CFLAGS="$CFLAGS -Wunreachable-code"
+
+    # Flags are set
+    cc_flags_set=yes
+    ;;
+
+  gcc-3*)
+    # Replace -ansi flag with -std=c99 flag
+    CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
+
+    # Append warning flags from gcc-2.95.* case
+    CFLAGS="$CFLAGS -Wno-long-long"
+
+    # Append some extra warning flags that only gcc3+ know about
+    CFLAGS="$CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
+
+    # Flags are set
+    cc_flags_set=yes
+    ;;
+
+  gcc-2.95*)
+    # Append some extra warning flags that only gcc2.95+ know about
+    CFLAGS="$CFLAGS -Wno-long-long"
+
+    # Flags are set
+    cc_flags_set=yes
+    ;;
 esac
 
 # Clear cc info if no flags set
-if test X = "X$cc_flags_set"; then
-    cc_vendor=
-    cc_version=
+if test "X$cc_flags_set" = "X"; then
+  cc_vendor=
+  cc_version=
 fi
diff --git a/config/hpux10.20 b/config/hpux10.20
index 0b39f3c..a8f22b5 100644
--- a/config/hpux10.20
+++ b/config/hpux10.20
@@ -8,29 +8,61 @@
 
 # Default compiler is `cc'
 if test "X-" =  "X-$CC"; then
-    CC=cc
-    CC_BASENAME=cc
+  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=
-	;;
+  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"
-	DEBUG_CFLAGS=-g
-	DEBUG_CPPFLAGS="-Ae"
-	PROD_CFLAGS=-O
-	PROD_CPPFLAGS="-Ae"
-	PROFILE_CFLAGS=
-	PROFILE_CPPFLAGS="-Ae"
-	;;
+  *)
+    CFLAGS="$CFLAGS -Ae"
+    DEBUG_CFLAGS=-g
+    DEBUG_CPPFLAGS="-Ae"
+    PROD_CFLAGS=-O
+    PROD_CPPFLAGS="-Ae"
+    PROFILE_CFLAGS=
+    PROFILE_CPPFLAGS="-Ae"
+    ;;
 esac
+
+# The default Fortran 90 compiler
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the HPUX architechture)
+#
+R_LARGE=18
+R_INTEGER=9
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+if test "X-" = "X-$F9X"; then
+  F9X=f90
+fi
+
+if test "X-" = "X-$f9x_flags_set"; then
+  F9XSUFFIXFLAG=""
+  FSEARCH_DIRS=""
+  FFLAGS="-O"
+  DEBUG_FFLAGS="-O"
+  PROD_FFLAGS="-O"
+  PROFILE_FFLAGS="-O"
+  f9x_flags_set=yes
+fi
diff --git a/config/hpux11.00 b/config/hpux11.00
index 0b39f3c..c8d69b3 100644
--- a/config/hpux11.00
+++ b/config/hpux11.00
@@ -8,29 +8,80 @@
 
 # Default compiler is `cc'
 if test "X-" =  "X-$CC"; then
-    CC=cc
-    CC_BASENAME=cc
+  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"
-	DEBUG_CFLAGS=-g
-	DEBUG_CPPFLAGS="-Ae"
-	PROD_CFLAGS=-O
-	PROD_CPPFLAGS="-Ae"
-	PROFILE_CFLAGS=
-	PROFILE_CPPFLAGS="-Ae"
-	;;
+  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"
+    DEBUG_CFLAGS=-g
+    DEBUG_CPPFLAGS="-Ae"
+    PROD_CFLAGS=-O
+    PROD_CPPFLAGS="-Ae"
+    PROFILE_CFLAGS=
+    PROFILE_CPPFLAGS="-Ae"
+    ;;
 esac
+
+# The default Fortran 90 compiler
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the HPUX architechture)
+#
+R_LARGE=18
+R_INTEGER=9
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+if test "X$F9X" = "X"; then
+  F9X=f90
+fi
+
+if test "X$f9x_flags_set" = "X"; then
+  F9XSUFFIXFLAG=""
+  FSEARCH_DIRS=""
+  FFLAGS="-O"
+  DEBUG_FFLAGS="-O"
+  PROD_FFLAGS="-O"
+  PROFILE_FFLAGS="-O"
+  f9x_flags_set=yes
+fi
+
+# The default C++ compiler
+
+if test -z "$CXX"; then
+  CXX=aCC
+  CXX_BASENAME=aCC
+fi
+
+if test -z "$cxx_flags_set"; then
+  # +Z for PIC, +A for using archived libraries
+  CXXFLAGS="+Z +A"
+  CFLAGS="-g +O2"
+  DEBUG_CXXFLAGS=-g
+  DEBUG_CPPFLAGS=
+  PROD_CXXFLAGS="-O -s"
+  PROD_CPPFLAGS=
+  PROFILE_CPPFLAGS=
+  cxx_flags_set=yes
+fi
diff --git a/config/hpux9.03 b/config/hpux9.03
index abed0b3..6603aab 100644
--- a/config/hpux9.03
+++ b/config/hpux9.03
@@ -7,30 +7,30 @@
 # See BlankForm in this directory for details
 
 # Default compiler is `cc'
-if test "X-" =  "X-$CC"; then
-    CC=cc
-    CC_BASENAME=cc
+if test "X$CC" = "X"; 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=
-	;;
+  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"
-	DEBUG_CFLAGS=-g
-	DEBUG_CPPFLAGS=
-	PROD_CFLAGS=
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS=
-	PROFILE_CPPFLAGS=
-	;;
+  *)
+    CFLAGS="$CFLAGS -Ae"
+    DEBUG_CFLAGS=-g
+    DEBUG_CPPFLAGS=
+    PROD_CFLAGS=
+    PROD_CPPFLAGS=
+    PROFILE_CFLAGS=
+    PROFILE_CPPFLAGS=
+    ;;
 esac
diff --git a/config/i386-pc-cygwin32 b/config/i386-pc-cygwin32
index 4054819..fc2e810 100644
--- a/config/i386-pc-cygwin32
+++ b/config/i386-pc-cygwin32
@@ -8,9 +8,9 @@
 
 # The default compiler is `gcc'.
 if test "X-" =  "X-$CC"; then
-    CC=gcc
-    CC_BASENAME=gcc
-    LD=ld
+  CC=gcc
+  CC_BASENAME=gcc
+  LD=ld
 fi
 
 # Omit frame pointer for optimized code?
diff --git a/config/ia64-linux-gnu b/config/ia64-linux-gnu
index 9c97476..54e616c 100644
--- a/config/ia64-linux-gnu
+++ b/config/ia64-linux-gnu
@@ -5,9 +5,9 @@
 # the various compile modes.
 
 # Use Intel C compiler by default.
-if test "X-" =  "X-$CC"; then
-    CC=ecc
-    CC_BASENAME=ecc
+if test "X$CC" = "X"; then
+  CC=ecc
+  CC_BASENAME=ecc
 fi
 
 #----------------------------------------------------------------------------
@@ -16,29 +16,79 @@ fi
 # `--enable-debug' switch of configure.
 
 case $CC_BASENAME in
-    ecc)
-	# CFLAGS must be set else configure set it to -g
-	CFLAGS="$CFLAGS"
-	DEBUG_CFLAGS="-g"
-	DEBUG_CPPFLAGS=
-	# ecc has -O2 as default
-	PROD_CFLAGS=""
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS=""	# ecc has no profile option
-	PROFILE_CPPFLAGS=
-	;;
-
-    gcc)
-	. $srcdir/config/gnu-flags
-	;;
-
-    *)
-	CFLAGS="$CFLAGS -ansi"
-	DEBUG_CFLAGS="-g"
-	DEBUG_CPPFLAGS=
-	PROD_CFLAGS="-O"
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS="-pg"
-	PROFILE_CPPFLAGS=
-	;;
+  ecc)
+    # CFLAGS must be set else configure set it to -g
+    CFLAGS="$CFLAGS"
+
+    DEBUG_CFLAGS="-g"
+    DEBUG_CPPFLAGS=
+
+    # ecc has -O2 as default
+    PROD_CFLAGS=""
+    PROD_CPPFLAGS=
+    PROFILE_CFLAGS=""	# ecc has no profile option
+    PROFILE_CPPFLAGS=
+    ;;
+
+  gcc)
+    . $srcdir/config/gnu-flags
+    ;;
+
+  *)
+    CFLAGS="$CFLAGS -ansi"
+    DEBUG_CFLAGS="-g"
+    DEBUG_CPPFLAGS=
+    PROD_CFLAGS="-O"
+    PROD_CPPFLAGS=
+    PROFILE_CFLAGS="-pg"
+    PROFILE_CPPFLAGS=
+    ;;
+esac
+
+# The default Fortran 90 compiler
+
+#
+# HDF5 integers
+#
+#       R_LARGE is the number of digits for the bigest integer supported.
+#       R_INTEGER is the number of digits in INTEGER
+#
+# (for the Linux architechture)
+#
+
+R_LARGE=18
+R_INTEGER=9
+
+case $F9X in
+  *efc)
+    # this is for efc v7.  Older efc do not work with these.
+    # -Vaxlib is for non-standard fortran calls like exit().
+    FFLAGS='-fpp -DDEC$=DEC_ -DMS$=MS_ -Vaxlib'
+    HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+    HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+    HID_T='SELECTED_INT_KIND(R_INTEGER)'
+    SIZE_T='SELECTED_INT_KIND(R_LARGE)'
+    OBJECT_NAMELEN_DEFAULT_F=-1
+    f9x_flags_set=yes
+    ;;
+
+  *)
+    HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+    HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+    HID_T='SELECTED_INT_KIND(R_INTEGER)'
+    SIZE_T='SELECTED_INT_KIND(R_LARGE)'
+    OBJECT_NAMELEN_DEFAULT_F=-1
+    f9x_flags_set=yes
+    ;;
 esac
+
+# The following is not right and need work.
+if test "X$f9x_flags_set" = "X"; then
+  F9XSUFFIXFLAG=""
+  FSEARCH_DIRS=""
+  FFLAGS=""
+  DEBUG_FFLAGS=""
+  PROD_FFLAGS=""
+  PROFILE_FFLAGS=""
+  f9x_flags_set=yes
+fi
diff --git a/config/intel-osf1 b/config/intel-osf1
index ea65b6f..196b311 100644
--- a/config/intel-osf1
+++ b/config/intel-osf1
@@ -9,9 +9,9 @@
 # This is for the ASCI RED TFLOPS machine
 
 # The default compiler is `cicc'
-if test "X-" =  "X-$CC"; then
-    CC=cicc
-    CC_BASENAME=cicc
+if test "X-" = "X-$CC"; then
+  CC=cicc
+  CC_BASENAME=cicc
 fi
 
 # The default archiver is `xar'
diff --git a/config/irix5.x b/config/irix5.x
index bd757e1..3624e7f 100644
--- a/config/irix5.x
+++ b/config/irix5.x
@@ -7,44 +7,44 @@
 # See BlankForm in this directory for details
 
 # The default compiler is `cc' and there is no ranlib.
-if test "X-" =  "X-$CC"; then
-    CC=cc
-    CC_BASENAME=cc
+if test "X-" = "X-$CC"; then
+  CC=cc
+  CC_BASENAME=cc
 fi
 RANLIB=:
 
 case "X-$CC_BASENAME" in
-    X-gcc)
-	CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
-	DEBUG_CFLAGS="-g -fverbose-asm"
-	DEBUG_CPPFLAGS=
-	PROD_CFLAGS="-O3"
+  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=
-	;;
+    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"
+  *)
+    # 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:
-        CFLAGS="$CFLAGS -woff 799"
+    # Always turn off these compiler warnings:
+    CFLAGS="$CFLAGS -woff 799"
 
-	# Extra debugging flags
-	DEBUG_CFLAGS=-g
-	DEBUG_CPPFLAGS=
+    # 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 production flags
+    # Note: higher optimizations relax alignment requirements needed.
+    PROD_CFLAGS="-O -s"
+    PROD_CPPFLAGS=
 
-	# Extra profiling flags
-	PROFILE_CFLAGS=-pg
-	PROFILE_CPPFLAGS=
-	;;
+    # Extra profiling flags
+    PROFILE_CFLAGS=-pg
+    PROFILE_CPPFLAGS=
+    ;;
 esac
diff --git a/config/irix6.x b/config/irix6.x
index a79613a..a8a6b6f 100644
--- a/config/irix6.x
+++ b/config/irix6.x
@@ -7,77 +7,136 @@
 # See BlankForm in this directory for details.
 
 # Use SGI supplied C compiler by default.  There is no ranlib
-if test "X-" =  "X-$CC"; then
-    CC='cc'
-    CC_BASENAME=cc
+if test "X-" = "X-$CC"; then
+  CC='cc'
+  CC_BASENAME=cc
 fi
 RANLIB=:
 
 # Compiler flags
 case "X-$CC_BASENAME" in
-    X-gcc)
-	. $srcdir/config/gnu-flags
-	;;
-
-    *)
-	if [ "$CC_BASENAME" = cc ] || 
-	    ($CC -version 2>&1 | grep -s "MIPSpro Compilers") 2>&1 > /dev/null
-	then
-	    # use these flags if this is the SGI cc compiler or some compiler
-	    # command that eventually uses the SGI cc compiler.
-
-	    # Check for old versions of the compiler that don't work right.
-	    case "`$CC -version 2>&1 |head -1`" in
-		"Mongoose Compilers: Version 7.00")
-		    echo "  +---------------------------------------------------+"
-		    echo "  | You have an old version of cc (Mongoose Compilers |"
-		    echo "  | version 7.00).  Please upgrade to MIPSpro version |"
-		    echo "  | 7.2.1.2m (patches are available from the SGI web  |"
-		    echo "  | site).  The 7.00 version may generate incorrect   |"
-		    echo "  | code, especially when optimizations are enabled.  |"
-		    echo "  +---------------------------------------------------+"
-		    sleep 5
-		    ;;
-	    esac
-
-	    # Always turn off these compiler warnings for the -64 compiler:
-	    #    1174:  function declared but not used
-	    #    1196:  __vfork() (this is an SGI config problem)
-	    #    1209:  constant expressions
-	    #    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"
-	    CFLAGS="$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"
-
-	    # Always turn off these loader warnings:
-	    # (notice the peculiar syntax)
-	    #      47:  branch instructions that degrade performance on R4000
-	    #      84:  a library is not used
-	    #      85:  duplicate definition preemption (from -lnsl)
-	    #     134:  duplicate weak definition preemption (from -lnsl)
-	    CFLAGS="$CFLAGS -Wl,-woff,47,-woff,84,-woff,85,-woff,134"
-
-            # Always turn on full warnings
-	    CFLAGS="$CFLAGS -fullwarn"
-	fi
-
-	# Extra debugging flags
-	DEBUG_CFLAGS="-g"
-	DEBUG_CPPFLAGS=
-
-	# Extra production flags
-	PROD_CFLAGS="-O -s"
-	PROD_CPPFLAGS=
-
-	# Extra profiling flags
-	PROFILE_CFLAGS=-pg
-	PROFILE_CPPFLAGS=
-	;;
+  X-gcc)
+    . $srcdir/config/gnu-flags
+    ;;
+
+  *)
+    if [ "$CC_BASENAME" = "cc" ] || ($CC -version 2>&1 | grep -s "MIPSpro Compilers") 2>&1 > /dev/null; then
+      # use these flags if this is the SGI cc compiler or some compiler
+      # command that eventually uses the SGI cc compiler.
+
+      # Check for old versions of the compiler that don't work right.
+      case "`$CC -version 2>&1 |head -1`" in
+        "Mongoose Compilers: Version 7.00")
+          echo "  +---------------------------------------------------+"
+          echo "  | You have an old version of cc (Mongoose Compilers |"
+          echo "  | version 7.00).  Please upgrade to MIPSpro version |"
+          echo "  | 7.2.1.2m (patches are available from the SGI web  |"
+          echo "  | site).  The 7.00 version may generate incorrect   |"
+          echo "  | code, especially when optimizations are enabled.  |"
+          echo "  +---------------------------------------------------+"
+          sleep 5
+          ;;
+      esac
+
+      # Always turn off these compiler warnings for the -64 compiler:
+      #    1174:  function declared but not used
+      #    1196:  __vfork() (this is an SGI config problem)
+      #    1209:  constant expressions
+      #    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"
+      CFLAGS="$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"
+
+      # Always turn off these loader warnings:
+      # (notice the peculiar syntax)
+      #      47:  branch instructions that degrade performance on R4000
+      #      84:  a library is not used
+      #      85:  duplicate definition preemption (from -lnsl)
+      #     134:  duplicate weak definition preemption (from -lnsl)
+      CFLAGS="$CFLAGS -Wl,-woff,47,-woff,84,-woff,85,-woff,134"
+
+      # Always turn on full warnings
+      CFLAGS="$CFLAGS -fullwarn"
+    fi
+
+    # Extra debugging flags
+    DEBUG_CFLAGS="-g"
+    DEBUG_CPPFLAGS=
+
+    # Extra production flags
+    PROD_CFLAGS="-O -s"
+    PROD_CPPFLAGS=
+
+    # Extra profiling flags
+    PROFILE_CFLAGS=-pg
+    PROFILE_CPPFLAGS=
+    ;;
 esac
+
+# The default Fortran 90 compiler
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the IRIX architechture)
+#
+R_LARGE=18
+R_INTEGER=9
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_LARGE)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+if test "X-" = "X-$F9X"; then
+  F9X="f90"
+fi
+
+if test "X-" = "X-$f9x_flags_set"; then
+  F9XSUFFIXFLAG=""
+  FSEARCH_DIRS=""
+  FFLAGS="-64 -mips4 -O -s"
+  DEBUG_FFLAGS="-64 -mips4 -O -s"
+  PROD_FFLAGS="-64 -mips4 -O -s"
+  PROFILE_FFLAGS="-64 -mips4 -O -s"
+  f9x_flags_set=yes
+fi
+
+# The default C++ compiler
+
+# The default compiler is `MIPSpro CC'
+if test -z "$CXX"; then
+  CXX=CC
+  CXX_BASENAME=CC
+fi
+
+# Try native compiler flags
+if test -z "$cxx_flags_set"; then
+  # -LANG:std required for std use; -ptused causes templates used to be
+  # instantiated
+  CPPFLAGS="-LANG:std -ptused"
+
+  # libCio is a default library, since libtool before 1.5 doesn't fully 
+  # support C++ yet, default libraries must be explicitly specified.
+  # A new macro is used for this temporary and specific task so it 
+  # won't polute the existing configuration 
+  DEFAULT_LIBS="-lCio"
+
+  DEBUG_CXXFLAGS=-g
+  DEBUG_CPPFLAGS=
+  PROD_CXXFLAGS="-O -s"
+  PROD_CPPFLAGS=
+  PROFILE_CXXFLAGS=-xpg
+  PROFILE_CPPFLAGS=
+  cxx_flags_set=yes
+fi
diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1
index 3659eb3..d57866f 100644
--- a/config/linux-gnulibc1
+++ b/config/linux-gnulibc1
@@ -17,3 +17,43 @@ NOFP=${NOFP:=-fomit-frame-pointer}
 
 # Figure out compiler flags
 . $srcdir/config/gnu-flags
+
+# The default Fortran 90 compiler
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the Linux architechture)
+#
+R_LARGE=18
+R_INTEGER=9
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+if test -z "$F9X"; then
+  F9X=pgf90
+fi
+
+if test -z "$f9x_flags_set"; then
+  F9XSUFFIXFLAG=""
+  FSEARCH_DIRS=""
+  FFLAGS=""
+  DEBUG_FFLAGS=""
+  PROD_FFLAGS=""
+  PROFILE_FFLAGS=""
+  f9x_flags_set=yes
+fi
+
+# The default C++ compiler
+
+# The default compiler is `g++'.
+if test -z "$CXX"; then
+  CXX=g++
+  CXX_BASENAME=g++
+fi
diff --git a/config/powerpc-ibm-aix4.x b/config/powerpc-ibm-aix4.x
index 8b8ae02..482f7c3 100644
--- a/config/powerpc-ibm-aix4.x
+++ b/config/powerpc-ibm-aix4.x
@@ -82,3 +82,40 @@ 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
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the AIX architechture)
+#
+R_LARGE=18
+R_INTEGER=9
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+if test "X-" = "X-$F9X"; then
+  F9X=xlf
+fi
+
+if test "X-" = "X-$f9x_flags_set"; then
+  F9XSUFFIXFLAG="-qsuffix=f=f90"
+  FFLAGS="-static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
+  FSEARCH_DIRS="-I./ -I../src"
+  DEBUG_FFLAGS="-O"
+  PROD_FFLAGS="-O"
+  PROFILE_FFLAGS="-O"
+  f9x_flags_set=yes
+fi
+
+# The default C++ compiler
+
+# Use AIX supplied C++ compiler by default.
+CXX=${CXX=xlC}
diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x
index 41e2c6a..a58bccd 100644
--- a/config/powerpc-ibm-aix5.x
+++ b/config/powerpc-ibm-aix5.x
@@ -18,7 +18,7 @@ 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-mpcc_r; then
-    RUNPARALLEL=${RUNPARALLEL="MP_PROCS=\$\${NPROCS:=3} MP_TASKS_PER_NODE=\$\${NPROCS:=3} poe"}
+  RUNPARALLEL=${RUNPARALLEL="MP_PROCS=\$\${NPROCS:=3} MP_TASKS_PER_NODE=\$\${NPROCS:=3} poe"}
 fi
 
 
@@ -28,33 +28,33 @@ fi
 # `--enable-debug' switch of configure.
 
 case $CC_BASENAME in
-    xlc|mpcc_r)
-	# Turn off shared lib option.  It causes some test suite to fail.
-	enable_shared="${enable_shared:-no}"
-	# CFLAGS must be set else configure set it to -g
-	CFLAGS="$CFLAGS"
-	DEBUG_CFLAGS="-g"
-	DEBUG_CPPFLAGS=
-	# -O causes test/dtypes to fail badly. Turn it off for now.
-	PROD_CFLAGS=""
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS="-pg"
-	PROFILE_CPPFLAGS=
-	;;
-
-    gcc)
-	. $srcdir/config/gnu-flags
-	;;
-
-    *)
-	CFLAGS="$CFLAGS -ansi"
-	DEBUG_CFLAGS="-g"
-	DEBUG_CPPFLAGS=
-	PROD_CFLAGS="-O"
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS="-pg"
-	PROFILE_CPPFLAGS=
-	;;
+  xlc|mpcc_r)
+    # Turn off shared lib option.  It causes some test suite to fail.
+    enable_shared="${enable_shared:-no}"
+    # CFLAGS must be set else configure set it to -g
+    CFLAGS="$CFLAGS"
+    DEBUG_CFLAGS="-g"
+    DEBUG_CPPFLAGS=
+    # -O causes test/dtypes to fail badly. Turn it off for now.
+    PROD_CFLAGS=""
+    PROD_CPPFLAGS=
+    PROFILE_CFLAGS="-pg"
+    PROFILE_CPPFLAGS=
+    ;;
+
+  gcc)
+    . $srcdir/config/gnu-flags
+    ;;
+
+  *)
+    CFLAGS="$CFLAGS -ansi"
+    DEBUG_CFLAGS="-g"
+    DEBUG_CPPFLAGS=
+    PROD_CFLAGS="-O"
+    PROD_CPPFLAGS=
+    PROFILE_CFLAGS="-pg"
+    PROFILE_CPPFLAGS=
+    ;;
 esac
 
 #----------------------------------------------------------------------------
@@ -109,3 +109,44 @@ 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
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the AIX architechture)
+#
+R_LARGE=18
+R_INTEGER=9
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+if test "X-" = "X-$F9X"; then
+  if test "X-$enable_parallel" = "X-yes"; then
+    F9X=mpxlf_r
+  else
+    F9X=xlf
+  fi
+fi
+
+if test "X-" = "X-$f9x_flags_set"; then
+  F9XSUFFIXFLAG="-qsuffix=f=f90"
+  FFLAGS="-static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
+  FSEARCH_DIRS="-I./ -I../src"
+  DEBUG_FFLAGS="-O"
+  PROD_FFLAGS="-O"
+  PROFILE_FFLAGS="-O"
+  f9x_flags_set=yes
+fi
+
+# The default C++ compiler
+
+# Use AIX supplied C++ compiler by default.
+CXX=${CXX=xlC}
diff --git a/config/rs6000-ibm-aix4.x b/config/rs6000-ibm-aix4.x
index 770ba80..c7a2223 100644
--- a/config/rs6000-ibm-aix4.x
+++ b/config/rs6000-ibm-aix4.x
@@ -9,3 +9,35 @@
 # 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
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the AIX architechture)
+#
+R_LARGE=18
+R_INTEGER=9
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+if test "X-" = "X-$F9X"; then
+  F9X=xlf
+fi
+
+if test "X-" = "X-$f9x_flags_set"; then
+  F9XSUFFIXFLAG="-qsuffix=f=f90"
+  FFLAGS="-static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
+  FSEARCH_DIRS="-I./ -I../src"
+  DEBUG_FFLAGS="-O"
+  PROD_FFLAGS="-O"
+  PROFILE_FFLAGS="-O"
+  f9x_flags_set=yes
+fi
diff --git a/config/solaris2.x b/config/solaris2.x
index d6434f5..31b12ee 100644
--- a/config/solaris2.x
+++ b/config/solaris2.x
@@ -8,8 +8,8 @@
 
 # The default compiler is `sunpro cc'
 if test "X-" =  "X-$CC"; then
-    CC=cc
-    CC_BASENAME=cc
+  CC=cc
+  CC_BASENAME=cc
 fi
 
 # Try gcc compiler flags
@@ -17,19 +17,90 @@ fi
 
 # Try solaris native compiler flags
 if test "X-" = "X-$cc_flags_set"; then
-    CFLAGS="-erroff=%none -DBSD_COMP"
-    DEBUG_CFLAGS="-g -xildoff"
-    DEBUG_CPPFLAGS=
-    PROD_CFLAGS="-O -s"
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS=-xpg
-    PROFILE_CPPFLAGS=
-    cc_flags_set=yes
-    # Turn off optimization flag for SUNpro compiler versions 4.x which
-    # have an optimization bug.  Version 5.0 works.
-    ($CC -V 2>&1) | grep -s 'cc: .* C 4\.' >/dev/null 2>&1 \
-	&& PROD_CFLAGS="`echo $PROD_CFLAGS | sed -e 's/-O//'`"
+  CFLAGS="-erroff=%none -DBSD_COMP"
+  DEBUG_CFLAGS="-g -xildoff"
+  DEBUG_CPPFLAGS=
+  PROD_CFLAGS="-O -s"
+  PROD_CPPFLAGS=
+  PROFILE_CFLAGS=-xpg
+  PROFILE_CPPFLAGS=
+  cc_flags_set=yes
+
+  # Turn off optimization flag for SUNpro compiler versions 4.x which
+  # have an optimization bug.  Version 5.0 works.
+  ($CC -V 2>&1) | grep -s 'cc: .* C 4\.' >/dev/null 2>&1 \
+       && PROD_CFLAGS="`echo $PROD_CFLAGS | sed -e 's/-O//'`"
 fi
 
 # Add socket lib for the Stream Virtual File Driver
 LIBS="$LIBS -lsocket"
+
+# The default Fortran 90 compiler
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the Sparc Solaris architechture)
+#
+R_LARGE=18
+R_INTEGER=9
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+if test "X-" = "X-$F9X"; then
+  F9X=f90
+fi
+
+if test "X-" = "X-$f9x_flags_set"; then
+  F9XSUFFIXFLAG=""
+  FSEARCH_DIRS=""
+  FFLAGS=""
+  DEBUG_FFLAGS=""
+  PROD_FFLAGS=""
+  PROFILE_FFLAGS=""
+  f9x_flags_set=yes
+fi
+
+# The default C++ compiler
+
+# The default compiler is `sunpro cc'
+if test -z "$CXX"; then
+  CXX=CC
+  CXX_BASENAME=CC
+fi
+
+# Try gcc compiler flags
+#. $srcdir/config/gnu-flags
+
+cxx_version="`$CXX -V 2>&1 |grep 'WorkShop' |\
+                sed 's/.*WorkShop.*C\+\+ \([0-9\.]*\).*/\1/'`"
+
+cxx_vers_major=`echo $cxx_version | cut -f1 -d.`
+cxx_vers_minor=`echo $cxx_version | cut -f2 -d.`
+cxx_vers_patch=`echo $cxx_version | cut -f3 -d.`
+
+# Specify the "-features=tmplife" if the compiler can handle this...
+if test -n "$cxx_version"; then
+  if test $cxx_vers_major -ge 5 -a $cxx_vers_minor -ge 3 -o $cxx_vers_major -gt 5; then
+    CXXFLAGS="-features=tmplife"
+  fi
+fi
+
+# Try solaris native compiler flags
+if test -z "$cxx_flags_set"; then
+  CXXFLAGS="$CXXFLAGS -instances=global"
+  CPPFLAGS="-LANG:std"
+  DEBUG_CXXFLAGS=-g
+  DEBUG_CPPFLAGS=
+  PROD_CXXFLAGS="-O -s"
+  PROD_CPPFLAGS=
+  PROFILE_CXXFLAGS=-xpg
+  PROFILE_CPPFLAGS=
+  cxx_flags_set=yes
+fi
diff --git a/config/sv1-cray b/config/sv1-cray
index e7b7724..b026b60 100644
--- a/config/sv1-cray
+++ b/config/sv1-cray
@@ -28,8 +28,8 @@
 #       used within this file.
 
 if test "X-" =  "X-$CC"; then
-    CC=cc
-    CC_BASENAME=cc
+  CC=cc
+  CC_BASENAME=cc
 fi
 # no need to use RANLIB
 RANLIB=:
@@ -88,37 +88,36 @@ RANLIB=:
 # 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 -h vector0 -h task1"
-	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
+  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 -h vector0 -h task1"
+    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
@@ -136,3 +135,65 @@ esac
 # 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
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the UNICOS architechture)
+#
+R_LARGE=18
+R_INTEGER=18
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_LARGE)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+if test "X-" = "X-$F9X"; then
+  F9X=f90
+fi
+
+if test "X-" = "X-$f9x_flags_set"; then
+  F9XSUFFIXFLAG=""
+  FSEARCH_DIRS=""
+  FFLAGS="-dp"
+  DEBUG_FFLAGS="-dp"
+  PROD_FFLAGS="-dp"
+  PROFILE_FFLAGS="-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/unicos b/config/unicos
index 43c1bd9..d30e4f5 100644
--- a/config/unicos
+++ b/config/unicos
@@ -28,13 +28,12 @@
 #       used within this file.
 
 if test "X-" =  "X-$CC"; then
-    CC=cc
-    CC_BASENAME=cc
+  CC=cc
+  CC_BASENAME=cc
 fi
 # no need to use RANLIB
 RANLIB=:
 
-
 # C Compiler and Preprocessor Flags
 # ---------------------------------
 #
@@ -88,38 +87,36 @@ RANLIB=:
 # above).
 
 case $CC_BASENAME in
-    gcc)
-	CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
-	DEBUG_CFLAGS="-g -fverbose-asm"
-	DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
-	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="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
-    PROD_CFLAGS="-O2 -h scalar0"
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS="-pg"
-	PROFILE_CPPFLAGS=
-	;;
-
-    *)
-	CFLAGS="$CFLAGS -ansi"
-	DEBUG_CFLAGS="-g"
-	DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
-	PROD_CFLAGS="-O"
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS="-pg"
-	PROFILE_CPPFLAGS=
-	;;
-esac
+  gcc)
+    CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
+    DEBUG_CFLAGS="-g -fverbose-asm"
+    DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
+    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="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
+    PROD_CFLAGS="-O2 -h scalar0"
+    PROD_CPPFLAGS=
+    PROFILE_CFLAGS="-pg"
+    PROFILE_CPPFLAGS=
+    ;;
 
+  *)
+    CFLAGS="$CFLAGS -ansi"
+    DEBUG_CFLAGS="-g"
+    DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
+    PROD_CFLAGS="-O"
+    PROD_CPPFLAGS=
+    PROFILE_CFLAGS="-pg"
+    PROFILE_CPPFLAGS=
+    ;;
+esac
 
 # Overriding Configure Tests
 # --------------------------
@@ -136,3 +133,35 @@ ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
 # 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
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the UNICOS architechture)
+#
+R_LARGE=18
+R_INTEGER=18
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_LARGE)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+if test "X-" = "X-$F9X"; then
+  F9X=f90
+fi
+
+if test "X-" = "X-$f9x_flags_set"; then
+  F9XSUFFIXFLAG=""
+  FSEARCH_DIRS=""
+  FFLAGS="-dp"
+  DEBUG_FFLAGS="-dp"
+  PROD_FFLAGS="-dp"
+  PROFILE_FFLAGS="-dp"
+  f9x_flags_set=yes
+fi
diff --git a/config/unicos10.0.X b/config/unicos10.0.X
index 43c1bd9..a33c91b 100644
--- a/config/unicos10.0.X
+++ b/config/unicos10.0.X
@@ -28,8 +28,8 @@
 #       used within this file.
 
 if test "X-" =  "X-$CC"; then
-    CC=cc
-    CC_BASENAME=cc
+  CC=cc
+  CC_BASENAME=cc
 fi
 # no need to use RANLIB
 RANLIB=:
@@ -88,35 +88,35 @@ RANLIB=:
 # above).
 
 case $CC_BASENAME in
-    gcc)
-	CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
-	DEBUG_CFLAGS="-g -fverbose-asm"
-	DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
-	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="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
+  gcc)
+    CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
+    DEBUG_CFLAGS="-g -fverbose-asm"
+    DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
+    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="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
     PROD_CFLAGS="-O2 -h scalar0"
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS="-pg"
-	PROFILE_CPPFLAGS=
-	;;
-
-    *)
-	CFLAGS="$CFLAGS -ansi"
-	DEBUG_CFLAGS="-g"
-	DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
-	PROD_CFLAGS="-O"
-	PROD_CPPFLAGS=
-	PROFILE_CFLAGS="-pg"
-	PROFILE_CPPFLAGS=
-	;;
+    PROD_CPPFLAGS=
+    PROFILE_CFLAGS="-pg"
+    PROFILE_CPPFLAGS=
+    ;;
+
+  *)
+    CFLAGS="$CFLAGS -ansi"
+    DEBUG_CFLAGS="-g"
+    DEBUG_CPPFLAGS="-DH5F_OPT_SEEK=0 -DH5F_LOW_DFLT=H5F_LOW_SEC2"
+    PROD_CFLAGS="-O"
+    PROD_CPPFLAGS=
+    PROFILE_CFLAGS="-pg"
+    PROFILE_CPPFLAGS=
+    ;;
 esac
 
 
@@ -136,3 +136,64 @@ ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
 # 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
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the UNICOS architechture)
+#
+R_LARGE=18
+R_INTEGER=18
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_LARGE)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+if test "X-" = "X-$F9X"; then
+  F9X=f90
+fi
+
+if test "X-" = "X-$f9x_flags_set"; then
+  F9XSUFFIXFLAG=""
+  FSEARCH_DIRS=""
+  FFLAGS="-dp"
+  DEBUG_FFLAGS="-dp"
+  PROD_FFLAGS="-dp"
+  PROFILE_FFLAGS="-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
index 66f7c4c..739abe1 100644
--- a/config/unicosmk
+++ b/config/unicosmk
@@ -28,8 +28,8 @@
 #       used within this file.
 
 if test "X-" =  "X-$CC"; then
-    CC=cc
-    CC_BASENAME=cc
+  CC=cc
+  CC_BASENAME=cc
 fi
 # no need to use RANLIB
 RANLIB=:
@@ -88,35 +88,35 @@ RANLIB=:
 # 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=
-	;;
+  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
 
 
@@ -136,3 +136,35 @@ esac
 # 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
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the UNICOS architechture)
+#
+R_LARGE=18
+R_INTEGER=18
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_LARGE)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+if test "X-" = "X-$F9X"; then
+  F9X=f90
+fi
+
+if test "X-" = "X-$f9x_flags_set"; then
+  F9XSUFFIXFLAG=""
+  FSEARCH_DIRS=""
+  FFLAGS="-dp"
+  DEBUG_FFLAGS="-dp"
+  PROD_FFLAGS="-dp"
+  PROFILE_FFLAGS="-dp"
+  f9x_flags_set=yes
+fi
diff --git a/config/unicosmk2.0.5.X b/config/unicosmk2.0.5.X
index 66f7c4c..ef6da59 100644
--- a/config/unicosmk2.0.5.X
+++ b/config/unicosmk2.0.5.X
@@ -28,8 +28,8 @@
 #       used within this file.
 
 if test "X-" =  "X-$CC"; then
-    CC=cc
-    CC_BASENAME=cc
+  CC=cc
+  CC_BASENAME=cc
 fi
 # no need to use RANLIB
 RANLIB=:
@@ -88,35 +88,35 @@ RANLIB=:
 # 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=
-	;;
+  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
 
 
@@ -136,3 +136,37 @@ esac
 # 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
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the UNICOS architechture)
+#
+R_LARGE=18
+R_INTEGER=18
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_LARGE)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+if test "X-" = "X-$F9X"; then
+  F9X=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=""
+  FFLAGS="-dp -Wl-M405"
+  DEBUG_FFLAGS=""
+  PROD_FFLAGS=""
+  PROFILE_FFLAGS=""
+  f9x_flags_set=yes
+fi
diff --git a/config/unicosmk2.0.6.X b/config/unicosmk2.0.6.X
index 66f7c4c..4514b5c 100644
--- a/config/unicosmk2.0.6.X
+++ b/config/unicosmk2.0.6.X
@@ -28,8 +28,8 @@
 #       used within this file.
 
 if test "X-" =  "X-$CC"; then
-    CC=cc
-    CC_BASENAME=cc
+  CC=cc
+  CC_BASENAME=cc
 fi
 # no need to use RANLIB
 RANLIB=:
@@ -88,35 +88,35 @@ RANLIB=:
 # 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=
-	;;
+  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
 
 
@@ -136,3 +136,66 @@ esac
 # 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
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the UNICOS architechture)
+#
+R_LARGE=18
+R_INTEGER=18
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_LARGE)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+if test "X-" = "X-$F9X"; then
+  F9X=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=""
+  FFLAGS="-dp -Wl-M405,412"
+  DEBUG_FFLAGS=""
+  PROD_FFLAGS=""
+  PROFILE_FFLAGS=""
+  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
index 66f7c4c..406d4a4 100644
--- a/config/unicosmk2.0.X
+++ b/config/unicosmk2.0.X
@@ -28,8 +28,8 @@
 #       used within this file.
 
 if test "X-" =  "X-$CC"; then
-    CC=cc
-    CC_BASENAME=cc
+  CC=cc
+  CC_BASENAME=cc
 fi
 # no need to use RANLIB
 RANLIB=:
@@ -88,35 +88,35 @@ RANLIB=:
 # above).
 
 case $CC_BASENAME in
-    gcc)
-	CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions
-	DEBUG_CFLAGS="-g -fverbose-asm"
-	DEBUG_CPPFLAGS=
+  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=
-	;;
+    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
 
 
@@ -136,3 +136,37 @@ esac
 # 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
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the UNICOS architechture)
+#
+R_LARGE=18
+R_INTEGER=18
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_LARGE)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+if test "X-" = "X-$F9X"; then
+  F9X=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=""
+  FFLAGS="-dp -Wl-M405"
+  DEBUG_FFLAGS=""
+  PROD_FFLAGS=""
+  PROFILE_FFLAGS=""
+  f9x_flags_set=yes
+fi