summaryrefslogtreecommitdiff
authorPeter Hutterer <peter.hutterer@who-t.net>2009-09-23 02:32:44 (GMT)
committer Peter Hutterer <peter.hutterer@who-t.net>2009-09-24 04:52:15 (GMT)
commit3b5bbb149d4c932d9624336f5cbe9fe71c87bea3 (patch) (side-by-side diff)
tree745c9458befccc16d3021cd022938741a2211d85
parent5402f18d9c3f7ba19cc05b3a814e3a9e94c8d551 (diff)
downloadxserver-3b5bbb149d4c932d9624336f5cbe9fe71c87bea3.zip
xserver-3b5bbb149d4c932d9624336f5cbe9fe71c87bea3.tar.gz
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>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac6
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 4e38fc0..b3acbdd 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