/[gentoo-x86]/x11-base/xorg-server/files/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch
Gentoo

Contents of /x11-base/xorg-server/files/0001-Fix-tslib-check-fallback-to-set-TSLIB_LIBS.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Wed May 4 11:20:16 2011 UTC (3 years, 2 months ago) by scarabeus
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
old

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

1 From 7cf37a8247205335657dd7a644856bbaf619b7ce Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
3 Date: Mon, 4 Oct 2010 18:38:44 +0200
4 Subject: [PATCH 1/2] Fix tslib check fallback to set TSLIB_LIBS.
5
6 If pkg-config is unable to find tslib but the fallback check does find
7 it, the compilation continues with tslib support enabled though
8 TSLIB_LIBS is unset. Thus, the compilation fails with a linking error on
9 tslib functions.
10
11 This patch sets TSLIB_LIBS to '-lts' whenever the tslib fallback check
12 succeds.
13 ---
14 configure.ac | 5 ++++-
15 1 files changed, 4 insertions(+), 1 deletions(-)
16
17 diff --git a/configure.ac b/configure.ac
18 index c0bf98f..6d63663 100644
19 --- a/configure.ac
20 +++ b/configure.ac
21 @@ -2034,7 +2034,10 @@ if test "$KDRIVE" = yes; then
22
23 PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
24 if test "x$HAVE_TSLIB" = xno; then
25 - AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
26 + AC_CHECK_LIB(ts, ts_open, [
27 + HAVE_TSLIB="yes"
28 + TSLIB_LIBS="-lts"
29 + ])
30 fi
31
32 if test "xTSLIB" = xauto; then
33 --
34 1.7.3.1

  ViewVC Help
Powered by ViewVC 1.1.20