diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-06-02 16:09:23 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-06-02 16:12:36 +1000 |
| commit | 452c318d4db334bbd81c39bdd8b30b38f0308c78 (patch) | |
| tree | 5523b217a9cd4fc3b05c9ff9a883cb5c46c4173a | |
| parent | 70bb47fc9c25456e167d59452fb2c2938b0e5421 (diff) | |
inputproto 2.1inputproto-2.1-devel
And revert the warnings and hoops we made the user jump through. They'll
come back for XI 2.2.
Revert "Put a #warning and #error in to avoid unsuspecting XI 2.1 users."
This reverts commit 811a643d3eadb4baf4d21f5fef7b4f0c17318167.
Revert "Require configure flag to build this proto version."
This reverts commit 875879114d1681f79bd6bcf7d5bdf49f841da1c9
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | XI2.h | 6 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 1 insertions, 15 deletions
@@ -25,12 +25,6 @@ #ifndef _XI2_H_ #define _XI2_H_ -#warning "XI 2.1 is not stable yet." -#warning "Applications relying on this header will break as the protocol sees updates." -#ifndef XINPUT2_1_USE_UNSTABLE_PROTOCOL -#error "Define XINPUT2_1_USE_UNSTABLE_PROTOCOL to disable this error" -#endif - /* Indices into the versions[] array (XExtInt.c). Used as a index to * retrieve the minimum version of XI from _XiCheckExtInit. * For indices 0 to 6 see XI.h */ diff --git a/configure.ac b/configure.ac index 78f19f2..6e21f96 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([InputProto], [2.0.99], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([InputProto], [2.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -11,14 +11,6 @@ XORG_DEFAULT_OPTIONS XORG_ENABLE_SPECS XORG_WITH_ASCIIDOC(8.4.5) -AC_ARG_ENABLE(unstable-protocol, - AS_HELP_STRING([--enable-unstable-protocol], - [Enables compilation of yet-to-be-finalised protocol (default: disabled)]), - [UNSTABLE_PROTO=$enableval], [UNSTABLE_PROTO=no]) -if ! test "x$UNSTABLE_PROTO" = xyes; then - AC_MSG_ERROR([This branch contains protocol elements which have not yet been finalised. When this branch is updated, you will probably need to recompile both the server, libXi, and input-using clients, and may experience crashes or undefined behaviour if you do not.]) -fi - AC_OUTPUT([Makefile specs/Makefile inputproto.pc]) |