diff --git a/configure.ac b/configure.ac
index bf1ef6120c..244a5168dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2612,6 +2612,17 @@ AC_ARG_ENABLE([gesture],
    ],
    [want_gesture="no"])
 
+AC_ARG_ENABLE([xinput2],
+   [AC_HELP_STRING([--disable-xinput2], [disable X11 XInput2.h usage])],
+   [
+    if test "x${enableval}" = "xyes" ; then
+       want_xinput2="yes"
+    else
+       want_xinput2="no"
+    fi
+   ],
+   [want_xinput2="yes"])
+
 AC_ARG_ENABLE([xim],
    [AC_HELP_STRING([--disable-xim], [disable X Input Method.])],
    [
@@ -2752,6 +2763,8 @@ if test "x${want_x11_xlib}" = "xyes" ; then
 
    if test "${want_gesture}" = "yes"; then
       ECORE_CHECK_X_EXTENSION([Xgesture], [gesture.h], [Xgesture], [XGestureQueryExtension])
+   fi
+   if test "${want_xinput2}" = "yes"; then
       ECORE_CHECK_X_EXTENSION([Xi2], [XInput2.h], [Xi], [XIQueryDevice])
       ECORE_CHECK_X_EXTENSION([Xi2_2], [XInput2.h], [Xi], [XIGrabTouchBegin])
    fi
@@ -3443,7 +3456,7 @@ echo
 echo "Ecore Graphic systems:"
 echo
 
-echo "  Ecore_X....................: ${with_x11} (pixman=${want_pixman}) (gesture=${want_gesture})"
+echo "  Ecore_X....................: ${with_x11} (pixman=${want_pixman}) (gesture=${want_gesture}) (xinput2=${want_xinput2})"
 echo "  Ecore_Win32................: $have_win32"
 echo "  Ecore_Cocoa................: $have_ecore_cocoa"
 echo "  Ecore_SDL..................: $want_sdl"