Merge from V6_main_20120808 08Aug12

[modules/med.git] / adm_local_without_kernel / unix / config_files / check_mpich.m4

diff --git a/adm_local_without_kernel/unix/config_files/check_mpich.m4 b/adm_local_without_kernel/unix/config_files/check_mpich.m4
index c581cececd2ee52f28d9f7a6b352b13648fa51dc..1c63d618c6a5719c8ec5182dbfba7b7125b7e1f5 100644 (file)
--- a/adm_local_without_kernel/unix/config_files/check_mpich.m4
+++ b/adm_local_without_kernel/unix/config_files/check_mpich.m4
@@ -1,24 +1,22 @@
-dnl  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+dnl Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 dnl
-dnl  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-dnl  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+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 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 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  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 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  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 dnl
+
 AC_DEFUN([CHECK_MPICH],[
 
 AC_REQUIRE([AC_PROG_CC])dnl
@@ -55,7 +53,8 @@ if test "$WITHMPICH" = yes; then
   CPPFLAGS="$CPPFLAGS_old"
 
   if test "$WITHMPICH" = "yes";then
-     MPI_LIBS="$MPI_LIBS -lmpich -lpmpich"
+     #MPI_LIBS="$MPI_LIBS -lmpich -lpmpich"
+     MPI_LIBS="$MPI_LIBS -lmpich"
   fi
 
   if test "$WITHMPICH" = "yes";then