Append VampirTrace specific CXXFLAGS (possibly given by --with-contrib-vt-flags) to CXXFLAGS. They could contain flags which are essential for the success of the STL configure test (e.g. -library=stlport4).

This commit was SVN r26017.

ompi/contrib/vt/configure.m4

@@ -31,41 +31,79 @@ AC_DEFUN([OMPI_contrib_vt_CONFIG],[
 
     contrib_vt_happy=1
 
+    # Check for enabled PMPI.
+    AC_MSG_CHECKING([whether PMPI is enabled])
+    if test "$WANT_MPI_PROFILING" = "1"; then
+        AC_MSG_RESULT([yes])
+    else
+        AC_MSG_RESULT([no])
+        AC_WARN([**************************************************************])
+        AC_WARN([*** VampirTrace cannot be built due to disabled MPI profiling.])
+        if test -z "$enable_vt"; then
+            AC_WARN([*** Pausing to give you time to read this message...])
+        fi
+        AC_WARN([**************************************************************])
+        if test -z "$enable_vt"; then
+            sleep 10
+        fi
+        contrib_vt_happy=0
+    fi
+
     # Check whether the used C++ STL is suitable to build VampirTrace.
     # For example, in case of using the Oracle C++ compiler, some of the needed
     # language features are missing in the default STL (libCstd). It's recommended
     # to use the STLport4 instead, which is much more conform to the C++ standard.
-    AC_MSG_CHECKING([whether C++ STL is suitable for vt])
-    AC_LANG_PUSH(C++)
-    AC_COMPILE_IFELSE(
-        [AC_LANG_PROGRAM([[#include <map>]],
-                         [[std::map<int, int> map;
-                           // The following assignment implicitly converts an "iterator"
-                           // to a "const_interator". Although this is allowed by the C++
-                           // standard, using Oracle's default STL (libCstd) will cause a
-                           // compile error.
-                           // Seen with Oracle Studio version 12.3 and Express 6/10.
-                           std::pair<std::map<int, int>::const_iterator, bool> ret=
-                           map.insert(std::pair<int, int>(123, 456));]])],
-        [AC_MSG_RESULT([yes])],
-        [AC_MSG_RESULT([no])
-         AC_WARN([**************************************************************])
-         AC_WARN([*** VampirTrace cannot be built due to your STL appears to])
-         AC_WARN([*** be broken.])
-         if test "x$ompi_cv_cxx_compiler_vendor" = "xsun"; then
-             AC_WARN([*** Please try again re-configuring Open MPI with using])
-             AC_WARN([*** the STLport4 by adding the compiler flag -library=stlport4])
-             AC_WARN([*** to CXXFLAGS.])
-         fi
-         if test -z "$enable_vt"; then
-             AC_WARN([*** Pausing to give you time to read this message...])
-         fi
-         AC_WARN([**************************************************************])
-         if test -z "$enable_vt"; then
-             sleep 10
-         fi
-         contrib_vt_happy=0])
-    AC_LANG_POP(C++)
+    if test "$contrib_vt_happy" = "1"; then
+        AC_MSG_CHECKING([whether C++ STL is suitable for vt])
+
+        # Append VampirTrace specific CXXFLAGS possibly given by --with-contrib-vt-flags
+        # to CXXFLAGS. They could contain flags which are essential for the success of
+        # the following configure test (e.g. -library=stlport4).
+        contrib_vt_save_CXXFLAGS="$CXXFLAGS"
+        eval "set x $with_contrib_vt_flags"; shift
+        for contrib_vt_flag
+        do
+            case $contrib_vt_flag in
+            CXXFLAGS=*)
+                contrib_vt_flag=`echo "$contrib_vt_flag" | sed "s/CXXFLAGS=//"`
+                CXXFLAGS="$contrib_vt_save_CXXFLAGS $contrib_vt_flag"
+                ;;
+            esac
+        done
+
+        AC_LANG_PUSH(C++)
+        AC_COMPILE_IFELSE(
+            [AC_LANG_PROGRAM([[#include <map>]],
+                             [[std::map<int, int> map;
+                               // The following assignment implicitly converts an "iterator"
+                               // to a "const_interator". Although this is allowed by the C++
+                               // standard, using Oracle's default STL (libCstd) will cause a
+                               // compile error.
+                               // Seen with Oracle Studio version 12.3 and Express 6/10.
+                               std::pair<std::map<int, int>::const_iterator, bool> ret=
+                               map.insert(std::pair<int, int>(123, 456));]])],
+            [AC_MSG_RESULT([yes])],
+            [AC_MSG_RESULT([no])
+             AC_WARN([**************************************************************])
+             AC_WARN([*** VampirTrace cannot be built due to your STL appears to])
+             AC_WARN([*** be broken.])
+             if test "x$ompi_cv_cxx_compiler_vendor" = "xsun"; then
+                 AC_WARN([*** Please try again re-configuring Open MPI with using])
+                 AC_WARN([*** the STLport4 by adding the compiler flag -library=stlport4])
+                 AC_WARN([*** to CXXFLAGS.])
+             fi
+             if test -z "$enable_vt"; then
+                 AC_WARN([*** Pausing to give you time to read this message...])
+             fi
+             AC_WARN([**************************************************************])
+             if test -z "$enable_vt"; then
+                 sleep 10
+             fi
+             contrib_vt_happy=0])
+        AC_LANG_POP(C++)
+
+        CXXFLAGS="$contrib_vt_save_CXXFLAGS"
+    fi
 
     if test "$contrib_vt_happy" = "1"; then
         contrib_vt_args="--disable-option-checking --with-openmpi-inside"