merge from V1_2_4_with_MPI pour portage CCRT

diff --git a/salome_adm/unix/config_files/ac_cxx_option.m4 b/salome_adm/unix/config_files/ac_cxx_option.m4
index 4219c5a0787051a55265d514b0326f79d8fad037..72ea0ab112824338a063a7c3e6d063a015f86911 100644 (file)
--- a/salome_adm/unix/config_files/ac_cxx_option.m4
+++ b/salome_adm/unix/config_files/ac_cxx_option.m4
@@ -26,9 +26,9 @@ dnl
 dnl @author Bernard Secher - 15/01/2004
 dnl
 AC_DEFUN([AC_CXX_OPTION], [
-  AC_MSG_CHECKING(CXXFLAGS for $CXX in $1)
+  AC_MSG_CHECKING(wether $CXX accepts $1)
   cat > conftest.cxx <<EOF
-int main(int argc, char **argv) { return 0; }
+int main() { return 0; }
 EOF
   $CXX $1 conftest.cxx > conftest.log 2>&1
   var=`echo $1 | sed -e "s, .*$,," | sed -e "s,^-,,"`

diff --git a/salome_adm/unix/config_files/check_lam.m4 b/salome_adm/unix/config_files/check_lam.m4
index ab62ab44a5cd7639e7d31f1f6c26d8ea304eb25e..9a303a054a1b9d4a7d8dbf51c23943bc15aca306 100644 (file)
--- a/salome_adm/unix/config_files/check_lam.m4
+++ b/salome_adm/unix/config_files/check_lam.m4
@@ -62,6 +62,7 @@ if test "$WITHLAM" = yes; then
   fi
 
   if test "$WITHLAM" = "yes";then
+     WITHMPI="yes"
      mpi_ok=yes
      MPI_LIBS="$MPI_LIBS -lmpi -llam"
   else

diff --git a/salome_adm/unix/config_files/check_mpi.m4 b/salome_adm/unix/config_files/check_mpi.m4
index 6c68d7053eda52cf4ed1f7faa49cf553cc64ce77..d746ac0554d93a2d3ecc9f6574c7d6264c0f433a 100644 (file)
--- a/salome_adm/unix/config_files/check_mpi.m4
+++ b/salome_adm/unix/config_files/check_mpi.m4
@@ -97,6 +97,7 @@ if test "$WITHMPI2" = "yes";then
   CORBA_IDLPYFLAGS="-DHAVE_MPI2 $CORBA_IDLPYFLAGS"
 fi
 
+AC_SUBST(WITHMPI)
 AC_SUBST(MPI_INCLUDES)
 AC_SUBST(MPI_LIBS)
 AC_SUBST(mpi_ok)

diff --git a/salome_adm/unix/config_files/check_mpich.m4 b/salome_adm/unix/config_files/check_mpich.m4
index ea7b9d1bfef927145316e5daf1c6d8f1f7ac89bf..de0e6d50a9d5b6b85c62a924806e7d6d7ab10508 100644 (file)
--- a/salome_adm/unix/config_files/check_mpich.m4
+++ b/salome_adm/unix/config_files/check_mpich.m4
@@ -58,6 +58,7 @@ if test "$WITHMPICH" = yes; then
   fi
 
   if test "$WITHMPICH" = "yes";then
+     WITHMPI="yes"
      mpi_ok=yes
      MPI_LIBS="$MPI_LIBS -lmpich"
   else