Regenerate.

git-svn-id: https://svn.dealii.org/trunk@23456 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/configure b/deal.II/configure
index 8b839c3b6c0bae2ea31addaba5fbb9acebd28993..9a02fcb3ac9c7d0a4a4beac79fe420cc6627d52d 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -10387,7 +10387,7 @@ $as_echo "explicitly disabled" >&6; }
           USE_CONTRIB_TRILINOS=no
         else
          USE_CONTRIB_TRILINOS=yes
-          DEAL_II_TRILINOS_DIR="$withval"
+         DEAL_II_TRILINOS_DIR="$withval"
          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_TRILINOS_DIR" >&5
 $as_echo "$DEAL_II_TRILINOS_DIR" >&6; }
 
@@ -10403,17 +10403,23 @@ $as_echo "$DEAL_II_TRILINOS_DIR" >&6; }
 else
 
                 if test "x$TRILINOS_DIR" != "x" ; then
-         USE_CONTRIB_TRILINOS=yes
-          DEAL_II_TRILINOS_DIR="$TRILINOS_DIR"
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_TRILINOS_DIR" >&5
+                 if test "x$withval" = "xno" ; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: explicitly disabled" >&5
+$as_echo "explicitly disabled" >&6; }
+            USE_CONTRIB_TRILINOS=no
+          else
+           USE_CONTRIB_TRILINOS=yes
+           DEAL_II_TRILINOS_DIR="$TRILINOS_DIR"
+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEAL_II_TRILINOS_DIR" >&5
 $as_echo "$DEAL_II_TRILINOS_DIR" >&6; }
 
-                    if test ! -d $DEAL_II_TRILINOS_DIR/include \
-               -o ! -d $DEAL_II_TRILINOS_DIR/lib ; then
-            as_fn_error "The path to Trilinos specified in the TRILINOS_DIR environment variable does not point to a complete Trilinos installation" "$LINENO" 5
+                   if test ! -d $DEAL_II_TRILINOS_DIR/include \
+                -o ! -d $DEAL_II_TRILINOS_DIR/lib ; then
+             as_fn_error "The path to Trilinos specified in the TRILINOS_DIR environment variable does not point to a complete Trilinos installation" "$LINENO" 5
+           fi
+           DEAL_II_TRILINOS_INCDIR="$DEAL_II_TRILINOS_DIR/include"
+           DEAL_II_TRILINOS_LIBDIR="$DEAL_II_TRILINOS_DIR/lib"
          fi
-         DEAL_II_TRILINOS_INCDIR="$DEAL_II_TRILINOS_DIR/include"
-         DEAL_II_TRILINOS_LIBDIR="$DEAL_II_TRILINOS_DIR/lib"
         else
          USE_CONTRIB_TRILINOS=no
           DEAL_II_TRILINOS_DIR=""