Even more changes belonging to r26051

This commit was SVN r26063.

The following SVN revision numbers were found above:
  r26051 --> open-mpi/ompi@f245ed965a

ompi/contrib/vt/vt/extlib/otf/config/m4/acinclude.mpi.m4

@@ -71,6 +71,20 @@ AC_DEFUN([CHECK_MPI],
 
         CPPFLAGS=$sav_CPPFLAGS
         LDFLAGS=$sav_LDFLAGS
+
+        if test "$mpi_error" = "no" -a "$inside_openmpi" = "no"; then
+
+            sav_CC=$CC
+            sav_LIBS=$LIBS
+            CC=$MPICC
+            LIBS="$LIBS $MPILIBS"
+
+            AC_CHECK_FUNCS([MPI_Get_address])
+            AC_CHECK_FUNCS([MPI_Type_create_struct])
+
+            CC=$sav_CC
+            LIBC=$sav_LIBS
+        fi
     fi
 
     MPI_LIB_DIR=$mpi_lib_dir

ompi/contrib/vt/vt/extlib/otf/configure.in

@@ -14,6 +14,17 @@ AM_CONFIG_HEADER(config.h)
 # If Automake supports silent rules, enable them.
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
+# Check whether we are inside Open MPI package
+inside_openmpi="no"
+AC_ARG_WITH(openmpi-inside, [],
+[
+	AS_IF([test x"$withval" != "xno"],
+	[
+		inside_openmpi="yes"
+		CPPFLAGS="-DINSIDE_OPENMPI $CPPFLAGS"
+	])
+])
+
 # Get library version
 OTF_VERSION_LIBRARY=m4_normalize(esyscmd([config/otf_get_version.sh VERSION --library]))
 AC_SUBST([OTF_VERSION_LIBRARY])