From 38202fc2938dfed15fd75f664469a6631d21633a Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Fri, 23 Nov 2012 10:11:05 +0000 Subject: [PATCH] Fix error message when deal.II uses static libraries and Trilinos shared ones. git-svn-id: https://svn.dealii.org/trunk@27673 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 2 +- deal.II/configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 85da1c5535..92254d9f81 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -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 diff --git a/deal.II/configure b/deal.II/configure index 5d843cb4e1..df5a12c572 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -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 -- 2.39.5