deal.II: trilinos package: safe major versioning

diff --git a/deal.II/packages/trilinos.package b/deal.II/packages/trilinos.package
index 9422db8ad718902ffbf74e320b1637696d525030..0c031d9accb471e93efbad40b823f590983a4745 100644 (file)
--- a/deal.II/packages/trilinos.package
+++ b/deal.II/packages/trilinos.package
@@ -1,17 +1,16 @@
-if [ ${TRILINOS_MAJOR_VERSION} = "AUTO" ]; then
-  TRILINOS_MAJOR_VERSION=12
-fi
+if [ ${TRILINOS_MAJOR_VERSION} = "AUTO" ] || [ ${TRILINOS_MAJOR_VERSION} = "12" ]; then
+  SOURCE=http://trilinos.csbsju.edu/download/files/
+  VERSION=12.2.1
+  CHECKSUM=760f14cbce482b4b9a41d1c18297b531
 
-if [ ${TRILINOS_MAJOR_VERSION} = "11" ]; then
+elif [ ${TRILINOS_MAJOR_VERSION} = "11" ]; then
   SOURCE=https://trilinos.org/oldsite/download/files/
   VERSION=11.6.2
   CHECKSUM=15ea6af5559f872919ff19fe5a322eb6
-fi
 
-if [ ${TRILINOS_MAJOR_VERSION} = "12" ]; then
-  SOURCE=http://trilinos.csbsju.edu/download/files/
-  VERSION=12.2.1
-  CHECKSUM=760f14cbce482b4b9a41d1c18297b531
+else
+  cecho ${BAD} "Unknown Trilinos version ${TRILINOS_MAJOR_VERSION} forced, please use AUTO|12|11."
+  exit
 fi
 
 NAME=trilinos-${VERSION}-Source