Update trilinos configuration for complex & float

diff --git a/deal.II-toolchain/packages/trilinos.package b/deal.II-toolchain/packages/trilinos.package
index 4c418b3db99591920741d13b918a6f067cb22e58..da20432e22082d280ac1d4ff62a6153943aa7f9a 100644 (file)
--- a/deal.II-toolchain/packages/trilinos.package
+++ b/deal.II-toolchain/packages/trilinos.package
@@ -236,6 +236,7 @@ CONFOPTS="\
   -D TPL_ENABLE_TBB:BOOL=OFF \
   -D Trilinos_VERBOSE_CONFIGURE:BOOL=OFF \
   -D Trilinos_ENABLE_EXPLICIT_INSTANTIATION=OFF \
+  -D Trilinos_ENABLE_FLOAT=ON \
   -D Trilinos_ENABLE_Amesos:BOOL=ON \
   -D Trilinos_ENABLE_Epetra:BOOL=ON \
   -D Trilinos_ENABLE_EpetraExt:BOOL=ON \
@@ -245,7 +246,6 @@ CONFOPTS="\
   -D Trilinos_ENABLE_AztecOO:BOOL=ON \
   -D Trilinos_ENABLE_Sacado:BOOL=ON \
   -D Trilinos_ENABLE_Teuchos:BOOL=ON \
-  -D   Teuchos_ENABLE_FLOAT:BOOL=ON \
   -D Trilinos_ENABLE_MueLu:BOOL=ON \
   -D Trilinos_ENABLE_ML:BOOL=ON \
   -D Trilinos_ENABLE_NOX:BOOL=ON \
@@ -263,9 +263,7 @@ CONFOPTS="\
 
 if [ ${TRILINOS_WITH_COMPLEX} = ON ]; then
     CONFOPTS="\
-    -D Trilinos_ENABLE_COMPLEX_DOUBLE=ON \
-    -D Trilinos_ENABLE_COMPLEX_FLOAT=ON \
-    -D Teuchos_ENABLE_COMPLEX:BOOL=ON \
+    -D Trilinos_ENABLE_COMPLEX=ON \
     ${CONFOPTS}"
 fi