|
From: <sv...@va...> - 2006-03-09 02:41:47
|
Author: sewardj
Date: 2006-03-09 02:41:41 +0000 (Thu, 09 Mar 2006)
New Revision: 5730
Log:
MPI checks: use AC_TRY_COMPILE correctly, so as to generate a test progra=
m
that icc can compile (just in case mpicc is a wrapper round icc).
Modified:
trunk/configure.in
Modified: trunk/configure.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/configure.in 2006-03-08 21:40:34 UTC (rev 5729)
+++ trunk/configure.in 2006-03-09 02:41:41 UTC (rev 5730)
@@ -605,18 +605,17 @@
)
AC_MSG_CHECKING([for usable MPI2-compliant mpicc and mpi.h])
saved_CC=3D$CC
+saved_CFLAGS=3D$CFLAGS
CC=3D$MPI_CC
-AC_TRY_LINK(, [
+CFLAGS=3D
+AC_TRY_COMPILE([
#include <mpi.h>
#include <stdio.h>
-int main ( int argc, char** argv )=20
-{=20
- int r =3D MPI_Init(&argc,&argv);
- r |=3D MPI_Type_get_contents( MPI_INT, 0,0,0, NULL,NULL,NULL );
- return r;=20
-}
-],
-[
+],[
+ int r =3D MPI_Init(NULL,NULL);
+ r |=3D MPI_Type_get_contents( MPI_INT, 0,0,0, NULL,NULL,NULL );
+ return r;=20
+], [
ac_have_mpi2=3Dyes
AC_MSG_RESULT([yes, $MPI_CC])
], [
@@ -624,6 +623,7 @@
AC_MSG_RESULT([no])
])
CC=3D$saved_CC
+CFLAGS=3D$saved_CFLAGS
=20
AM_CONDITIONAL(BUILD_MPIWRAP, test x$ac_have_mpi2 =3D xyes)
AC_SUBST(MPI_CC)
|