1 files changed, 14 insertions, 0 deletions
diff --git a/src/H5S.c b/src/H5S.c
index 7ff39bb..a30f422 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -16,6 +16,7 @@ static char		RcsId[] = "@(#)$Revision$";
 
 /* $Id$ */
 
+#define _H5S_IN_H5S_C
 #include <H5private.h>		/* Generic Functions			  */
 #include <H5Iprivate.h>		/* ID Functions		  */
 #include <H5Eprivate.h>		/* Error handling		  */
@@ -39,6 +40,11 @@ static H5S_conv_t		**H5S_conv_g = NULL;
 static size_t			H5S_aconv_g = 0;	/*entries allocated*/
 static size_t			H5S_nconv_g = 0;	/*entries used*/
 
+#ifdef HAVE_PARALLEL
+/* Global var whose value comes from environment variable */
+hbool_t         H5_mpi_opt_types_g = FALSE;
+#endif
+
 
 /*--------------------------------------------------------------------------
 NAME
@@ -72,6 +78,14 @@ H5S_init_interface(void)
 		      "unable to register one or more conversion functions");
     }
     
+    {
+        /* Allow MPI buf-and-file-type optimizations? */
+        const char *s = getenv ("HDF5_MPI_OPT_TYPES");
+        if (s && isdigit(*s)) {
+            H5_mpi_opt_types_g = (int)HDstrtol (s, NULL, 0);
+        }
+    }
+
     FUNC_LEAVE(ret_value);
 }