summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-11-26 21:35:34 +1000
committerPeter Hutterer <peter.hutterer@redhat.com>2008-12-01 08:16:57 +1000
commitb983c4fa1ec13f6096badf9dd5ebbf55880bb6c1 (patch)
tree31f4806c96b522d924bff4acfd27642a47b30def
parentf245c46d291dc22f40fb839bf21d2620091a84ef (diff)
Require inputproto 1.5
Also claim to now support XI 1.5. Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
-rw-r--r--Xi/extinit.c4
-rw-r--r--configure.ac2
2 files changed, 3 insertions, 3 deletions
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 51e02008a..14eb3cbe1 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -307,8 +307,8 @@ static int XIClientPrivateKeyIndex;
DevPrivateKey XIClientPrivateKey = &XIClientPrivateKeyIndex;
static XExtensionVersion thisversion = { XI_Present,
- XI_2_Major,
- XI_2_Minor
+ XI_Add_DeviceProperties_Major,
+ XI_Add_DeviceProperties_Minor
};
diff --git a/configure.ac b/configure.ac
index cfc0d42fc..8a02f2735 100644
--- a/configure.ac
+++ b/configure.ac
@@ -664,7 +664,7 @@ XEXT_LIB='$(top_builddir)/Xext/libXext.la'
XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
dnl Core modules for most extensions, et al.
-REQUIRED_MODULES="[randrproto >= 1.2.99.1] [renderproto >= 0.9.3] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto resourceproto fontsproto [inputproto >= 1.9.99.6] [kbproto >= 1.0.3]"
+REQUIRED_MODULES="[randrproto >= 1.2.99.1] [renderproto >= 0.9.3] [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto [xextproto >= 7.0.3] [xproto >= 7.0.13] [xtrans >= 1.2.2] bigreqsproto resourceproto fontsproto [inputproto >= 1.5] [kbproto >= 1.0.3]"
REQUIRED_LIBS="xfont xau fontenc [pixman-1 >= 0.13.2]"
dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas