add xi2_find_device_id

[xorg-xinput] / configure.ac

diff --git a/configure.ac b/configure.ac
index f38914f00fc962bb17814cb046fd1b0f20665c23..8d96a7347c761ff5ed5ed5db363940c6064608d4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,24 +2,38 @@ dnl  Copyright 2007 Peter Hutterer <peter@cs.unisa.edu.au>
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])

-AC_INIT(xinput,[1.3.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinput)
+AC_INIT(xinput,[1.4.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinput)

 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+

 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
 AC_PROG_INSTALL
 
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
 AC_PROG_INSTALL
 

+XORG_CWARNFLAGS
+

 # Checks for pkg-config packages
 # Checks for pkg-config packages

-PKG_CHECK_MODULES(XINPUT, x11 xext xi [inputproto >= 1.4])
+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]))
+AM_CONDITIONAL(HAVE_XI2, [test "x$ac_cv_func_XSetClientPointer" = "xyes"] )
+
+XINPUT_CFLAGS="$CWARNFLAGS $XINPUT_CFLAGS"

 AC_SUBST(XINPUT_CFLAGS)
 AC_SUBST(XINPUT_LIBS)
 AC_SUBST(XINPUT_CFLAGS)
 AC_SUBST(XINPUT_LIBS)

+AC_SUBST(HAVE_XI2)

 
 AC_SUBST(VERSION)
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
 AC_SUBST(VERSION)
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION

+XORG_CHANGELOG

 
 AC_OUTPUT([Makefile
            src/Makefile
 
 AC_OUTPUT([Makefile
            src/Makefile