[svn-r22034] merge from trunk r 22032

7 files changed, 79 insertions, 46 deletions

diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index 191588a..43ef451 100755
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -2,9 +2,10 @@ SET (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 1500)
  
 SET (CTEST_CUSTOM_WARNING_EXCEPTION
     ${CTEST_CUSTOM_WARNING_EXCEPTION}
-    "H5detect.c.[0-9]+.[ \t]*:[ \t]*warning C4090"
+    "H5detect.c.[0-9]+.[ \t]*:[ \t]*warning C4090:"
     "H5detect.c.[0-9]+.[ \t]*:[ \t]*warning:[ \t]*passing argument"
     "H5detect.c[0-9 \t:]*warning:[ \t]*passing argument"
+    "note:[ \t]*expected .void .. but argument is of type .volatile"
     "H5Tconv.c[0-9 \t:]*warning:[ \t]*comparison is always false due to limited range of data type"
     "testhdf5.h.[0-9]+.[ \t]*:[ \t]*warning C4005"
     "H5Ztrans.c.[0-9]+.[ \t]*:[ \t]*warning C4244"
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 0aeb9c8..7882f3d 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -132,9 +132,9 @@ IF (WIN32)
   SET (H5_HAVE_WIN32_API 1)
   IF (NOT UNIX AND NOT CYGWIN AND NOT MINGW)
     SET (WINDOWS 1)
-    IF (MSVC_IDE)
+    IF (MSVC)
       SET (H5_HAVE_VISUAL_STUDIO 1)
-    ENDIF (MSVC_IDE)
+    ENDIF (MSVC)
   ENDIF (NOT UNIX AND NOT CYGWIN AND NOT MINGW)
 ENDIF (WIN32)
 
diff --git a/config/gnu-flags b/config/gnu-flags
index 1222c87..38ea4e4 100644
--- a/config/gnu-flags
+++ b/config/gnu-flags
@@ -28,8 +28,14 @@
 if test X = "X$cc_flags_set"; then
     # PathScale compiler spits out gcc version string too. Need to
     # filter it out.
+    # icc beginning with version 12 includes a "gcc version compatiblilty"
+    # string, causing the gcc H5_CFLAGS to be erroneously added.  The line
+    # "grep -v 'icc version'" causes the discarding of any output
+    # containing 'icc version'.  The cc_version for icc is correctly determined
+    # and flags added in the intel-flags script.
     cc_version="`$CC $CFLAGS $H5_CFLAGS -v 2>&1 | grep -v 'PathScale' |\
-	grep 'gcc version' | sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"
+        grep -v 'icc version' |\
+        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
diff --git a/config/ibm-aix b/config/ibm-aix
index ff541bc..c8b1fc3 100644
--- a/config/ibm-aix
+++ b/config/ibm-aix
@@ -39,6 +39,42 @@ if test "X-$enable_parallel" = "X-yes" -o X-$CC_BASENAME = X-mpcc_r; then
     RUNPARALLEL=${RUNPARALLEL="env MP_PROCS=\$\${NPROCS:=6} MP_TASKS_PER_NODE=\$\${NPROCS:=6} poe"}
 fi
 
+# The default Fortran 90 compiler
+
+if test "X-" = "X-$FC"; then
+  if test "X-$enable_parallel" = "X-yes"; then
+    FC=mpxlf90_r
+  else
+    FC=xlf90
+  fi
+fi
+
+# While we try to avoid setting FCFLAGS directly for use in compilation, in 
+# this case we need the -k flag present for some configure checks. As such, 
+# the configure script saves the user's set FCFLAGS before running, and 
+# restores them when complete. We must then set up both FCFLAGS and H5_FCFLAGS 
+# to ensure the flag is present for both configure as well as for the build.
+if test "X-" = "X-$f9x_flags_set"; then
+  F9XSUFFIXFLAG="-qsuffix=f=f90"
+  FCFLAGS="$FCFLAGS -O ${F9XSUFFIXFLAG}"
+  H5_FCFLAGS="$H5_FCFLAGS -O ${F9XSUFFIXFLAG}"
+  FSEARCH_DIRS="-I./ -I../src"
+  DEBUG_FCFLAGS="-O"
+  PROD_FCFLAGS="-O"
+  PROFILE_FCFLAGS="-O"
+  f9x_flags_set=yes
+fi
+
+# The default C++ compiler
+
+# Use AIX supplied C++ compiler by default.
+CXX=${CXX=xlC}
+
+# Added -qweaksymbol to suppress linker messages warning of duplicate
+# symbols; these warnings are harmless. - BMR
+H5_CXXFLAGS="$H5_CXXFLAGS -qweaksymbol"
+AM_CXXFLAGS="$AM_CXXFLAGS"
+
 
 #----------------------------------------------------------------------------
 # Compiler flags. The CPPFLAGS values should not include package debug
@@ -112,41 +148,3 @@ ac_cv_sizeof_uint_fast64_t=${ac_cv_sizeof_uint_fast64_t=8}
 
 # Don't cache long since it varies between 32 and 64 bits
 #ac_cv_sizeof_long=${ac_cv_sizeof_long=4}
-
-# The default Fortran 90 compiler
-
-if test "X-" = "X-$FC"; then
-  if test "X-$enable_parallel" = "X-yes"; then
-    FC=mpxlf90_r
-  else
-    FC=xlf90
-  fi
-fi
-
-# While we try to avoid setting FCFLAGS directly for use in compilation, in 
-# this case we need the -k flag present for some configure checks. As such, 
-# the configure script saves the user's set FCFLAGS before running, and 
-# restores them when complete. We must then set up both FCFLAGS and H5_FCFLAGS 
-# to ensure the flag is present for both configure as well as for the build.
-if test "X-" = "X-$f9x_flags_set"; then
-  F9XSUFFIXFLAG="-qsuffix=f=f90"
-  FCFLAGS="$FCFLAGS -O ${F9XSUFFIXFLAG}"
-  H5_FCFLAGS="$H5_FCFLAGS -O ${F9XSUFFIXFLAG}"
-  FSEARCH_DIRS="-I./ -I../src"
-  DEBUG_FCFLAGS="-O"
-  PROD_FCFLAGS="-O"
-  PROFILE_FCFLAGS="-O"
-  f9x_flags_set=yes
-fi
-
-# The default C++ compiler
-
-# Use AIX supplied C++ compiler by default.
-CXX=${CXX=xlC}
-
-# Added -qweaksymbol to suppress linker messages warning of duplicate
-# symbols; these warnings are harmless. - BMR
-H5_CXXFLAGS="$H5_CXXFLAGS -qweaksymbol"
-AM_CXXFLAGS="$AM_CXXFLAGS"
-
-
diff --git a/config/ibm-flags b/config/ibm-flags
index 5e092b8..a1dfa2a 100644
--- a/config/ibm-flags
+++ b/config/ibm-flags
@@ -19,8 +19,8 @@
 # if the compiler is not IBM; otherwise `cc_flags_set' is set to `yes'
 #
 
-# Get the compiler version in a way that works for pgcc
-# pgcc unless a compiler version is already known
+# Get the compiler version in a way that works for XL compiler
+# unless a compiler version is already defined.
 #
 #   cc_vendor:       The compiler product name: XL
 #   cc_version:      Version number: 10.1
@@ -75,3 +75,31 @@ if test "X-$cc_flags_set" = "X-"; then
   cc_version=
   cc_version_info=
 fi
+
+
+# get fortran version info
+if test X != X$FC; then
+    # Verify this is an IBM XL compiler
+    fc_version="`$FC $FCFLAGS -qversion 2>&1 | grep 'IBM XL Fortran'`"
+    if test X != "X$fc_version"; then
+        fc_vendor="XL"
+	fc_version="`$FC $FCFLAGS -qversion 2>&1 | sed -n 's/Version: \([0-9\.]*\).*/\1/p'`"
+	fc_version_info="IBM XL Fortran $fc_version"
+        echo "compiler '$FC' is IBM $fc_vendor-$fc_version"
+
+    fi
+fi
+
+
+# get c++ version info
+if test X != X$CXX; then
+    # Verify this is an IBM XL compiler
+    cxx_version="`$CXX $CXXFLAGS -qversion 2>&1 | grep 'IBM XL C/C++'`"
+    if test X != "X$cxx_version"; then
+        cxx_vendor="XL"
+	cxx_version="`$CXX $CXXFLAGS -qversion 2>&1 | sed -n 's/Version: \([0-9\.]*\).*/\1/p'`"
+	cxx_version_info="IBM XL C/C++ $cxx_version"
+        echo "compiler '$CXX' is IBM $cxx_vendor-$cxx_version"
+
+    fi
+fi
diff --git a/config/intel-flags b/config/intel-flags
index e6a9c31..1d01d7f 100644
--- a/config/intel-flags
+++ b/config/intel-flags
@@ -93,7 +93,7 @@ fi
 # 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
-    icc-11*)
+    icc-11* | icc-12*)
         # -s became obsolete; we also fixed bugs that allow us to enable higher level
         # of optimization starting with 1.8.7
         PROD_CFLAGS="-O3"
diff --git a/config/lt_vers.am b/config/lt_vers.am
index 30ffe71..4528e68 100644
--- a/config/lt_vers.am
+++ b/config/lt_vers.am
@@ -17,7 +17,7 @@
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 97
+LT_VERS_REVISION = 100
 LT_VERS_AGE = 0
 
 ## If the API changes *at all*, increment LT_VERS_INTERFACE and