xserver: Branch 'master' - 2 commits

[Keith Packard]

 configure.ac |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 8806a04f7f028dd9f6a7ff5c36e460d3895c7deb
Author: Michał Górny <mgorny at gentoo.org>
Date:   Thu Oct 14 15:49:51 2010 +0200

    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 at gentoo.org>
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 6d63663..e8f9473 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2122,7 +2122,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])
commit c7e436e9987a6fb0876c63e96f59ff4c20b4bef0
Author: Michał Górny <mgorny at gentoo.org>
Date:   Thu Oct 14 15:49:50 2010 +0200

    kdrive: Fix tslib check fallback to set TSLIB_LIBS. #30599
    
    If pkg-config is unable to find tslib but the fallback check does find
    it, the compilation continues with tslib support enabled though
    TSLIB_LIBS are unset. Thus, the compilation fails with a linking error
    on tslib functions.
    
    This patch sets TSLIB_LIBS to '-lts' whenever the tslib fallback check
    succeeds.
    
    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=30599
    Signed-off-by: Michał Górny <mgorny at gentoo.org>
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index c0bf98f..6d63663 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2034,7 +2034,10 @@ if test "$KDRIVE" = yes; then
 
     PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
     if test "x$HAVE_TSLIB" = xno; then
-        AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
+        AC_CHECK_LIB(ts, ts_open, [
+			HAVE_TSLIB="yes"
+			TSLIB_LIBS="-lts"
+		])
     fi
 
     if test "xTSLIB" = xauto; then