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

configure: Store all libraries in libdir on Android.

This commit is contained in:
Alexandre Julliard 2013-09-26 17:58:38 +02:00
parent 90520f7fc4
commit 770d902d10
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Make.vars.in
View File

@ -10,7 +10,7 @@ infodir = @infodir@
mandir = @mandir@ mandir = @mandir@
fontdir = $(datadir)/wine/fonts fontdir = $(datadir)/wine/fonts
includedir = @includedir@/wine includedir = @includedir@/wine
dlldir = @libdir@/wine dlldir = @dlldir@
fakedlldir = $(dlldir)/fakedlls fakedlldir = $(dlldir)/fakedlls
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@

4
configure vendored
View File

@ -715,6 +715,7 @@ IMPLIBEXT
DLLFLAGS DLLFLAGS
DLLPREFIX DLLPREFIX
DLLEXT DLLEXT
dlldir
CPP CPP
OPENGL_LIBS OPENGL_LIBS
XLIB XLIB
@ -6408,6 +6409,8 @@ done
dlldir="\${libdir}/wine"
DLLEXT="" DLLEXT=""
DLLPREFIX="" DLLPREFIX=""
@ -6904,6 +6907,7 @@ clean::
DLLFLAGS="$DLLFLAGS -fPIC" DLLFLAGS="$DLLFLAGS -fPIC"
DLLEXT=".so" DLLEXT=".so"
DLLPREFIX="lib" DLLPREFIX="lib"
dlldir="\${libdir}"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--export-dynamic" >&5
$as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; } $as_echo_n "checking whether the compiler supports -fPIC -Wl,--export-dynamic... " >&6; }
if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then : if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then :

2
configure.ac
View File

@ -676,6 +676,7 @@ AC_CHECK_HEADERS([libprocstat.h],,,
dnl **** Check for working dll **** dnl **** Check for working dll ****
AC_SUBST(dlldir,"\${libdir}/wine")
AC_SUBST(DLLEXT,"") AC_SUBST(DLLEXT,"")
AC_SUBST(DLLPREFIX,"") AC_SUBST(DLLPREFIX,"")
AC_SUBST(DLLFLAGS,"-D_REENTRANT") AC_SUBST(DLLFLAGS,"-D_REENTRANT")
@ -873,6 +874,7 @@ clean::
DLLFLAGS="$DLLFLAGS -fPIC" DLLFLAGS="$DLLFLAGS -fPIC"
DLLEXT=".so" DLLEXT=".so"
DLLPREFIX="lib" DLLPREFIX="lib"
dlldir="\${libdir}"
WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic],
[AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])]) [AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])])
WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib], WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],