[svn-r26224] merge 26180 from trunk:vms_last_support_1_8

configure fixes for HDFFV-9068,9069,9096,9097,9135 from autotools_rework branch:

- Remove Infering parallel compilers (C and Fortran) from configure.ac
- Remove restriction to build shared with parallel
- Cleanup parallel sections in configure.ac
- remove large file support checks
- MPE fixes.

4 files changed, 17 insertions, 33 deletions

diff --git a/src/H5config.h.in b/src/H5config.h.in
index daf7d0d..cc8a59c 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -196,24 +196,12 @@
 /* Define to 1 if you have the `dmalloc' library (-ldmalloc). */
 #undef HAVE_LIBDMALLOC
 
-/* Define to 1 if you have the `lmpe' library (-llmpe). */
-#undef HAVE_LIBLMPE
-
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 
 /* Define to 1 if you have the `mpe' library (-lmpe). */
 #undef HAVE_LIBMPE
 
-/* Define to 1 if you have the `mpi' library (-lmpi). */
-#undef HAVE_LIBMPI
-
-/* Define to 1 if you have the `mpich' library (-lmpich). */
-#undef HAVE_LIBMPICH
-
-/* Define to 1 if you have the `mpio' library (-lmpio). */
-#undef HAVE_LIBMPIO
-
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 #undef HAVE_LIBNSL
 
diff --git a/src/H5private.h b/src/H5private.h
index 3f0fccf..b4929e7 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -211,10 +211,9 @@
 #define eventa(func_name)   h5_mpe_eventa
 #define eventb(func_name)   h5_mpe_eventb
 #define MPE_LOG_VARS                                                    \
-    static int h5_mpe_eventa = -1;                                      \
-    static int h5_mpe_eventb = -1;                                      \
-    static char p_event_start[128];                                     \
-    static char p_event_end[128];
+    static int eventa(FUNC) = -1;                                       \
+    static int eventb(FUNC) = -1;                                       \
+    char p_event_start[128];
 
 /* Hardwire the color to "red", since that's what all the routines are using
  * now.  In the future, if we want to change that color for a given routine,
@@ -223,19 +222,18 @@
  * color information down to the BEGIN_MPE_LOG macro (which should have a new
  * BEGIN_MPE_LOG_COLOR variant). -QAK
  */
+
 #define BEGIN_MPE_LOG                                                   \
-  if(H5_MPEinit_g) {                                                    \
-    if(h5_mpe_eventa == -1 && h5_mpe_eventb == -1) {                    \
-         const char *p_color = "red";                                   \
-                                                                        \
-         h5_mpe_eventa = MPE_Log_get_event_number();                    \
-         h5_mpe_eventb = MPE_Log_get_event_number();                    \
-         HDsnprintf(p_event_start, sizeof(p_event_start) - 1, "start_%s", FUNC); \
-         HDsnprintf(p_event_end, sizeof(p_event_end) - 1, "end_%s", FUNC); \
-         MPE_Describe_state(h5_mpe_eventa, h5_mpe_eventb, (char *)FUNC, (char *)p_color); \
-    }                                                                   \
-    MPE_Log_event(h5_mpe_eventa, 0, p_event_start);                     \
-  }
+    if (H5_MPEinit_g){                                                  \
+        sprintf(p_event_start, "start %s", FUNC);                       \
+        if (eventa(FUNC) == -1 && eventb(FUNC) == -1) {                 \
+            const char* p_color = "red";                                \
+            eventa(FUNC)=MPE_Log_get_event_number();                    \
+            eventb(FUNC)=MPE_Log_get_event_number();                    \
+            MPE_Describe_state(eventa(FUNC), eventb(FUNC), FUNC, p_color); \
+        }                                                               \
+        MPE_Log_event(eventa(FUNC), 0, p_event_start);                  \
+    }
 
 
 /*------------------------------------------------------------------------
@@ -245,8 +243,8 @@
  * Programmer: Long Wang
  */
 #define FINISH_MPE_LOG                                                  \
-    if(H5_MPEinit_g) {                                                  \
-        MPE_Log_event(h5_mpe_eventb, 0, p_event_end);                   \
+    if (H5_MPEinit_g) {                                                 \
+        MPE_Log_event(eventb(FUNC), 0, FUNC);                           \
     }
 
 #else /* H5_HAVE_MPE */
@@ -1845,7 +1843,7 @@ static herr_t    H5_INTERFACE_INIT_FUNC(void);
 
 /* Local variables for API routines */
 #define FUNC_ENTER_API_VARS                                                   \
-    MPE_LOG_VARS                                                              \
+    MPE_LOG_VARS                                                  \
     H5TRACE_DECL
 
 #define FUNC_ENTER_API_COMMON                         \
diff --git a/src/Makefile.in b/src/Makefile.in
index f6914ae..a57646c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -548,7 +548,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTRUMENT = @INSTRUMENT@
 INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
-LARGEFILE = @LARGEFILE@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
diff --git a/src/libhdf5.settings.in b/src/libhdf5.settings.in
index 0402ffa..f25b850 100644
--- a/src/libhdf5.settings.in
+++ b/src/libhdf5.settings.in
@@ -71,4 +71,3 @@ Clear file buffers before write: @CLEARFILEBUF@
          Function Stack Tracing: @CODESTACK@
       Strict File Format Checks: @STRICT_FORMAT_CHECKS@
    Optimization Instrumentation: @INSTRUMENT@
-       Large File Support (LFS): @LARGEFILE@