commit 3a0233d63fac98eec677ce4bf56e5054d0c97417
author Alexandre Julliard <julliard@winehq.org> Mon Jul 02 14:38:04 2007 +0200
committer Alexandre Julliard <julliard@winehq.org> Mon Jul 02 14:38:04 2007 +0200
tree 32e0a3ef3ec10065281cb514cc65170ddf8a645e
parent 446befbb4dfa82f135729e9e92ae65d8c749290a

configure: Don't set LDPATH if not needed.

configure.ac

diff --git a/configure.ac b/configure.ac
index c15b12f..c64fe05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1064,13 +1064,22 @@
 )
 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