[Xcb] [PATCH libxcb] Add XInput2 extension support, disabled by default.

[Daniel Martin]

---
 Makefile.am       |  3 +++
 configure.ac      |  3 +++
 src/.gitignore    |  1 +
 src/Makefile.am   |  8 ++++++++
 xcb-xinput2.pc.in | 11 +++++++++++
 5 files changed, 26 insertions(+)
 create mode 100644 xcb-xinput2.pc.in

diff --git a/Makefile.am b/Makefile.am
index 1f88b72..d4e86f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,6 +58,9 @@ endif
 if BUILD_XINPUT
 pkgconfig_DATA += xcb-xinput.pc
 endif
+if BUILD_XINPUT2
+pkgconfig_DATA += xcb-xinput2.pc
+endif
 if BUILD_XKB
 pkgconfig_DATA += xcb-xkb.pc
 endif
diff --git a/configure.ac b/configure.ac
index 7364383..0f7ba81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,6 +192,7 @@ XCB_EXTENSION(XFixes, "yes")
 XCB_EXTENSION(XFree86-DRI, "yes")
 XCB_EXTENSION(Xinerama, "yes")
 XCB_EXTENSION(XInput, "no")
+XCB_EXTENSION(XInput2, "no")
 XCB_EXTENSION(XKB, "no")
 XCB_EXTENSION(Xprint, "yes")
 XCB_EXTENSION(SELinux, "no")
@@ -236,6 +237,7 @@ xcb-xf86dri.pc
 xcb-xfixes.pc
 xcb-xinerama.pc
 xcb-xinput.pc
+xcb-xinput2.pc
 xcb-xkb.pc
 xcb-xprint.pc
 xcb-xselinux.pc
@@ -280,6 +282,7 @@ echo "    Xfixes..............: ${BUILD_XFIXES}"
 echo "    Xfree86-dri.........: ${BUILD_XFREE86_DRI}"
 echo "    xinerama............: ${BUILD_XINERAMA}"
 echo "    xinput..............: ${BUILD_XINPUT}"
+echo "    xinput2.............: ${BUILD_XINPUT2}"
 echo "    xkb.................: ${BUILD_XKB}"
 echo "    xprint..............: ${BUILD_XPRINT}"
 echo "    xtest...............: ${BUILD_XTEST}"
diff --git a/src/.gitignore b/src/.gitignore
index a402afe..8e29ff0 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -18,6 +18,7 @@ xf86dri.*
 xfixes.*
 xinerama.*
 xinput.*
+xinput2.*
 xkb.*
 xprint.*
 xselinux.*
diff --git a/src/Makefile.am b/src/Makefile.am
index 6b5a2c3..3555c69 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -168,6 +168,14 @@ libxcb_xinput_la_LIBADD = $(XCB_LIBS)
 nodist_libxcb_xinput_la_SOURCES = xinput.c xinput.h
 endif
 
+EXTSOURCES += xinput2.c
+if BUILD_XINPUT2
+lib_LTLIBRARIES += libxcb-xinput2.la
+libxcb_xinput2_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+libxcb_xinput2_la_LIBADD = $(XCB_LIBS)
+nodist_libxcb_xinput2_la_SOURCES = xinput2.c xinput2.h
+endif
+
 EXTSOURCES += xkb.c
 if BUILD_XKB
 lib_LTLIBRARIES += libxcb-xkb.la
diff --git a/xcb-xinput2.pc.in b/xcb-xinput2.pc.in
new file mode 100644
index 0000000..009433f
--- /dev/null
+++ b/xcb-xinput2.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB XInput
+Description: XCB XInput 2 Extension (EXPERIMENTAL)
+Version: @PACKAGE_VERSION@
+Requires: xcb
+Libs: -L${libdir} -lxcb-xinput2
+Cflags: -I${includedir}
-- 
1.8.0.1