Commit 770d902d authored by Alexandre Julliard's avatar Alexandre Julliard

configure: Store all libraries in libdir on Android.

parent 90520f7f
......@@ -10,7 +10,7 @@ infodir = @infodir@
mandir = @mandir@
fontdir = $(datadir)/wine/fonts
includedir = @includedir@/wine
dlldir = @libdir@/wine
dlldir = @dlldir@
fakedlldir = $(dlldir)/fakedlls
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
......
......@@ -715,6 +715,7 @@ IMPLIBEXT
DLLFLAGS
DLLPREFIX
DLLEXT
dlldir
CPP
OPENGL_LIBS
XLIB
......@@ -6408,6 +6409,8 @@ done
dlldir="\${libdir}/wine"
DLLEXT=""
DLLPREFIX=""
......@@ -6904,6 +6907,7 @@ clean::
DLLFLAGS="$DLLFLAGS -fPIC"
DLLEXT=".so"
DLLPREFIX="lib"
dlldir="\${libdir}"
{ $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; }
if ${ac_cv_cflags__fPIC__Wl___export_dynamic+:} false; then :
......
......@@ -676,6 +676,7 @@ AC_CHECK_HEADERS([libprocstat.h],,,
dnl **** Check for working dll ****
AC_SUBST(dlldir,"\${libdir}/wine")
AC_SUBST(DLLEXT,"")
AC_SUBST(DLLPREFIX,"")
AC_SUBST(DLLFLAGS,"-D_REENTRANT")
......@@ -873,6 +874,7 @@ clean::
DLLFLAGS="$DLLFLAGS -fPIC"
DLLEXT=".so"
DLLPREFIX="lib"
dlldir="\${libdir}"
WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic],
[AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])])
WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment