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 <[email protected]> --- Daniel, the second part was the motivation for the original fix. AC_CHECK_LIB couldn't find a tslib not installed in the system path. With the pkg-config check beforehand this is fixed now. configure.ac | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 9c817f0..98fe398 100644 --- a/configure.ac +++ b/configure.ac @@ -1863,7 +1863,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 -- 1.6.3.rc1.2.g0164.dirty _______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
