xserver-xorg-input-keyboard: Changes to 'debian-unstable'
.cvsignore | 19
ChangeLog | 437 +
Makefile.in | 27
aclocal.m4 | 379 -
autogen.sh | 12
config.guess | 667 +-
config.h.in | 15
config.sub | 230
configure | 8097 ++++++++++++++++---------------
configure.ac | 77
debian/NEWS | 8
debian/changelog | 29
debian/control | 12
debian/patches/01_64bit_pointer.diff | 14
debian/patches/series | 1
debian/rules | 4
debian/xserver-xorg-input-kbd.links | 1
debian/xserver-xorg-input-keyboard.links | 1
debian/xsfbs/xsfbs-autoreconf.mk | 150
debian/xsfbs/xsfbs.mk | 379 +
debian/xsfbs/xsfbs.sh | 907 +++
ltmain.sh | 12
man/.cvsignore | 2
man/Makefile.am | 6
man/Makefile.in | 31
man/kbd.man | 2
man/keyboard.man | 2
mkinstalldirs | 89
src/.cvsignore | 6
src/Makefile.am | 41
src/Makefile.in | 205
src/at_scancode.c | 131
src/bsd_KbdMap.c | 1087 ++++
src/bsd_kbd.c | 527 ++
src/bsd_kbd.h | 5
src/hurd_kbd.c | 176
src/kbd.c | 91
src/lnx_KbdMap.c | 605 ++
src/lnx_kbd.c | 480 +
src/lnx_kbd.h | 5
src/sco_KbdMap.c | 308 +
src/sco_kbd.c | 485 +
src/sco_kbd.h | 20
src/sun_kbd.c | 476 +
src/sun_kbd.h | 69
src/sun_kbdEv.c | 855 +++
src/xf86Keymap.h | 452 +
src/xf86OSKbd.h | 132
48 files changed, 13221 insertions(+), 4545 deletions(-)
New commits:
commit a6c37720ad0ced272d8fe637e8f8bf90ad2b8152
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Tue Apr 24 01:34:38 2007 +0200
Add a NEWS entry about the old "keyboard" driver not being shipped anymore and "kbd" replacing it.
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..2c41b53
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,8 @@
+xserver-xorg-input-keyboard (1:1.2.1-1) UNRELEASED; urgency=low
+
+ The old "keyboard" driver has been removed and is now superseded by the
+ "kbd" driver. The corresponding "InputDevice" section in the xorg.conf
+ configuration file should be updated by replacing "keyboard" with "kbd"
+ on the "Driver" line.
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Tue, 24 Apr 2007 00:25:19 +0200
diff --git a/debian/changelog b/debian/changelog
index 8c74723..a553e29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
xserver-xorg-input-keyboard (1:1.2.1-1) UNRELEASED; urgency=low
* New upstream release.
+ * Add a NEWS entry about the old "keyboard" driver not being shipped
+ anymore and "kbd" replacing it.
* Pull some more changesets from upstream git:
+ fd51e4d27d7a31ed9d4a075c3814b36320af4612
+ caeb0f364c1a95a9ad3e64dd722c8ddc88077a86
commit 6088984e406b7538bc708c0f8a34d3033d9c2773
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Tue Apr 24 01:31:25 2007 +0200
autoreconf
diff --git a/Makefile.in b/Makefile.in
index e0acac3..b50057d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,10 +104,11 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BSD_FALSE = @BSD_FALSE@
+BSD_TRUE = @BSD_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPAT_DRIVER_NAME = @COMPAT_DRIVER_NAME@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -131,6 +132,8 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
+HURD_FALSE = @HURD_FALSE@
+HURD_TRUE = @HURD_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -141,6 +144,8 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINUX_FALSE = @LINUX_FALSE@
+LINUX_TRUE = @LINUX_TRUE@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -159,8 +164,12 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SCO_FALSE = @SCO_FALSE@
+SCO_TRUE = @SCO_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SOLARIS_FALSE = @SOLARIS_FALSE@
+SOLARIS_TRUE = @SOLARIS_TRUE@
STRIP = @STRIP@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
diff --git a/aclocal.m4 b/aclocal.m4
index 80e0481..aaae5ad 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6585,7 +6585,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.2
+ [XORG_MACROS_version=1.1.5
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -7038,7 +7038,8 @@ dnl
# --------------------
# Adds --with/without-release-string and changes the PACKAGE and
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
-# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
+# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
@@ -7051,6 +7052,23 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
+ [`echo $PACKAGE_VERSION | cut -d . -f 1`],
+ [Major version of this package])
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
+ [$PVM],
+ [Minor version of this package])
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
+ [$PVP],
+ [Patch version of this package])
])
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
diff --git a/config.h.in b/config.h.in
index 3ae0851..2b1effb 100644
--- a/config.h.in
+++ b/config.h.in
@@ -32,6 +32,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Name of the period field in struct kbd_repeat */
+#undef LNX_KBD_PERIOD_NAME
+
/* Name of package */
#undef PACKAGE
@@ -50,11 +53,17 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
-/* Use deprecated keyboard driver */
-#undef USE_DEPRECATED_KEYBOARD_DRIVER
-
/* Version number of package */
#undef VERSION
diff --git a/config.sub b/config.sub
index 387c18d..fab0aa3 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2006-09-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -276,6 +276,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -284,7 +285,7 @@ case $basic_machine in
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -367,7 +368,7 @@ case $basic_machine in
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -909,6 +910,10 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -1366,6 +1371,9 @@ else
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
spu-*)
os=-elf
;;
diff --git a/configure b/configure
index 7f6fee2..9203a20 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-input-keyboard 1.1.1.
+# Generated by GNU Autoconf 2.61 for xf86-input-keyboard 1.2.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-input-keyboard'
PACKAGE_TARNAME='xf86-input-keyboard'
-PACKAGE_VERSION='1.1.1'
-PACKAGE_STRING='xf86-input-keyboard 1.1.1'
+PACKAGE_VERSION='1.2.1'
+PACKAGE_STRING='xf86-input-keyboard 1.2.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -831,7 +831,6 @@ MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE
MAINT
DRIVER_NAME
-COMPAT_DRIVER_NAME
build
build_cpu
build_vendor
@@ -874,6 +873,16 @@ F77
FFLAGS
ac_ct_F77
LIBTOOL
+LINUX_TRUE
+LINUX_FALSE
+BSD_TRUE
+BSD_FALSE
+SOLARIS_TRUE
+SOLARIS_FALSE
+HURD_TRUE
+HURD_FALSE
+SCO_TRUE
+SCO_FALSE
inputdir
PKG_CONFIG
XORG_CFLAGS
@@ -1413,7 +1422,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-input-keyboard 1.1.1 to adapt to many kinds of systems.
+\`configure' configures xf86-input-keyboard 1.2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1483,7 +1492,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-keyboard 1.1.1:";;
+ short | recursive ) echo "Configuration of xf86-input-keyboard 1.2.1:";;
esac
cat <<\_ACEOF
@@ -1499,7 +1508,6 @@ Optional Features:
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--disable-libtool-lock avoid locking (might break parallel builds)
- --enable-depkbd Use deprecated keyboard driver [default=no]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1596,7 +1604,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-keyboard configure 1.1.1
+xf86-input-keyboard configure 1.2.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1610,7 +1618,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-input-keyboard $as_me 1.1.1, which was
+It was created by xf86-input-keyboard $as_me 1.2.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2282,7 +2290,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-input-keyboard'
- VERSION='1.1.1'
+ VERSION='1.2.1'
cat >>confdefs.h <<_ACEOF
@@ -2457,9 +2465,6 @@ fi
DRIVER_NAME=kbd
-COMPAT_DRIVER_NAME=keyboard
-
-
ac_config_headers="$ac_config_headers config.h"
@@ -4354,7 +4359,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4357 "configure"' > conftest.$ac_ext
+ echo '#line 4362 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7086,11 +7091,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7089: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7094: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7093: \$? = $ac_status" >&5
+ echo "$as_me:7098: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7354,11 +7359,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7357: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7362: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7361: \$? = $ac_status" >&5
+ echo "$as_me:7366: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7458,11 +7463,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7461: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7466: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7465: \$? = $ac_status" >&5
+ echo "$as_me:7470: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9755,7 +9760,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9758 "configure"
+#line 9763 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9855,7 +9860,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9858 "configure"
+#line 9863 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12191,11 +12196,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12194: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12199: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12198: \$? = $ac_status" >&5
+ echo "$as_me:12203: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12295,11 +12300,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12298: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12303: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12302: \$? = $ac_status" >&5
+ echo "$as_me:12307: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13856,11 +13861,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13859: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13864: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13863: \$? = $ac_status" >&5
+ echo "$as_me:13868: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13960,11 +13965,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13963: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13968: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13967: \$? = $ac_status" >&5
+ echo "$as_me:13972: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16147,11 +16152,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16150: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16155: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16154: \$? = $ac_status" >&5
+ echo "$as_me:16159: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16415,11 +16420,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16418: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16423: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16422: \$? = $ac_status" >&5
+ echo "$as_me:16427: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16519,11 +16524,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16522: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16527: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16526: \$? = $ac_status" >&5
+ echo "$as_me:16531: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -19961,40 +19966,144 @@ fi
-#AC_DEFINE(XFree86LOADER,1,[Stub define for loadable drivers])
-#
-#AC_ARG_ENABLE(XINPUT, AS_HELP_STRING([--enable-xinput],
-# [Build XInput support (default: yes)]),
-# [XINPUT=$enableval],[XINPUT=yes])
-#AM_CONDITIONAL(XINPUT, test "x$XINPUT" = "xyes")
-#if test "x$XINPUT" = "xyes" ; then
-# AC_DEFINE(XINPUT,1,[Enable XInput support])
-#fi
-#
-#AC_ARG_ENABLE(XKB, AS_HELP_STRING([--enable-xkb],
-# [Build XKB support (default: yes)]),
-# [XKB=$enableval],[XKB=yes])
-#AM_CONDITIONAL(XKB, test "x$XKB" = "xyes")
-#if test "x$XKB" = "xyes" ; then
-# AC_DEFINE(XKB,1,[Enable XKB support])
-#fi
+case $host_os in
+ linux*)
+ IS_LINUX="yes"
+ # check whether struct kbd_repeat has the 'period' field.
+ # on kernels < 2.5.42 it's called 'rate' instead.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include <linux/kd.h>
+#ifdef __sparc__
+#include <asm/param.h>
+#include <asm/kbio.h>
+#endif
+
+int
+main ()
+{
-# Check whether --enable-depkbd was given.
-if test "${enable_depkbd+set}" = set; then
- enableval=$enable_depkbd; DEPKBD=$enableval
+int main () {
+ struct kbd_repeat k;
+ k.period = 0;
+ return 0;
+}
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ period_field="period"
else
- DEPKBD=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ period_field="rate"
fi
-if test "x$DEPKBD" = "xyes" ; then
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-cat >>confdefs.h <<\_ACEOF
-#define USE_DEPRECATED_KEYBOARD_DRIVER 1
+cat >>confdefs.h <<_ACEOF
+#define LNX_KBD_PERIOD_NAME $period_field
_ACEOF
+ ;;
+
+ freebsd* | kfreebsd-gnu* | netbsd* | openbsd*)
+ IS_BSD="yes"
+ ;;
+
+ solaris*)
+ IS_SOLARIS="yes"
+ ;;
+
+ gnu*)
+ IS_HURD="yes"
+ ;;
+
+ *)
+ { { echo "$as_me:$LINENO: error: Your operating system is not supported by the kbd driver.
+ Contact xorg@lists.freedesktop.org if you are interested in
+ porting it." >&5
+echo "$as_me: error: Your operating system is not supported by the kbd driver.
+ Contact xorg@lists.freedesktop.org if you are interested in
+ porting it." >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+esac
+
+
+if test "x$IS_LINUX" = xyes; then
+ LINUX_TRUE=
+ LINUX_FALSE='#'
+else
+ LINUX_TRUE='#'
+ LINUX_FALSE=
+fi
+
+
+
+if test "x$IS_BSD" = xyes; then
+ BSD_TRUE=
+ BSD_FALSE='#'
+else
+ BSD_TRUE='#'
+ BSD_FALSE=
+fi
+
+
+
+if test "x$IS_SOLARIS" = xyes; then
+ SOLARIS_TRUE=
+ SOLARIS_FALSE='#'
+else
+ SOLARIS_TRUE='#'
+ SOLARIS_FALSE=
+fi
+
+
+
+if test "x$IS_HURD" = xyes; then
+ HURD_TRUE=
+ HURD_FALSE='#'
+else
+ HURD_TRUE='#'
+ HURD_FALSE=
+fi
+
+
+
+if test "x$IS_SCO" = xyes; then
+ SCO_TRUE=
+ SCO_FALSE='#'
+else
+ SCO_TRUE='#'
+ SCO_FALSE=
fi
+
# Check whether --with-xorg-module-dir was given.
if test "${with_xorg_module_dir+set}" = set; then
withval=$with_xorg_module_dir; moduledir="$withval"
@@ -20312,12 +20421,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.0.99.901 xproto \$REQUIRED_MODULES\"") >&5
- ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.2.99.0 xproto \$REQUIRED_MODULES\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.2.99.0 xproto $REQUIRED_MODULES") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES" 2>/dev/null`
+ pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.2.99.0 xproto $REQUIRED_MODULES" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -20330,12 +20439,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_XORG_LIBS="$XORG_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.0.99.901 xproto \$REQUIRED_MODULES\"") >&5
- ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.2.99.0 xproto \$REQUIRED_MODULES\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.2.99.0 xproto $REQUIRED_MODULES") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES" 2>/dev/null`
+ pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.2.99.0 xproto $REQUIRED_MODULES" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -20354,14 +20463,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES"`
+ XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server >= 1.2.99.0 xproto $REQUIRED_MODULES"`
else
- XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES"`
+ XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server >= 1.2.99.0 xproto $REQUIRED_MODULES"`
fi
# Put the nasty error message in config.log where it belongs
echo "$XORG_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES) were not met:
+ { { echo "$as_me:$LINENO: error: Package requirements (xorg-server >= 1.2.99.0 xproto $REQUIRED_MODULES) were not met:
$XORG_PKG_ERRORS
@@ -20372,7 +20481,7 @@ Alternatively, you may set the environment variables XORG_CFLAGS
and XORG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
-echo "$as_me: error: Package requirements (xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES) were not met:
+echo "$as_me: error: Package requirements (xorg-server >= 1.2.99.0 xproto $REQUIRED_MODULES) were not met:
$XORG_PKG_ERRORS
@@ -20683,6 +20792,29 @@ fi
echo "$as_me: Building with package name set to $PACKAGE" >&6;}
fi
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
+_ACEOF
+
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MINOR $PVM
+_ACEOF
+
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_PATCHLEVEL $PVP
+_ACEOF
+
+
ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile"
@@ -20817,6 +20949,41 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${LINUX_TRUE}" && test -z "${LINUX_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"LINUX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"LINUX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${BSD_TRUE}" && test -z "${BSD_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"BSD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BSD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${SOLARIS_TRUE}" && test -z "${SOLARIS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"SOLARIS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"SOLARIS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${HURD_TRUE}" && test -z "${HURD_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HURD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HURD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${SCO_TRUE}" && test -z "${SCO_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"SCO\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"SCO\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -21117,7 +21284,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-input-keyboard $as_me 1.1.1, which was
+This file was extended by xf86-input-keyboard $as_me 1.2.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21170,7 +21337,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-input-keyboard config.status 1.1.1
+xf86-input-keyboard config.status 1.2.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -21412,7 +21579,6 @@ MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
MAINT!$MAINT$ac_delim
DRIVER_NAME!$DRIVER_NAME$ac_delim
-COMPAT_DRIVER_NAME!$COMPAT_DRIVER_NAME$ac_delim
build!$build$ac_delim
build_cpu!$build_cpu$ac_delim
build_vendor!$build_vendor$ac_delim
@@ -21447,6 +21613,7 @@ CPP!$CPP$ac_delim
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
ac_ct_CXX!$ac_ct_CXX$ac_delim
+CXXDEPMODE!$CXXDEPMODE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -21488,7 +21655,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-CXXDEPMODE!$CXXDEPMODE$ac_delim
am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
CXXCPP!$CXXCPP$ac_delim
@@ -21496,6 +21662,16 @@ F77!$F77$ac_delim
FFLAGS!$FFLAGS$ac_delim
ac_ct_F77!$ac_ct_F77$ac_delim
LIBTOOL!$LIBTOOL$ac_delim
+LINUX_TRUE!$LINUX_TRUE$ac_delim
+LINUX_FALSE!$LINUX_FALSE$ac_delim
+BSD_TRUE!$BSD_TRUE$ac_delim
+BSD_FALSE!$BSD_FALSE$ac_delim
+SOLARIS_TRUE!$SOLARIS_TRUE$ac_delim
+SOLARIS_FALSE!$SOLARIS_FALSE$ac_delim
+HURD_TRUE!$HURD_TRUE$ac_delim
+HURD_FALSE!$HURD_FALSE$ac_delim
+SCO_TRUE!$SCO_TRUE$ac_delim
+SCO_FALSE!$SCO_FALSE$ac_delim
inputdir!$inputdir$ac_delim
PKG_CONFIG!$PKG_CONFIG$ac_delim
XORG_CFLAGS!$XORG_CFLAGS$ac_delim
@@ -21516,7 +21692,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 26; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/man/Makefile.in b/man/Makefile.in
index 37644ff..27ed6bf 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -97,10 +97,11 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BSD_FALSE = @BSD_FALSE@
+BSD_TRUE = @BSD_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPAT_DRIVER_NAME = @COMPAT_DRIVER_NAME@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -124,6 +125,8 @@ FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
+HURD_FALSE = @HURD_FALSE@
+HURD_TRUE = @HURD_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -134,6 +137,8 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINUX_FALSE = @LINUX_FALSE@
+LINUX_TRUE = @LINUX_TRUE@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -152,8 +157,12 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SCO_FALSE = @SCO_FALSE@
+SCO_TRUE = @SCO_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+SOLARIS_FALSE = @SOLARIS_FALSE@
+SOLARIS_TRUE = @SOLARIS_TRUE@
STRIP = @STRIP@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
@@ -207,9 +216,9 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
drivermandir = $(DRIVER_MAN_DIR)
-driverman_PRE = @DRIVER_NAME@.man @COMPAT_DRIVER_NAME@.man
+driverman_PRE = @DRIVER_NAME@.man
driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
-EXTRA_DIST = @DRIVER_NAME@.man @COMPAT_DRIVER_NAME@.man
+EXTRA_DIST = @DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA)
SED = sed
diff --git a/src/Makefile.in b/src/Makefile.in
index 5ee6f89..2ffd378 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -56,6 +56,11 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+@BSD_TRUE@am__append_1 = $(BSD_SRCS)
+@SOLARIS_TRUE@am__append_2 = $(SOLARIS_SRCS)
+@LINUX_TRUE@am__append_3 = $(LINUX_SRCS)
+@SCO_TRUE@am__append_4 = $(SCO_SRCS)
+@HURD_TRUE@am__append_5 = $(HURD_SRCS)
Reply to: