From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 21 Oct 2008 13:49:46 +0000 (+0000)
Subject: Use DEAL_II_TRILINOS_LIBDIR instead of DEAL_II_TRILINOS_DIR/lib since the latter... 
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e0f3859df3e9c1f9c60b1d05c0c8f16ea7ee0b1;p=dealii-svn.git

Use DEAL_II_TRILINOS_LIBDIR instead of DEAL_II_TRILINOS_DIR/lib since the latter is not defined when using --with-trilinis-libs/--with-trilinos-include

git-svn-id: https://svn.dealii.org/trunk@17290 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4
index 4cbbffb24e..00ed3ab2b6 100644
--- a/deal.II/aclocal.m4
+++ b/deal.II/aclocal.m4
@@ -5674,9 +5674,9 @@ AC_DEFUN(DEAL_II_CHECK_TRILINOS_SHARED_STATIC, dnl
   dnl If we use shared libs (and we've made sure above that Trilinos provides
   dnl these as well), then set some of the LD_FLAGS and similar
   if test "x$enableshared" = "xyes" ; then
-    LDFLAGS="$LDFLAGS -L$DEAL_II_TRILINOS_DIR/lib"
+    LDFLAGS="$LDFLAGS -L$DEAL_II_TRILINOS_LIBDIR"
     if test "x$LD_PATH_OPTION" != "xno" ; then
-      LDFLAGS="$LDFLAGS $LD_PATH_OPTION$DEAL_II_TRILINOS_DIR/lib"
+      LDFLAGS="$LDFLAGS $LD_PATH_OPTION$DEAL_II_TRILINOS_LIBDIR"
     fi
   fi
 ])
diff --git a/deal.II/configure b/deal.II/configure
index 28f5beda32..f67cd0bbc9 100755
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -12362,9 +12362,9 @@ echo "$as_me: error: When building deal.II with shared libraries, Trilinos also
   fi
 
       if test "x$enableshared" = "xyes" ; then
-    LDFLAGS="$LDFLAGS -L$DEAL_II_TRILINOS_DIR/lib"
+    LDFLAGS="$LDFLAGS -L$DEAL_II_TRILINOS_LIBDIR"
     if test "x$LD_PATH_OPTION" != "xno" ; then
-      LDFLAGS="$LDFLAGS $LD_PATH_OPTION$DEAL_II_TRILINOS_DIR/lib"
+      LDFLAGS="$LDFLAGS $LD_PATH_OPTION$DEAL_II_TRILINOS_LIBDIR"
     fi
   fi