diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/xf86Summa.c | 11 |
3 files changed, 10 insertions, 11 deletions
@@ -1,3 +1,9 @@ +2006-04-06 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/xf86Summa.c: + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + 2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/configure.ac b/configure.ac index a086317..641bdcb 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-summa], - 1.0.0.5, + 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-summa) @@ -75,7 +75,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES) sdkdir=$(pkg-config --variable=sdkdir xorg-server) CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' diff --git a/src/xf86Summa.c b/src/xf86Summa.c index 3a0ae13..107ef5f 100644 --- a/src/xf86Summa.c +++ b/src/xf86Summa.c @@ -30,10 +30,6 @@ #include "config.h" #endif -#if 0 -static const char identification[] = "$Identification: 18 $"; -#endif - #include "xf86Version.h" #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) @@ -43,16 +39,14 @@ static const char identification[] = "$Identification: 18 $"; #ifdef XFREE86_V4 /* post 3.9 headers */ -#ifndef XFree86LOADER #include <unistd.h> #include <errno.h> -#endif +#include <string.h> #include "misc.h" #include "xf86.h" #define NEED_XF86_TYPES #if !defined(DGUX) -#include "xf86_ansic.h" #include "xisb.h" #endif #include "xf86_OSproc.h" @@ -124,7 +118,6 @@ static InputDriverPtr sumDrv; #include "xf86Priv.h" #include "xf86_OSproc.h" #ifdef XFree86LOADER -#include "xf86_ansic.h" #endif #include "xf86Config.h" #include "xf86Xinput.h" @@ -1641,7 +1634,7 @@ static XF86ModuleVersionInfo xf86SumVersionRec = MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 1, 0, 0, + 1, 1, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, |