Skip to content

Commit

Permalink
Require evemu 1.0.10
Browse files Browse the repository at this point in the history
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
  • Loading branch information
whot committed Jan 23, 2013
1 parent 9ff50b5 commit a33a395
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 17 deletions.
12 changes: 1 addition & 11 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,7 @@ AC_PROG_INSTALL
LT_LIB_M

PKG_CHECK_MODULES([MTDEV], [mtdev >= 1.1])
PKG_CHECK_MODULES([EVEMU], [utouch-evemu >= 1.0])

OLD_CFLAGS="$CFLAGS"
OLD_LDFLAGS="$LDFLAGS"
CFLAGS="$CFLAGS $EVEMU_CFLAGS"
LDFLAGS="$LDFLAGS $EVEMU_LIBS"
AC_CHECK_LIB(utouch-evemu, evemu_get_abs_current_value,
AC_DEFINE(EVEMU_HAVE_GET_ABS_CURRENT_VALUE, 1, [evemu provides evemu_get_abs_current_value]))
CFLAGS="$OLD_CFLAGS"
LDFLAGS="$OLD_LDFLAGS"

PKG_CHECK_MODULES([EVEMU], [evemu >= 1.0.10])

PKG_CHECK_MODULES([X11], [x11])
PKG_CHECK_MODULES([CAIRO], [cairo])
Expand Down
6 changes: 0 additions & 6 deletions tools/mtview.c
Original file line number Diff line number Diff line change
Expand Up @@ -421,13 +421,7 @@ static void init_touches(const struct evemu_device *dev,

t->has_mt = 1;
t->ntouches = ntouches;
#if EVEMU_HAVE_GET_ABS_CURRENT_VALUE
t->current_slot = evemu_get_abs_current_value(dev, ABS_MT_SLOT);
#else
t->current_slot = -1;
msg("Cannot get current slot value from evemu.\n"
"You may not see touchpoints until two or more touchpoints are triggered\n");
#endif

t->minx = evemu_get_abs_minimum(dev, ABS_MT_POSITION_X);
t->maxx = evemu_get_abs_maximum(dev, ABS_MT_POSITION_X);
Expand Down

0 comments on commit a33a395

Please sign in to comment.