]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fix error message when deal.II uses static libraries and Trilinos shared ones.
authorkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 23 Nov 2012 10:11:05 +0000 (10:11 +0000)
committerkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 23 Nov 2012 10:11:05 +0000 (10:11 +0000)
git-svn-id: https://svn.dealii.org/trunk@27673 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/configure

index 85da1c5535dfaab1924bbc9eea746ba63623f03c..92254d9f816a0180cc6f63dc438c685af1554abf 100644 (file)
@@ -6274,7 +6274,7 @@ AC_DEFUN(DEAL_II_CHECK_TRILINOS_SHARED_STATIC, dnl
   fi
 
   if test "x$enableshared" = "xno" -a "x$DEAL_II_TRILINOS_STATIC" != "xyes" ; then
-    AC_MSG_ERROR([When building deal.II with shared libraries, Trilinos also needs to be built with shared libraries])
+    AC_MSG_ERROR([When building deal.II with static libraries, Trilinos also needs to be built with static libraries])
   fi
 
   dnl If we use shared libs (and we've made sure above that Trilinos provides
index 5d843cb4e1414e40b63b2f2545d04fce97ac3c75..df5a12c5725590dd973770380d61eb1abe24fdb4 100755 (executable)
@@ -10816,7 +10816,7 @@ $as_echo "no" >&6; }
   fi
 
   if test "x$enableshared" = "xno" -a "x$DEAL_II_TRILINOS_STATIC" != "xyes" ; then
-    as_fn_error $? "When building deal.II with shared libraries, Trilinos also needs to be built with shared libraries" "$LINENO" 5
+    as_fn_error $? "When building deal.II with static libraries, Trilinos also needs to be built with static libraries" "$LINENO" 5
   fi
 
       if test "x$enableshared" = "xyes" ; then

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.