[PATCH input-mouse 06/14] config: optional extension check for inputproto not required

[Gaetan Nadon]

The check should be in PKG_CHECK_MODULES permanently.

The XORG_DRIVER_CHECK_EXT will add inputproto to PKG_CHECK_MODULES
only if the extension is available. By definition, this extension
is an integral part of the server and is always present.

The server always sets XINPUT macro to 1.
The conditional code was removed

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 configure.ac |    5 +----
 src/mouse.c  |    4 ----
 2 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 407b499..e52d149 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,11 +56,8 @@ AC_ARG_WITH(xorg-module-dir,
 inputdir=${moduledir}/input
 AC_SUBST(inputdir)
 
-# Checks for extensions
-XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
-
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.5.99.901] xproto $REQUIRED_MODULES)
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.5.99.901] xproto inputproto)
 
 # Checks for libraries.
 
diff --git a/src/mouse.c b/src/mouse.c
index 148a9d5..c95be76 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -58,14 +58,10 @@
 
 #include "xf86.h"
 
-#ifdef XINPUT
 #include <X11/extensions/XI.h>
 #include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"
-#else
-#include "inputstr.h"
-#endif
 
 #include "xf86Xinput.h"
 #include "xf86_OSproc.h"
-- 
1.6.0.4