-AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst)
-if test "x$XTST_LIBS" = x; then
- save_LIBS="$LIBS"
- for xtstpath in /usr/X11R6/lib /usr/openwin/lib; do
- LIBS="-L$xtstpath -lXtst"
- AC_MSG_CHECKING(for -lXtst in $xtstpath)
- AC_TRY_LINK([], [XTestFakeKeyEvent()], [
- AC_MSG_RESULT(yes)
- XTST_LIBS="-L$xtstpath -lXtst"
- LIBS="$save_LIBS"
- break],[AC_MSG_RESULT(no)])
- done
- if test "x$XTST_LIBS" = x; then
- AC_MSG_ERROR(Couldn't find the Xtst library. Check config.log for details)
+AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, XTST_LIBS=-lXtst,[
+ AC_MSG_ERROR([Couldn't find the Xtst library. Check config.log])],
+ -lX11 -lXext)
+AC_SUBST(XTST_LIBS)
+
+have_xkb=
+AC_CHECK_LIB(X11, XkbQueryExtension, have_xkb="maybe")
+if test "x$have_xkb" = "xmaybe"; then
+ AC_CHECK_HEADER(X11/XKBlib.h, have_xkb=yes)
+fi
+if test "x$have_xkb" = "xyes"; then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_XKB)
+fi
+
+have_xinput=
+AC_CHECK_LIB(Xi, XOpenDevice, XINPUT_LIBS=-lXi)
+if test "x$XINPUT_LIBS" = x; then
+ AC_MSG_ERROR(Couldn't find the XInput library. Check config.log for details)
+fi
+AC_CHECK_HEADER(X11/extensions/XInput.h, have_xinput=yes)
+AC_SUBST(XINPUT_LIBS)
+
+dnl Allow disabling XEViE.
+AC_ARG_ENABLE(xevie, [ --enable-xevie Build with XEViE support [default=yes]], enable_xevie="$enableval", enable_xevie=yes)
+
+if test x$enable_xevie = xyes ; then
+ have_xevie=
+ AC_CHECK_LIB(Xext, XevieQueryVersion, have_xevie="yes")
+
+ if test "x$have_xevie" = "xyes"; then
+ XEVIE_LIBS=-lXext
+ AC_DEFINE(HAVE_XEVIE)