summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-09-23 12:32:44 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-09-25 09:14:58 +1000
commita9e2f7ac15f426560ac01689ec66f2db32424884 (patch)
tree057be734674034b60d0247de43c0731de49c861c /configure.ac
parent1f74cfdeacb88b466d8f2005af191db30dde2a86 (diff)
configure: fix up tslib check once again.
This patch addresses two issues: The check for HAVE_TSLIB = xauto can never be true, the check has been corrected to TSLIB = xauto. Pre-pkgconfig versions of tslib fail to be found, this patch restores the additional AC_CHECK_LIB. However, the pgk-config check must happen before AC_CHECK_LIB, as AC_CHECK_LIB does not seem to honour the LD_LIBRARY_PATH. Thus, if tslib is installed outside of the default paths, AC_CHECK_LIB fails. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked--by: Daniel Stone <daniel@fooishbar.org> (cherry picked from commit 3b5bbb149d4c932d9624336f5cbe9fe71c87bea3)
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac6
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index db5325ee9..40cd017eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1861,7 +1861,11 @@ if test "$KDRIVE" = yes; then
PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
- if test "x$HAVE_TSLIB" = xauto; then
+ if test "x$HAVE_TSLIB" = xno; then
+ AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
+ fi
+
+ if test "xTSLIB" = xauto; then
TSLIB="$HAVE_TSLIB"
fi