]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Set path to trilinos if using shared libs.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 7 Jul 2008 16:47:09 +0000 (16:47 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 7 Jul 2008 16:47:09 +0000 (16:47 +0000)
git-svn-id: https://svn.dealii.org/trunk@16424 0785d39b-7218-0410-832d-ea1e28bc413d

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

index 3a4a76db4172b9b04887eca10640cb37e7a3a53e..a475bdff5691e593725d855d93181f910963bded 100644 (file)
@@ -5386,6 +5386,12 @@ AC_DEFUN(DEAL_II_CHECK_TRILINOS_SHARED_STATIC, dnl
     AC_MSG_ERROR([When building deal.II with shared libraries, Trilinos also
                   needs to be built with shared libraries])
   fi
+
+  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 -Wl,-rpath,$DEAL_II_TRILINOS_DIR/lib"
+  fi
 ])
 
 
index db255a6867d3a9f9a374f10289ca30afcd4a66e3..82fc0813d8e9f20e6ddb6942a6abd9cb2ca4f58b 100755 (executable)
@@ -13336,6 +13336,10 @@ echo "$as_me: error: When building deal.II with shared libraries, Trilinos also
    { (exit 1); exit 1; }; }
   fi
 
+      if test "x$enableshared" = "xyes" ; then
+    LDFLAGS="$LDFLAGS -L$DEAL_II_TRILINOS_DIR/lib -Wl,-rpath,$DEAL_II_TRILINOS_DIR/lib"
+  fi
+
 
         if test "x$with_trilinos" = "x" ; then
       with_trilinos="yes"

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.