[cig-commits] r7980 - cs/autoconf/trunk

[leif at geodynamics.org]

Author: leif
Date: 2007-09-17 18:01:59 -0700 (Mon, 17 Sep 2007)
New Revision: 7980

Modified:
   cs/autoconf/trunk/cit_mpi.m4
Log:
Simplified/modernized CIT_HEADER_MPI.


Modified: cs/autoconf/trunk/cit_mpi.m4
===================================================================
--- cs/autoconf/trunk/cit_mpi.m4	2007-09-18 00:01:04 UTC (rev 7979)
+++ cs/autoconf/trunk/cit_mpi.m4	2007-09-18 01:01:59 UTC (rev 7980)
@@ -315,86 +315,21 @@
 # --------------
 AC_DEFUN([CIT_HEADER_MPI], [
 # $Id$
-AC_REQUIRE([_CIT_PROG_MPICC])dnl
-AC_ARG_VAR(MPIINCLUDES, [MPI include flags, e.g. -I<mpi include dir>])
-AC_SUBST(MPIINCLUDES)
-cit_mpi_save_CC=$CC
-cit_mpi_save_CXX=$CXX
-cit_mpi_save_CPPFLAGS=$CPPFLAGS
-CC=$MPICC
-CXX=$MPICXX
-CPPFLAGS="$MPIINCLUDES $CPPFLAGS"
-# If MPIINCLUDES is set, check to see if it works.
-# If MPIINCLUDES is not set, check to see if it is needed.
-AC_MSG_CHECKING([for mpi.h])
-dnl Use AC_TRY_COMPILE instead of AC_CHECK_HEADER because the
-dnl latter also preprocesses using $CXXCPP.
-AC_TRY_COMPILE([
-#include <mpi.h>
-], [], [
-    AC_MSG_RESULT(yes)
-], [
-    AC_MSG_RESULT(no)
-    if test -n "$MPIINCLUDES"; then
-        AC_MSG_ERROR([header <mpi.h> not found; check MPIINCLUDES])
-    fi
-    # MPIINCLUDES is needed but was not set.
-    AC_LANG_CASE(
-        [C], [
-            cit_mpicmd=$cit_MPICC
-        ],
-        [C++], [
-            cit_mpicmd=$cit_MPICXX
-            test -z "$cit_mpicmd" && cit_mpicmd=$cit_MPICC
-        ]
-    )
-    if test -n "$cit_mpicmd"; then
-        # Try to guess the correct value for MPIINCLUDES using an MPI wrapper.
-        CIT_MPI_INCLUDES(cit_includes, $cit_mpicmd, [
-            AC_MSG_CHECKING([for mpi.h])
-            CPPFLAGS="$cit_includes $cit_mpi_save_CPPFLAGS"
-            AC_TRY_COMPILE([
-#include <mpi.h>
-            ], [], [
-                AC_MSG_RESULT(yes)
-                MPIINCLUDES=$cit_includes
-                export MPIINCLUDES
-            ], [
-                AC_MSG_RESULT(no)
-                _CIT_HEADER_MPI_FAILED
-            ])
-        ], [
-            AC_MSG_RESULT(failed)
-            _CIT_HEADER_MPI_FAILED
-        ])
-    else
-        _CIT_HEADER_MPI_FAILED
-    fi
+AC_LANG_CASE(
+    [C], [
+        AC_CHECK_HEADER([mpi.h], [], [AC_MSG_ERROR([header 'mpi.h' not found])])
+    ],
+    [C++], [
+        CIT_MPI_CHECK_CXX_LINK(cit_MPI_CPPFLAGS, [],
+                               _CIT_TRIVIAL_MPI_PROGRAM,
+                               [whether we can link a trivial C++ MPI program],
+                               [],
+                               AC_MSG_FAILURE([cannot link a trivial C++ MPI program using $CXX]))
+        CPPFLAGS="$cit_MPI_CPPFLAGS $CPPFLAGS"
 ])
-AC_LANG_CASE([C++], [
-    CIT_MPI_CHECK_CXX_LINK(MPIINCLUDES, [$MPILIBS],
-                           _CIT_TRIVIAL_MPI_PROGRAM,
-                           [whether we can link a trivial C++ MPI program],
-                           [export MPIINCLUDES],
-			   AC_MSG_FAILURE([cannot link a trivial C++ MPI program using $CXX]))
-])
-CPPFLAGS=$cit_mpi_save_CPPFLAGS
-CXX=$cit_mpi_save_CXX
-CC=$cit_mpi_save_CC
 ])dnl CIT_HEADER_MPI
 
 
-# _CIT_HEADER_MPI_FAILED
-# ----------------------
-AC_DEFUN([_CIT_HEADER_MPI_FAILED], [
-AC_MSG_ERROR([header <mpi.h> not found
-
-    Set the MPICC, MPICXX, MPIINCLUDES, and MPILIBS environment variables
-    to specify how to build MPI programs.
-])
-])dnl CIT_HEADER_MPI_FAILED
-
-
 # CIT_MPI_CHECK_CXX_LINK(INCLUDES, LIBS, PROGRAM,
 #                        MSG, IF-WORKS, IF-NOT)
 # -----------------------------------------------