diff options
| author | Thomas Klausner <tk@giga.or.at> | 2014-05-19 11:48:47 +0300 |
|---|---|---|
| committer | Thomas Klausner <tk@giga.or.at> | 2014-05-19 11:48:47 +0300 |
| commit | 32123f5a602dd3b581e46aead900f31257f0e163 (patch) | |
| tree | 2ccd3283b64177dd3fa06a809e749d50badaee15 | |
| parent | 03dda50f8e56f8f353c0b015b90128a8c1d0853e (diff) | |
| download | xine-lib-32123f5a602dd3b581e46aead900f31257f0e163.tar.gz xine-lib-32123f5a602dd3b581e46aead900f31257f0e163.tar.bz2 | |
libw32dll linker fix
libw32dll on NetBSD uses i386_set_ldt. This function lives in libi386.so, so this needs to be linked.
For this reason, lhe attached patches test for i386_set_ldt in libi386 and add it to the linker command line if found.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/libw32dll/wine/Makefile.am | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 214a5c4b8..7a5038778 100644 --- a/configure.ac +++ b/configure.ac @@ -272,6 +272,10 @@ AC_CHECK_LIB([nsl], [gethostbyname], [NET_LIBS="-lnsl $NET_LIBS"]) AC_CHECK_LIB([resolv], [hstrerror], [NET_LIBS="-lresolv $NET_LIBS"]) AC_SUBST(NET_LIBS) +WINE_LIBS="" +AC_CHECK_LIB(i386, i386_set_ldt, WINE_LIBS="-li386 $WINE_LIBS",) +AC_SUBST(WINE_LIBS) + AC_CHECK_LIB([rt], [clock_getres], [RT_LIBS="-lrt" AC_DEFINE(HAVE_POSIX_TIMERS, 1, [Define this if you have POSIX timers.])], diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am index a3aeb5684..a09ee27e9 100644 --- a/src/libw32dll/wine/Makefile.am +++ b/src/libw32dll/wine/Makefile.am @@ -51,6 +51,8 @@ noinst_HEADERS = \ noinst_LTLIBRARIES = libwine.la +libwine_la_LIBADD = ${WINE_LIBS} + libwine_la_SOURCES = \ afl.c \ driver.c \ |