Require libXi 1.2 and inputproto 1.5.

Device properties are available in a released libXi version now, so there's no
need to keep them conditional, make 1.5 mandatory.

We also have the explicit check for XI2 functions in libXi, so there's no need
to have requirements for inputproto 1.9.99.5.

diff --git a/configure.ac b/configure.ac
index 24df61f..a439c68 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AC_PROG_CC
 AC_PROG_INSTALL
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XINPUT, x11 xext xi [inputproto >= 1.9.99.5])
+PKG_CHECK_MODULES(XINPUT, x11 xext [xi >= 1.2] [inputproto >= 1.5])
 
 LIBS="$XINPUT_LIBS $LIBS"
 AC_CHECK_FUNC(XSetClientPointer,AC_DEFINE(HAVE_XI2,1,[XInput Version 2 Enabled]))

diff --git a/src/Makefile.am b/src/Makefile.am
index 6ab00f3..1efddb8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,7 @@ xinput_LDADD = $(XINPUT_LIBS)
 
 
 if HAVE_XI2
-    xinput2_files = hierarchy.c setcp.c property.c
+    xinput2_files = hierarchy.c setcp.c
 endif # HAVE_XI2
 
 xinput_SOURCES = \
@@ -37,6 +37,7 @@ xinput_SOURCES = \
     setmode.c \
     setptr.c \
     state.c \
+    property.c \
     test.c \
     version.c \
     xinput.c \

diff --git a/src/xinput.c b/src/xinput.c
index ce19aae..6f41619 100644 (file)
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -106,6 +106,7 @@ static entry drivers[] =
       "<window> <device>",
       set_clientpointer
     },
+#endif
     { "list-props",
       "<device> [<device> ...]",
       list_props
@@ -126,7 +127,6 @@ static entry drivers[] =
       "<device> <property>",
       delete_prop
     },
-#endif
     {0, 0, 0
     }
 };