[svn-r25328] Bring revisions #24851 - 24948 from trunk to revise_chunks.

Tested on jam, koala, ostrich, platypus.

8 files changed, 24 insertions, 71 deletions

diff --git a/config/Makefile.am.blank b/config/Makefile.am.blank
index 05799fc..a54c734 100644
--- a/config/Makefile.am.blank
+++ b/config/Makefile.am.blank
@@ -40,7 +40,7 @@
 include $(top_srcdir)/config/commence.am
 
 # Add include directories to the C preprocessor flags
-INCLUDES=-I$(top_srcdir)/src
+AM_CPPFLAGS+=-I$(top_srcdir)/src
 
 # Our main targets, the library foo.la and the programs bar and baz
 lib_LTLIBRARIES=foo.la
diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index 6d3f0ee..41cb488 100644
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -19,25 +19,25 @@ set (CTEST_CUSTOM_WARNING_EXCEPTION
  
 set (CTEST_CUSTOM_MEMCHECK_IGNORE
     ${CTEST_CUSTOM_MEMCHECK_IGNORE}
-    flush1           #designed to fail
-    flush2           #designed to need flush1
-    error_test       #uses runTest.cmake
-    err_compat       #uses runTest.cmake
-    links_env        #uses runTest.cmake
-    testlibinfo      #uses grepTest.cmake
-    h5test-clear-testhdf5-objects
-    h5test-clear-objects
-    h5test-clear-cache-objects
-    h5test-clear-cache_api-objects
-    h5test-clear-cache_tagging-objects
-    h5test-clear-ttsafe-objects
-    h5test-clear-err_compat-objects
-    h5test-clear-error_test-objects
-    h5test-clear-links_env-objects
+    H5TEST-flush1           #designed to fail
+    H5TEST-flush2           #designed to need flush1
+    H5TEST-error_test       #uses runTest.cmake
+    H5TEST-err_compat       #uses runTest.cmake
+    H5TEST-links_env        #uses runTest.cmake
+    H5TEST-testlibinfo      #uses grepTest.cmake
+    H5TEST-clear-testhdf5-objects
+    H5TEST-clear-objects
+    H5TEST-clear-cache-objects
+    H5TEST-clear-cache_api-objects
+    H5TEST-clear-cache_tagging-objects
+    H5TEST-clear-ttsafe-objects
+    H5TEST-clear-err_compat-objects
+    H5TEST-clear-error_test-objects
+    H5TEST-clear-links_env-objects
     PERFORM_h5perform-clear-objects
     HL_TOOLS-clear-objects
-    hl_test-clear-objects
-    hl_fortran_test-clear-objects
+    HL_test-clear-objects
+    HL_fortran_test-clear-objects
     ######### tools/h5copy #########
     H5COPY-clearall-objects
     ######### tools/h5diff #########
@@ -211,5 +211,5 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
     H5MKGRP-clearall-objects
     ######### examples #########
     EXAMPLES-clear-objects
-    cpp_ex-clear-objects
+    CPP_ex-clear-objects
 )
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 03a7975..9816755 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -144,13 +144,6 @@ if (WIN32)
   endif (NOT UNIX AND NOT CYGWIN AND NOT MINGW)
 endif (WIN32)
 
-#if (WIN32)
-#  set (DEFAULT_STREAM_VFD OFF)
-#else (WIN32)
-#  set (DEFAULT_STREAM_VFD ON)
-#endif (WIN32)
-#option (HDF5_STREAM_VFD "Compile Stream Virtual File Driver support" ${DEFAULT_STREAM_VFD})
-
 # TODO --------------------------------------------------------------------------
 # Should the Default Virtual File Driver be compiled?
 # This is hard-coded now but option should added to match configure
@@ -817,16 +810,6 @@ if (NOT WINDOWS)
 endif (NOT WINDOWS)
 
 #-----------------------------------------------------------------------------
-#  Check for the Stream VFD driver
-#-----------------------------------------------------------------------------
-if (HDF5_STREAM_VFD)
-  CHECK_INCLUDE_FILE_CONCAT ("netdb.h"       H5_HAVE_NETDB_H)
-  CHECK_INCLUDE_FILE_CONCAT ("netinet/tcp.h" H5_HAVE_NETINET_TCP_H)
-  CHECK_INCLUDE_FILE_CONCAT ("sys/filio.h"   H5_HAVE_SYS_FILIO_H)
-  set (H5_HAVE_STREAM 1)
-endif (HDF5_STREAM_VFD)
-
-#-----------------------------------------------------------------------------
 # Check if InitOnceExecuteOnce is available
 #-----------------------------------------------------------------------------
 if (WINDOWS)
@@ -892,18 +875,6 @@ if (WINDOWS)
 endif (WINDOWS)
 
 #-----------------------------------------------------------------------------
-# Option to see if GPFS is available on this filesystem --enable-gpfs
-#-----------------------------------------------------------------------------
-option (HDF5_ENABLE_GPFS "Enable GPFS hints for the MPI/POSIX file driver" OFF)
-if (HDF5_ENABLE_GPFS)
-  CHECK_INCLUDE_FILE_CONCAT ("gpfs.h"        HAVE_GPFS)
-  if (HAVE_GPFS)
-    HDF5_FUNCTION_TEST (HAVE_GPFS)  
-  endif (HAVE_GPFS)
-endif (HDF5_ENABLE_GPFS)
-MARK_AS_ADVANCED (HDF5_ENABLE_GPFS)
-
-#-----------------------------------------------------------------------------
 # Determine how 'inline' is used
 #-----------------------------------------------------------------------------
 set (HDF5_EXTRA_TEST_DEFINITIONS INLINE_TEST_INLINE)
diff --git a/config/cmake/FindMPI.cmake b/config/cmake/FindMPI.cmake
index 6d12276..1b67a30 100644
--- a/config/cmake/FindMPI.cmake
+++ b/config/cmake/FindMPI.cmake
@@ -427,18 +427,18 @@ function (interrogate_mpi_compiler lang try_libs)
           HINTS         ${_MPI_BASE_DIR} ${_MPI_PREFIX_PATH}
           PATH_SUFFIXES lib)
         if (MPI_LIBRARIES_WORK AND MPI_LIB)
