]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Only use -rpath if the system actually supports it.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 16 Oct 2008 19:40:13 +0000 (19:40 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 16 Oct 2008 19:40:13 +0000 (19:40 +0000)
git-svn-id: https://svn.dealii.org/trunk@17245 0785d39b-7218-0410-832d-ea1e28bc413d

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

index 51018b8a91f5ed097768d378d6d713976e834fd3..38e5920057abe5cf1ff492b4c9cb72db505e6a3f 100644 (file)
@@ -5535,7 +5535,10 @@ 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 -Wl,-rpath,$DEAL_II_TRILINOS_DIR/lib"
+    LDFLAGS="$LDFLAGS -L$DEAL_II_TRILINOS_DIR/lib"
+    if test "x$LD_PATH_OPTION" != "xno" ; then
+      LDFLAGS="$LDFLAGS $LD_PATH_OPTION$DEAL_II_TRILINOS_DIR/lib"
+    fi
   fi
 ])
 
index fa328cb05b2fb5931c9845e2b33971adc64a82e7..817dcbc34693a6d12446a520e54cc368693c99cf 100755 (executable)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 16704 .
+# From configure.in Revision: 17154 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for deal.II 6.2.pre.
 #
@@ -12220,7 +12220,10 @@ 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 -Wl,-rpath,$DEAL_II_TRILINOS_DIR/lib"
+    LDFLAGS="$LDFLAGS -L$DEAL_II_TRILINOS_DIR/lib"
+    if test "x$LD_PATH_OPTION" != "xno" ; then
+      LDFLAGS="$LDFLAGS $LD_PATH_OPTION$DEAL_II_TRILINOS_DIR/lib"
+    fi
   fi
 
 

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.