From: bangerth Date: Sun, 24 Oct 2010 04:32:56 +0000 (+0000) Subject: Put something into common/Make.global_options that indicates whether we use MPI.... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c3124706e97ec86a6ae57a7a930dfe2e96a3edc;p=dealii-svn.git Put something into common/Make.global_options that indicates whether we use MPI. If so, use it in tests/Makefile. git-svn-id: https://svn.dealii.org/trunk@22448 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index 01bad74bfa..9bf1c42891 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -92,6 +92,8 @@ USE_CONTRIB_UMFPACK = @USE_CONTRIB_UMFPACK@ USE_CONTRIB_P4EST = @USE_CONTRIB_P4EST@ DEAL_II_P4EST_DIR = @DEAL_II_P4EST_DIR@ +DEAL_II_USE_MPI = @DEAL_II_USE_MPI@ + TARGET = @target@ ###################################################### diff --git a/deal.II/configure b/deal.II/configure index d1c4a64e29..24a3e88df1 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 22333 . +# From configure.in Revision: 22430 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.63 for deal.II 6.4.pre. # @@ -734,6 +734,7 @@ SHLIBLD CXXFLAGSPIC CXXFLAGSO CXXFLAGSG +DEAL_II_USE_MPI DEAL_II_COMPILER_SUPPORTS_MPI GXX_VERSION_DETAILED GXX_VERSION @@ -5279,6 +5280,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test "$GCC" = "yes" ; then CC_VERSION_STRING=`($CC -v 2>&1) | grep "gcc version"` if test "x$CC_VERSION_STRING" = "x" ; then diff --git a/deal.II/configure.in b/deal.II/configure.in index dae6764348..7e62c8869d 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -132,6 +132,7 @@ AC_SUBST(GXX_BRAND) AC_SUBST(GXX_VERSION) AC_SUBST(GXX_VERSION_DETAILED) AC_SUBST(DEAL_II_COMPILER_SUPPORTS_MPI) +AC_SUBST(DEAL_II_USE_MPI) AC_SUBST(CXXFLAGSG) AC_SUBST(CXXFLAGSO) AC_SUBST(CXXFLAGSPIC) diff --git a/tests/Makefile b/tests/Makefile index 1a2482c9bf..9df67e6783 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -17,7 +17,7 @@ nofail-dirs = a-framework \ aniso \ codim_one \ serialization \ - mpi \ + $(shell if test "$(DEAL_II_USE_MPI)" = yes ; then echo mpi ; fi) \ $(shell if test "$(USE_CONTRIB_P4EST)" = yes ; then echo distributed_grids ; fi) \ $(shell if test "$(USE_CONTRIB_PETSC)" = yes ; then echo petsc ; fi) \ $(shell if test "$(USE_CONTRIB_TRILINOS)" = yes ; then echo trilinos ; fi) \