From 3b5bbb149d4c932d9624336f5cbe9fe71c87bea3 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 23 Sep 2009 12:32:44 +1000 Subject: [PATCH] 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 Acked--by: Daniel Stone --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4e38fc09a..b3acbdd3c 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