From 181644dbf532633b3f617be81b57889c036087da Mon Sep 17 00:00:00 2001 From: secher Date: Wed, 10 Nov 2004 12:33:40 +0000 Subject: [PATCH] merge from V1_2_4_with_MPI pour portage CCRT --- salome_adm/unix/config_files/ac_cxx_option.m4 | 4 ++-- salome_adm/unix/config_files/check_lam.m4 | 1 + salome_adm/unix/config_files/check_mpi.m4 | 1 + salome_adm/unix/config_files/check_mpich.m4 | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/salome_adm/unix/config_files/ac_cxx_option.m4 b/salome_adm/unix/config_files/ac_cxx_option.m4 index 4219c5a07..72ea0ab11 100644 --- 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 < 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 ab62ab44a..9a303a054 100644 --- 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 6c68d7053..d746ac055 100644 --- 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 ea7b9d1bf..de0e6d50a 100644 --- 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 -- 2.39.2