0021196: [CEA 456] Integration and merge modification for debian packages

  Allow a separate MPI include directory

diff --git a/salome_adm/unix/config_files/check_mpi.m4 b/salome_adm/unix/config_files/check_mpi.m4
index d85f677274eae8a9e4bf190e0b2da1370b154fb1..491919aefb84ab0160112f32569494f69f10e67b 100644 (file)
--- a/salome_adm/unix/config_files/check_mpi.m4
+++ b/salome_adm/unix/config_files/check_mpi.m4
@@ -28,6 +28,10 @@ AC_ARG_WITH(mpi_lib,
    [AC_HELP_STRING([--with-mpi_lib=DIR],[directory path of MPICH lib installation])],
    MPILIBREQUESTED="$withval")
 
+AC_ARG_WITH(mpi_include,
+   [AC_HELP_STRING([--with-mpi_include=DIR],[directory path of MPICH header file installation])],
+   MPIINCLUDEREQUESTED="$withval")
+
 AC_ARG_WITH(mpi,
    [AC_HELP_STRING([--with-mpi=DIR],[root directory path of MPICH installation])],
    MPIREQUESTED="yes",MPIREQUESTED="no")
@@ -59,6 +63,10 @@ if test x"$MPIREQUESTED" = xyes; then
     MPI_LIBS="-L$MPILIBREQUESTED"
   fi
 
+  if test x"$MPIINCLUDEREQUESTED" != x; then
+    MPI_INCLUDES="-I$MPIINCLUDEREQUESTED"
+  fi
+
   CPPFLAGS_old="$CPPFLAGS"
   CPPFLAGS="$MPI_INCLUDES $CPPFLAGS"
   AC_CHECK_HEADER(mpi.h,WITHMPI="yes",WITHMPI="no")