]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Add forgotten expansions of Trilinos MPI vectors.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 20 Sep 2008 02:35:53 +0000 (02:35 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 20 Sep 2008 02:35:53 +0000 (02:35 +0000)
git-svn-id: https://svn.dealii.org/trunk@16867 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/configure

index 3cb3f8ba7cf36e548759712bb6753ecda1c97f35..9a794f8e3251cbe410df264a5549f88726253c4f 100644 (file)
@@ -5397,7 +5397,9 @@ AC_DEFUN(DEAL_II_CONFIGURE_TRILINOS, dnl
     DEAL_II_CHECK_TRILINOS_SHARED_STATIC
 
     DEAL_II_EXPAND_TRILINOS_VECTOR="TrilinosWrappers::Vector"
+    DEAL_II_EXPAND_TRILINOS_MPI_VECTOR="TrilinosWrappers::MPI::Vector"
     DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR="TrilinosWrappers::BlockVector"
+    DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR="TrilinosWrappers::MPI::BlockVector"
 
     dnl Finally set with_trilinos if this hasn't happened yet
     if test "x$with_trilinos" = "x" ; then
@@ -5408,7 +5410,9 @@ AC_DEFUN(DEAL_II_CONFIGURE_TRILINOS, dnl
   dnl Make sure that the right values for Trilinos vectors are written into
   dnl common/template-arguments.in
   AC_SUBST(DEAL_II_EXPAND_TRILINOS_VECTOR)
+  AC_SUBST(DEAL_II_EXPAND_TRILINOS_MPI_VECTOR)
   AC_SUBST(DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR)
+  AC_SUBST(DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR)
 ])
 
 
index df43d32399693839024c283a7562a6b9bddd71ea..2d5418c6cf7d7f5afd1094a996dc8411bd41b9d4 100755 (executable)
@@ -721,7 +721,9 @@ DEAL_II_PETSC_VERSION_SUBMINOR
 DEAL_II_PETSC_MPIUNI_LIB
 DEAL_II_DEFINE_DEAL_II_USE_PETSC
 DEAL_II_EXPAND_TRILINOS_VECTOR
+DEAL_II_EXPAND_TRILINOS_MPI_VECTOR
 DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR
+DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR
 USE_CONTRIB_TRILINOS
 DEAL_II_TRILINOS_DIR
 DEAL_II_TRILINOS_SHARED
@@ -12052,7 +12054,9 @@ echo "$as_me: error: When building deal.II with shared libraries, Trilinos also
 
 
     DEAL_II_EXPAND_TRILINOS_VECTOR="TrilinosWrappers::Vector"
+    DEAL_II_EXPAND_TRILINOS_MPI_VECTOR="TrilinosWrappers::MPI::Vector"
     DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR="TrilinosWrappers::BlockVector"
+    DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR="TrilinosWrappers::MPI::BlockVector"
 
         if test "x$with_trilinos" = "x" ; then
       with_trilinos="yes"
@@ -12069,6 +12073,8 @@ echo "$as_me: error: When building deal.II with shared libraries, Trilinos also
 
 
 
+
+
 if test "x$with_umfpack" != "x" -a "x$with_umfpack" != "xno" ; then
   if test "x$with_blas" = "x" -o "x$with_blas" = "xno"; then
     with_blas="yes"
@@ -14732,7 +14738,9 @@ DEAL_II_PETSC_VERSION_SUBMINOR!$DEAL_II_PETSC_VERSION_SUBMINOR$ac_delim
 DEAL_II_PETSC_MPIUNI_LIB!$DEAL_II_PETSC_MPIUNI_LIB$ac_delim
 DEAL_II_DEFINE_DEAL_II_USE_PETSC!$DEAL_II_DEFINE_DEAL_II_USE_PETSC$ac_delim
 DEAL_II_EXPAND_TRILINOS_VECTOR!$DEAL_II_EXPAND_TRILINOS_VECTOR$ac_delim
+DEAL_II_EXPAND_TRILINOS_MPI_VECTOR!$DEAL_II_EXPAND_TRILINOS_MPI_VECTOR$ac_delim
 DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR!$DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR$ac_delim
+DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR!$DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR$ac_delim
 USE_CONTRIB_TRILINOS!$USE_CONTRIB_TRILINOS$ac_delim
 DEAL_II_TRILINOS_DIR!$DEAL_II_TRILINOS_DIR$ac_delim
 DEAL_II_TRILINOS_SHARED!$DEAL_II_TRILINOS_SHARED$ac_delim
@@ -14757,7 +14765,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 31; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

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.