]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Put something into common/Make.global_options that indicates whether we use MPI....
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 24 Oct 2010 04:32:56 +0000 (04:32 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 24 Oct 2010 04:32:56 +0000 (04:32 +0000)
git-svn-id: https://svn.dealii.org/trunk@22448 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/common/Make.global_options.in
deal.II/configure
deal.II/configure.in
tests/Makefile

index 01bad74bfaf7628060279818fffd7dd0757811a5..9bf1c428918b8995756fb4609ebf74fc19ac2bf7 100644 (file)
@@ -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@
 
 ######################################################
index d1c4a64e291c3d23498a18dd99f672d443d75700..24a3e88df131e41eb85d9f08097066c0c8f79421 100755 (executable)
@@ -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
index dae6764348d271b8511552a51793f1ba197d3bca..7e62c8869d595327aaa19a2d330ac97c26d3c898 100644 (file)
@@ -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)
index 1a2482c9bfb5b659cde9a6bbe5657f85182614a3..9df67e67837b08634da27db940b8cd576ce3c316 100644 (file)
@@ -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) \

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.