From b14e4fad1ed1891d728d7c821afcd91047367b67 Mon Sep 17 00:00:00 2001 From: bangerth Date: Mon, 19 Jan 2009 01:48:58 +0000 Subject: [PATCH] Revise the SPARSITY_PATTERN expansion. git-svn-id: https://svn.dealii.org/trunk@18243 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 2 ++ deal.II/common/template-arguments.in | 11 ++++++----- deal.II/configure | 6 +++++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index bf81fe30cb..05f473cf6f 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -5901,6 +5901,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_TRILINOS, dnl DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR="TrilinosWrappers::BlockVector" DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR="TrilinosWrappers::MPI::BlockVector" DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN="TrilinosWrappers::SparsityPattern" + DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN="TrilinosWrappers::BlockSparsityPattern" dnl Finally set with_trilinos if this hasn't happened yet if test "x$with_trilinos" = "x" ; then @@ -5915,6 +5916,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_TRILINOS, dnl AC_SUBST(DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR) AC_SUBST(DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR) AC_SUBST(DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN) + AC_SUBST(DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN) ]) diff --git a/deal.II/common/template-arguments.in b/deal.II/common/template-arguments.in index 687061fe3d..e412dd9665 100644 --- a/deal.II/common/template-arguments.in +++ b/deal.II/common/template-arguments.in @@ -35,9 +35,10 @@ SPARSITY_PATTERNS := { SparsityPattern; CompressedSparsityPattern; CompressedSetSparsityPattern; CompressedSimpleSparsityPattern; - @DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN@; } + @DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN@; -BLOCK_SPARSITY_PATTERNS := { BlockSparsityPattern; - BlockCompressedSparsityPattern; - BlockCompressedSetSparsityPattern; - BlockCompressedSimpleSparsityPattern; } + BlockSparsityPattern; + BlockCompressedSparsityPattern; + BlockCompressedSetSparsityPattern; + BlockCompressedSimpleSparsityPattern; + @DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN@; } diff --git a/deal.II/configure b/deal.II/configure index 72d6ec8ec5..8686662851 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -734,6 +734,7 @@ DEAL_II_EXPAND_TRILINOS_MPI_VECTOR DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN +DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN USE_CONTRIB_TRILINOS DEAL_II_TRILINOS_INCDIR DEAL_II_TRILINOS_LIBDIR @@ -13442,6 +13443,7 @@ done DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR="TrilinosWrappers::BlockVector" DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR="TrilinosWrappers::MPI::BlockVector" DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN="TrilinosWrappers::SparsityPattern" + DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN="TrilinosWrappers::BlockSparsityPattern" if test "x$with_trilinos" = "x" ; then with_trilinos="yes" @@ -13463,6 +13465,7 @@ done + 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" @@ -17309,6 +17312,7 @@ 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 DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN!$DEAL_II_EXPAND_TRILINOS_SPARSITY_PATTERN$ac_delim +DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN!$DEAL_II_EXPAND_TRILINOS_BLOCK_SPARSITY_PATTERN$ac_delim USE_CONTRIB_TRILINOS!$USE_CONTRIB_TRILINOS$ac_delim DEAL_II_TRILINOS_INCDIR!$DEAL_II_TRILINOS_INCDIR$ac_delim DEAL_II_TRILINOS_LIBDIR!$DEAL_II_TRILINOS_LIBDIR$ac_delim @@ -17335,7 +17339,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` = 43; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 44; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -- 2.39.5