ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Don't set LDPATH if not needed.

This commit is contained in:
Alexandre Julliard 2007-07-02 14:38:04 +02:00
parent 446befbb4d
commit 3a0233d63f
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -14089,12 +14089,18 @@ 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\""

15
configure.ac
View File

@ -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