summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-09-21 14:52:31 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-09-22 07:59:55 +1000
commit4c8f834da6c8c84849313453fe223a8165c6afc0 (patch)
treeff3f45ab388371055d54e33263ddebd9a4bfae55
parent977953bf14858d17c22208c848854ddbe7e86527 (diff)
configure: fix up check for tslib.
Reduce the tslib-check to the pkg-config check only instead of the previous library symbol check followd by a pkg-config check. This patch also reduces the required version of tslib back down to tslib-0.0. Unfortunately, the 1.0 tarball available through http://tslib.berlios.de/ still announces itself as 0.0.2. Reported-by: Werner Landgraf Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--configure.ac24
1 files changed, 8 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac
index bb4594130..93788cb7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1858,19 +1858,19 @@ if test "$KDRIVE" = yes; then
KDRIVEFBDEVLIB=yes
AC_DEFINE(KDRIVEFBDEV, 1, [Build fbdev-based kdrive server])
fi
-
- # tslib...
- AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
- if test "x$TSLIB" = xauto && test "x$HAVE_TSLIB" = xyes; then
- TSLIB=yes
+
+
+ PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
+ if test "x$HAVE_TSLIB" = xauto; then
+ TSLIB="$HAVE_TSLIB"
fi
if test "x$TSLIB" = xyes; then
if ! test "x$HAVE_TSLIB" = xyes; then
- AC_MSG_ERROR([tslib must be installed to build the tslib input driver.])
+ AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/])
+ else
+ AC_DEFINE(TSLIB, 1, [Have tslib support])
fi
- TSLIB_LIBS="-lts"
- AC_DEFINE(TSLIB, 1, [Have tslib support])
fi
AC_CHECK_HEADERS([SDL/SDL.h])
@@ -1902,14 +1902,6 @@ if test "$KDRIVE" = yes; then
AC_CHECK_FUNC([nanosleep], [],
AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt"))
- if test "x$TSLIB" = xyes; then
- PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
- if test "x$HAVE_TSLIB" = xno; then
- AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/])
- fi
- AC_DEFINE(TSLIB, 1, [Have tslib support])
- fi
-
# damage shadow extension glx (NOTYET) fb mi
KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'
KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_DAMAGE_INC $MIEXT_SHADOW_INC $XEXT_INC $FB_INC $MI_INC"