From 6e89fd183242feb7b5b9979aeb8d5cde78328c78 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 24 Mar 2009 15:23:33 +0100 Subject: [PATCH] configure: Always set LDPATH, rpath support is broken on many platforms. --- configure | 5 ----- configure.ac | 6 ------ 2 files changed, 11 deletions(-) diff --git a/configure b/configure index a4808b557f..ec1417216f 100755 --- a/configure +++ b/configure @@ -18069,11 +18069,6 @@ case $build_os in ;; darwin*|macosx*) ;; - linux*|solaris*) if test -z "$LDRPATH_LOCAL" - then - LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\"" - fi - ;; *) LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\"" ;; diff --git a/configure.ac b/configure.ac index 78ea5db4e6..d4064e537d 100644 --- a/configure.ac +++ b/configure.ac @@ -1403,12 +1403,6 @@ case $build_os in ;; darwin*|macosx*) ;; - linux*|solaris*) dnl FIXME: What other platforms support $ORIGIN? - if test -z "$LDRPATH_LOCAL" - then - LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\"" - fi - ;; *) LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\"" ;;