diff --git a/configure b/configure
index 0cbc031..31ca6df 100755
--- a/configure
+++ b/configure
@@ -14089,16 +14089,22 @@
    { (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