-          set(MPI_LIBRARIES_WORK ${MPI_LIBRARIES_WORK} ${MPI_LIB})
+          list(APPEND MPI_LIBRARIES_WORK ${MPI_LIB})
         endif()
       endif()
 
       if (${lang} STREQUAL Fortran)
         set(MPI_LIB "MPI_LIB-NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
         find_library(MPI_LIB
-          NAMES         fmpi fmpich fmpich2 fmpich2g
+          NAMES         fmpi fmpich fmpich2 fmpich2g msmpifec msmpifmc
           HINTS         ${_MPI_BASE_DIR} ${_MPI_PREFIX_PATH}
-          PATH_SUFFIXES lib)
+          PATH_SUFFIXES lib lib/${MS_MPI_ARCH_DIR} Lib Lib/${MS_MPI_ARCH_DIR})
         if (MPI_LIBRARIES_WORK AND MPI_LIB)
-          set(MPI_LIBRARIES_WORK ${MPI_LIBRARIES_WORK} ${MPI_LIB})
+          list(APPEND MPI_LIBRARIES_WORK ${MPI_LIB})
         endif()
       endif()
 
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index f3e1d75..25a0e37 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -217,12 +217,6 @@
 /* Define to 1 if you have the `get_fpc_csr' function. */
 #cmakedefine H5_HAVE_GET_FPC_CSR @H5_HAVE_GET_FPC_CSR@
 
-/* Define if we have GPFS support */
-#cmakedefine H5_HAVE_GPFS @H5_HAVE_GPFS@
-
-/* Define to 1 if you have the <gpfs.h> header file. */
-#cmakedefine H5_HAVE_GPFS_H @H5_HAVE_GPFS_H@
-
 /* Define if library will contain instrumentation to detect correct
    optimization operation */
 #cmakedefine H5_HAVE_INSTRUMENTED_LIBRARY @H5_HAVE_INSTRUMENTED_LIBRARY@
diff --git a/config/cmake/HDF5Tests.c b/config/cmake/HDF5Tests.c
index 21206e0..355c06f 100644
--- a/config/cmake/HDF5Tests.c
+++ b/config/cmake/HDF5Tests.c
@@ -437,17 +437,6 @@ main ()
 
 #endif
 
-#ifdef HAVE_GPFS
-
-#include <gpfs.h>
-int main ()
-{
-    int fd = 0; 
-    gpfs_fcntl(fd, (void *)0);
-}
-
-#endif /* HAVE_GPFS */
-
 #ifdef HAVE_IOEO
 
 #include <windows.h>
diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
index 3970a9f..418a6cf 100644
--- a/config/cmake/libhdf5.settings.cmake.in
+++ b/config/cmake/libhdf5.settings.cmake.in
@@ -63,7 +63,6 @@ Features:
 Clear file buffers before write: @HDF5_Enable_Clear_File_Buffers@
            Using memory checker: @HDF5_ENABLE_USING_MEMCHECKER@
          Function Stack Tracing: @HDF5_ENABLE_CODESTACK@
-                           GPFS: @HDF5_ENABLE_GPFS@
       Strict File Format Checks: @HDF5_STRICT_FORMAT_CHECKS@
    Optimization Instrumentation: @HDF5_Enable_Instrument@
        Large File Support (LFS): @HDF5_ENABLE_LARGE_FILE@
diff --git a/config/lt_vers.am b/config/lt_vers.am
index 153a579..9bc5f0a 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 = 165
+LT_VERS_REVISION = 166
 LT_VERS_AGE = 0
 
 ## If the API changes *at all*, increment LT_VERS_INTERFACE and