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

6e89fd18 · Alexandre Julliard · 25c2e283 · 6e89fd18 · 6e89fd18
Commit 6e89fd18 authored Mar 24, 2009 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 11 deletions

configure configure +0 -5

configure.ac configure.ac +0 -6

No files found.
--- 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\""
    ;;

--- 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\""
    ;;