Adding openmpi

diff --git a/salome_adm/unix/config_files/check_mpi.m4 b/salome_adm/unix/config_files/check_mpi.m4
index 57b796b729d46a609821b9e5c0134ef5f76d9a8b..69c0ed8549fa80cbecd31d51738a29768fc9d15a 100644 (file)
--- a/salome_adm/unix/config_files/check_mpi.m4
+++ b/salome_adm/unix/config_files/check_mpi.m4
@@ -96,6 +96,17 @@ dnl
 
   fi
 
+  if test "$WITHLAM" = no; then
+dnl
+dnl ---------------------------------------------
+dnl testing OPENMPI
+dnl ---------------------------------------------
+dnl
+
+    CHECK_OPENMPI
+
+  fi
+
 fi
 
 if test x$WITHMPI2 = xyes; then

diff --git a/salome_adm/unix/config_files/check_openmpi.m4 b/salome_adm/unix/config_files/check_openmpi.m4
new file mode 100644 (file)
index 0000000..24673dd
--- /dev/null
+++ b/salome_adm/unix/config_files/check_openmpi.m4
@@ -0,0 +1,56 @@
+dnl  Copyright (C) 2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+dnl  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+dnl 
+dnl  This library is free software; you can redistribute it and/or 
+dnl  modify it under the terms of the GNU Lesser General Public 
+dnl  License as published by the Free Software Foundation; either 
+dnl  version 2.1 of the License. 
+dnl 
+dnl  This library is distributed in the hope that it will be useful, 
+dnl  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+dnl  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+dnl  Lesser General Public License for more details. 
+dnl 
+dnl  You should have received a copy of the GNU Lesser General Public 
+dnl  License along with this library; if not, write to the Free Software 
+dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+dnl 
+dnl  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+dnl
+dnl
+dnl
+
+AC_DEFUN([CHECK_OPENMPI],[
+AC_ARG_WITH(openmpi,
+           AC_HELP_STRING([--with-openmpi],[root directory path of openmpi installation]),
+           WITHOPENMPI="yes",WITHOPENMPI="no")
+
+MPI_INCLUDES=""
+MPI_LIBS=""
+mpi_ok=no
+
+if test "$WITHOPENMPI" = yes; then
+
+  OPENMPI_HOME=$withval
+
+  if test "$OPENMPI_HOME"; then
+    MPI_INCLUDES=`$OPENMPI_HOME/bin/mpicxx --showme:compile`
+    MPI_LIBS=`$OPENMPI_HOME/bin/mpicxx --showme:link`
+  fi
+
+  CPPFLAGS_old="$CPPFLAGS"
+  CPPFLAGS="$MPI_INCLUDES $CPPFLAGS"
+  AC_CHECK_HEADER(mpi.h,WITHOPENMPI="yes",WITHOPENMPI="no")
+  CPPFLAGS="$CPPFLAGS_old"
+
+  AC_MSG_CHECKING(for openmpi)
+  if test "$WITHOPENMPI" = "yes";then
+     mpi_ok=yes
+     AC_MSG_RESULT(yes)
+  else
+     mpi_ok=no
+     AC_MSG_RESULT(no)
+  fi
+fi
+])dnl
+

diff --git a/src/DSC/DSC_User/Datastream/Calcium/Makefile.am b/src/DSC/DSC_User/Datastream/Calcium/Makefile.am
index aaba3dfe7bd787293f33bc064a7d2da39677cc12..db339dd53c792817be0a0db213f145ecfd057e44 100644 (file)
--- a/src/DSC/DSC_User/Datastream/Calcium/Makefile.am
+++ b/src/DSC/DSC_User/Datastream/Calcium/Makefile.am
@@ -109,9 +109,8 @@ libCalciumC_la_SOURCES = Calcium.c
 #
 noinst_PROGRAMS              = test_DataIdContainer
 ## testInterpolation
-
-testInterpolation_SOURCES = testInterpolation.cxx
-testInterpolation_CXXFLAGS = -I/usr/include
+## testInterpolation_SOURCES = testInterpolation.cxx
+## testInterpolation_CXXFLAGS = -I/usr/include
 
 test_DataIdContainer_SOURCES = test_DataIdContainer.cxx