From 9c822b065f3850dd96e8aa8d7ad6f8470c8b75fc Mon Sep 17 00:00:00 2001 From: Matthias Jurenz Date: Mon, 27 Feb 2012 15:53:14 +0000 Subject: [PATCH] Even more changes belonging to r26051 This commit was SVN r26063. The following SVN revision numbers were found above: r26051 --> open-mpi/ompi@f245ed965aa706cd705151b6581da1181eb64c0c --- .../vt/vt/extlib/otf/config/m4/acinclude.mpi.m4 | 14 ++++++++++++++ ompi/contrib/vt/vt/extlib/otf/configure.in | 11 +++++++++++ 2 files changed, 25 insertions(+) diff --git a/ompi/contrib/vt/vt/extlib/otf/config/m4/acinclude.mpi.m4 b/ompi/contrib/vt/vt/extlib/otf/config/m4/acinclude.mpi.m4 index 0c90fc54f2..0a92c47328 100644 --- a/ompi/contrib/vt/vt/extlib/otf/config/m4/acinclude.mpi.m4 +++ b/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 diff --git a/ompi/contrib/vt/vt/extlib/otf/configure.in b/ompi/contrib/vt/vt/extlib/otf/configure.in index 836e8d08b0..2a6ebc15c1 100644 --- a/ompi/contrib/vt/vt/extlib/otf/configure.in +++ b/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])