[PATCH] configure: fix up tslib check once again.
peter.hutterer at who-t.net
Tue Sep 22 23:35:48 PDT 2009
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
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
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
@@ -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"])
+ if test "xTSLIB" = xauto; then
More information about the xorg-devel