From: Wolfgang Bangerth Date: Wed, 2 Mar 2011 17:06:50 +0000 (+0000) Subject: Regenerate. X-Git-Tag: v8.0.0~4246 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ba347d30353e9310c1368ea7b5ca7ea6a0874aa;p=dealii.git 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 8b839c3b6c..9a02fcb3ac 100755 --- 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=""