From: ageay <ageay>
Date: Thu, 15 Jul 2010 15:34:16 +0000 (+0000)
Subject: Addition of MPI2 conditional compilation tag.
X-Git-Tag: Plotenh
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=da7847a93c057b3e23926be815a9cbc20ba4480d;p=modules%2Fkernel.git

Addition of MPI2 conditional compilation tag.
---

diff --git a/salome_adm/unix/config_files/check_mpi.m4 b/salome_adm/unix/config_files/check_mpi.m4
index 4f9886cb4..d85f67727 100644
--- a/salome_adm/unix/config_files/check_mpi.m4
+++ b/salome_adm/unix/config_files/check_mpi.m4
@@ -82,6 +82,12 @@ if test x"$MPIREQUESTED" = xyes; then
     mpi_ok=no
   fi
 
+  if test "$WITHMPI2" = "yes";then
+    mpi2_ok=yes
+  else
+    mpi2_ok=no
+  fi
+
 fi
 
 if test "$WITHMPI" = no; then
@@ -127,5 +133,8 @@ AC_SUBST(WITHMPI)
 AC_SUBST(MPI_INCLUDES)
 AC_SUBST(MPI_LIBS)
 AC_SUBST(mpi_ok)
+AC_SUBST(mpi2_ok)
 AM_CONDITIONAL(MPI_IS_OK, [test x"$mpi_ok" = xyes])
+AM_CONDITIONAL(MPI2_IS_OK, [test x"$mpi2_ok" = xyes])
+
 ])dnl
diff --git a/salome_adm/unix/config_files/check_openmpi.m4 b/salome_adm/unix/config_files/check_openmpi.m4
index e2ae5b36c..419fdd4ed 100644
--- a/salome_adm/unix/config_files/check_openmpi.m4
+++ b/salome_adm/unix/config_files/check_openmpi.m4
@@ -52,11 +52,13 @@ if test "$WITHOPENMPI" = yes; then
   AC_MSG_CHECKING(for openmpi)
   if test "$WITHOPENMPI" = "yes";then
      mpi_ok=yes
+     mpi2_ok=$WITHMPI2
      WITHMPI=yes
      CPPFLAGS="-DOMPI_IGNORE_CXX_SEEK -DWITHOPENMPI $CPPFLAGS"
      AC_MSG_RESULT(yes)
   else
      mpi_ok=no
+     mpi2_ok=no
      WITHMPI=no
      AC_MSG_RESULT(no)
   fi