diff options
| author | marha <marha@users.sourceforge.net> | 2010-10-19 21:03:53 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-10-19 21:03:53 +0000 |
| commit | be10ad8a9efe4131c14c2dde36adaf11e7b125aa (patch) | |
| tree | 0a0f9305b181d427c5581f7a072e69e52199bdbb /xorg-server/configure.ac | |
| parent | 2197318e5fc026ee57325ce953113d1963e7dc82 (diff) | |
| parent | 6ab3babba7b1b74528c2194a495fa1e2e67faa55 (diff) | |
| download | vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.tar.gz vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.tar.bz2 vcxsrv-be10ad8a9efe4131c14c2dde36adaf11e7b125aa.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/configure.ac')
| -rw-r--r-- | xorg-server/configure.ac | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index 0d97d488a..b53b3aaa8 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -2034,7 +2034,10 @@ if test "$KDRIVE" = yes; then PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
if test "x$HAVE_TSLIB" = xno; then
- AC_CHECK_LIB(ts, ts_open, [HAVE_TSLIB="yes"])
+ AC_CHECK_LIB(ts, ts_open, [
+ HAVE_TSLIB="yes"
+ TSLIB_LIBS="-lts"
+ ])
fi
if test "xTSLIB" = xauto; then
@@ -2119,7 +2122,7 @@ if test "$KDRIVE" = yes; then KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_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="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS"
+ KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS"
AC_SUBST([XEPHYR_LIBS])
AC_SUBST([XEPHYR_INCS])
|