[svn-r15237] Description:

	Merge revisions 14900:15037 from trunk into metadata journaling branch

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

3 files changed, 12 insertions, 16 deletions

diff --git a/config/conclude.am b/config/conclude.am
index bc91099..446e963 100644
--- a/config/conclude.am
+++ b/config/conclude.am
@@ -122,10 +122,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
-	      if test "X$(HDF_FORTRAN)" = "Xyes"; then \
+	      if test "X$(FORTRAN_API)" = "Xyes"; then \
 	         echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
 	         echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(HDF_CXX)" = "Xyes"; then \
+	      elif test "X$(CXX_API)" = "Xyes"; then \
 	         echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \
 	         echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\
 	      else \
@@ -161,10 +161,10 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
 	      echo "No need to test $${tname} again."; \
 	   else \
 	      echo "============================" > $${log}; \
-	      if test "X$(HDF_FORTRAN)" = "Xyes"; then \
+	      if test "X$(FORTRAN_API)" = "Xyes"; then \
 	         echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \
 	         echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
-	      elif test "X$(HDF_CXX)" = "Xyes"; then \
+	      elif test "X$(CXX_API)" = "Xyes"; then \
 	         echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \
 	         echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \
 	      else \
diff --git a/config/gnu-flags b/config/gnu-flags
index 9167a5d..401bafe 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -52,11 +52,10 @@ 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.
+    ** data type used extensively by hdf5. 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
@@ -77,16 +76,13 @@ EOF
 # 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.
+    ** optimizations are enabled on some platforms.
     **
 EOF
        sleep 5
-    fi
 
 # All current versions of PGCC have problems also.
 elif test pgcc = "$cc_vendor" -a "$cc_vers_all" -le 2091066; then	    
@@ -188,10 +184,10 @@ esac
 # the information from the previous version and adding modifications to that.
 case "$cc_vendor-$cc_version" in
 
-# Closer to the gcc 4.2 release, we should check for additional flags to
+# Closer to the gcc 4.4 release, we should check for additional flags to
 # include and break it out into it's own section, like the other versions
 # below. -QAK
-  gcc-4.[12]*)
+  gcc-4.[123]*)
     # Replace -ansi flag with -std=c99 flag
     H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
 
diff --git a/config/lt_vers.am b/config/lt_vers.am
index 56cd471..81174a5 100644
--- a/config/lt_vers.am
+++ b/config/lt_vers.am
@@ -17,7 +17,7 @@
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 5
-LT_VERS_REVISION = 6
+LT_VERS_REVISION = 7
 LT_VERS_AGE = 0
 
 ## If the API changes *at all*, increment LT_VERS_INTERFACE and