Alexandre Julliard : configure: Don't set LDPATH if not needed.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Jul  2 14:38:04 2007 +0200

configure: Don't set LDPATH if not needed.

---

 configure    |   14 ++++++++++----
 configure.ac |   15 ++++++++++++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 0cbc031..31ca6df 100755
--- a/configure
+++ b/configure
@@ -14089,16 +14089,22 @@ If you are using Linux, you will need a newer binutils.
    { (exit 1); exit 1; }; }
 fi
 
+LDPATH=""
+
 case $build_os in
   cygwin*|mingw32*)
     LDPATH="PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\""
- ;;
+    ;;
   darwin*|macosx*)
-    LDPATH="DYLD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$DYLD_LIBRARY_PATH\""
- ;;
+    ;;
+  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\""
- ;;
+    ;;
 esac
 
 case $host_os in
diff --git a/configure.ac b/configure.ac
index c15b12f..c64fe05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1064,13 +1064,22 @@ If you are using Linux, you will need a newer binutils.]
 )
 fi
 
+AC_SUBST(LDPATH,"")
 case $build_os in
   cygwin*|mingw32*)
-    AC_SUBST(LDPATH,"PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\"") ;;
+    LDPATH="PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\""
+    ;;
   darwin*|macosx*)
-    AC_SUBST(LDPATH,"DYLD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$DYLD_LIBRARY_PATH\"") ;;
+    ;;
+  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
+    ;;
   *)
-    AC_SUBST(LDPATH,"LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\"") ;;
+    LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\""
+    ;;
 esac
 
 dnl Mingw needs explicit msvcrt for linking libwine and winsock for wininet