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
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)
])
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
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"
+
+
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"
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
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