diff options
author | Michał Górny <mgorny@gentoo.org> | 2010-10-14 15:49:50 +0200 |
---|---|---|
committer | Jeremy Huddleston <jeremyhu@apple.com> | 2010-11-13 12:06:24 -0800 |
commit | 43020e1ac923fb3a7ef792722bcf9d30874f5bfe (patch) | |
tree | 7dcde85c4fa3b1a742a391819cc3a7c3707a649f | |
parent | 46314e1e7ad05d6ff6a2f722b09a76f2931db7f5 (diff) |
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@gentoo.org>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit c7e436e9987a6fb0876c63e96f59ff4c20b4bef0)
-rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 77cad5463..babc908d5 100644 --- a/configure.ac +++ b/configure.ac @@ -2037,7 +2037,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 |