From 33b2aab5bbf0b974fb10b898f4ca5463654d51c0 Mon Sep 17 00:00:00 2001 From: bangerth Date: Thu, 16 Oct 2008 19:40:13 +0000 Subject: [PATCH] Only use -rpath if the system actually supports it. git-svn-id: https://svn.dealii.org/trunk@17245 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 5 ++++- deal.II/configure | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 51018b8a91..38e5920057 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -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 ]) diff --git a/deal.II/configure b/deal.II/configure index fa328cb05b..817dcbc346 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -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 -- 2.39.5