MPI checks: use AC_TRY_COMPILE correctly, so as to generate a test program

that icc can compile (just in case mpicc is a wrapper round icc).

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5730

diff --git a/configure.in b/configure.in
index d23458f521b025dec8d953c3b754af6fc578b78f..12b37ead491eac848343cc14dc934828ebec6bb1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -605,18 +605,17 @@ AC_ARG_WITH(mpicc,
 )
 AC_MSG_CHECKING([for usable MPI2-compliant mpicc and mpi.h])
 saved_CC=$CC
+saved_CFLAGS=$CFLAGS
 CC=$MPI_CC
-AC_TRY_LINK(, [
+CFLAGS=
+AC_TRY_COMPILE([
 #include <mpi.h>
 #include <stdio.h>
-int main ( int argc, char** argv ) 
-{ 
-   int r = MPI_Init(&argc,&argv);
-   r |= MPI_Type_get_contents( MPI_INT, 0,0,0, NULL,NULL,NULL );
-   return r; 
-}
-],
-[
+],[
+  int r = MPI_Init(NULL,NULL);
+  r |= MPI_Type_get_contents( MPI_INT, 0,0,0, NULL,NULL,NULL );
+  return r; 
+], [
 ac_have_mpi2=yes
 AC_MSG_RESULT([yes, $MPI_CC])
 ], [
@@ -624,6 +623,7 @@ ac_have_mpi2=no
 AC_MSG_RESULT([no])
 ])
 CC=$saved_CC
+CFLAGS=$saved_CFLAGS
 
 AM_CONDITIONAL(BUILD_MPIWRAP, test x$ac_have_mpi2 = xyes)
 AC_SUBST(MPI_CC)