diff options
| author | Ross Burton <ross@burtonini.com> | 2008-04-22 16:28:39 +0100 |
|---|---|---|
| committer | Ross Burton <ross@burtonini.com> | 2008-04-22 16:28:39 +0100 |
| commit | b44e89f4683ffcfd75eaf39f1f37d7461db44689 (patch) | |
| tree | 0e0bdd039fdf3cc97dc9ffb75e03b121926b220c | |
| parent | 3848422d2354b7a5302fda92b05b0d728190e050 (diff) | |
Update to tslib 1.0
Update the pkgconfig checks to tslib 1.0, and fix the LIBS definitions.
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index efb6e6613..04d976c83 100644 --- a/configure.ac +++ b/configure.ac @@ -1942,7 +1942,7 @@ if test "$KDRIVE" = yes; then AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt")) if test "x$TSLIB" = xyes; then - PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"]) + 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 @@ -1966,10 +1966,10 @@ if test "$KDRIVE" = yes; then ;; esac KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' - KDRIVE_LOCAL_LIBS="$TSLIB_LIBS $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB" + KDRIVE_LOCAL_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB" KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS" KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB" - KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS" + KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS" # check if we can build Xephyr PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"]) |