summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2010-10-14 15:49:51 +0200
committerJeremy Huddleston <jeremyhu@apple.com>2010-11-13 12:06:33 -0800
commit4c85d94bf70cea583f15d60be5c9127caae3a79f (patch)
tree5b8025f7985679cd22bd3b6716f679b889d0cef5
parent43020e1ac923fb3a7ef792722bcf9d30874f5bfe (diff)
kdrive: Fix linking with tslib, with -Wl, --as-needed. #30600
Change the library order in TSLIB_LIBS variable, placing ${TSLIB_LIBS} after the local static libraries. This fixes linking with -Wl,--as-needed. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=30600 Signed-off-by: Michał Górny <mgorny@gentoo.org> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Keith Packard <keithp@keithp.com> (cherry picked from commit 8806a04f7f028dd9f6a7ff5c36e460d3895c7deb)
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index babc908d5..6f8b5da7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2125,7 +2125,7 @@ if test "$KDRIVE" = yes; then
KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB"
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
- KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS"
+ KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS"
AC_SUBST([XEPHYR_LIBS])
AC_SUBST([XEPHYR_INCS])