blob: 038100034f43fe3785590aaca032ba253fd51a1b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
diff -Naur src3.2.6.orig/KERNEL_SRC_3.2.6/salome_adm/unix/config_files/check_mpich.m4 src3.2.6/KERNEL_SRC_3.2.6/salome_adm/unix/config_files/check_mpich.m4
--- src3.2.6.orig/KERNEL_SRC_3.2.6/salome_adm/unix/config_files/check_mpich.m4 2007-04-24 16:34:20.000000000 +0100
+++ src3.2.6/KERNEL_SRC_3.2.6/salome_adm/unix/config_files/check_mpich.m4 2008-05-07 02:36:00.000000000 +0100
@@ -26,11 +26,12 @@
AC_ARG_WITH(mpich,
[AC_HELP_STRING([--with-mpich=DIR],[root directory path of MPICH installation])],
- WITHMPICH="yes",WITHMPICH="no")
+ MPICHREQUESTED="yes",MPICHREQUESTED="no")
MPI_INCLUDES=""
MPI_LIBS=""
-if test "$WITHMPICH" = yes; then
+WITHMPICH=no
+if test x"$MPICHREQUESTED" = xyes; then
MPIREQUESTED="yes"
echo
@@ -38,9 +39,9 @@
echo testing mpich
echo ---------------------------------------------
echo
- MPICH_HOME=$withval
- if test "$MPICH_HOME"; then
+ if test "x$withval" != "xyes"; then
+ MPICH_HOME=$withval
MPI_INCLUDES="-I$MPICH_HOME/include"
if test "x$MPICH_HOME" = "x/usr"
then
@@ -67,10 +68,16 @@
WITHMPI="yes"
mpi_ok=yes
MPI_LIBS="$MPI_LIBS -lmpich"
+dnl We're doing this here because MPI_LIBS doesn't appear to be
+dnl being used within the Makefile structure
+ LDFLAGS="$MPI_LIBS $LDFLAGS"
else
mpi_ok=no
fi
-
fi
+AC_SUBST(WITHMPICH)
+AC_SUBST(MPI_INCLUDES)
+AC_SUBST(MPI_LIBS)
+AC_SUBST(mpi_ok)
])dnl
|
GitWeb
