Alexandre Julliard : configure: Always set LDPATH, rpath support is broken on many platforms.

Alexandre Julliard julliard at winehq.org
Wed Mar 25 10:31:28 CDT 2009


Module: wine
Branch: master
Commit: 6e89fd183242feb7b5b9979aeb8d5cde78328c78
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6e89fd183242feb7b5b9979aeb8d5cde78328c78

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Mar 24 15:23:33 2009 +0100

configure: Always set LDPATH, rpath support is broken on many platforms.

---

 configure    |    5 -----
 configure.ac |    6 ------
 2 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index a4808b5..ec14172 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 78ea5db..d4064e5 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\""
     ;;




More information about the wine-cvs mailing list