Hello community,
here is the log from the commit of package xorg-x11-driver-input
checked in at Mon Oct 16 19:04:09 CEST 2006.
--------
--- xorg-x11-driver-input/xorg-x11-driver-input.changes 2006-09-01 08:41:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-input/xorg-x11-driver-input.changes 2006-10-14 05:48:24.000000000 +0200
@@ -1,0 +2,8 @@
+Sat Oct 14 05:47:57 CEST 2006 - sndirsch@suse.de
+
+- X.Org 7.2RC1 package update:
+ * xf86-input-evdev-1.1.3
+ * xf86-input-keyboard-1.1.1
+ * /xf86-input-mouse-1.1.2
+
+-------------------------------------------------------------------
Old:
----
64bit.diff
xf86-input-evdev-X11R7.1-1.1.2.tar.bz2
xf86-input-keyboard-X11R7.1-1.1.0.tar.bz2
xf86-input-mouse-1.1.1.tar.bz2
New:
----
xf86-input-evdev-1.1.3.tar.bz2
xf86-input-keyboard-1.1.1.tar.bz2
xf86-input-mouse-1.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-input.spec ++++++
--- /var/tmp/diff_new_pack.5cTL7W/_old 2006-10-16 19:02:47.000000000 +0200
+++ /var/tmp/diff_new_pack.5cTL7W/_new 2006-10-16 19:02:47.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package xorg-x11-driver-input (Version 7.1)
+# spec file for package xorg-x11-driver-input (Version 7.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,8 +14,8 @@
#!BuildIgnore: xorg-x11-Mesa xorg-x11-Mesa-devel
BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
-Version: 7.1
-Release: 10
+Version: 7.2
+Release: 1
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -30,16 +30,16 @@
Source6: xf86-input-dynapro-X11R7.1-1.1.0.tar.bz2
Source7: xf86-input-elo2300-X11R7.1-1.1.0.tar.bz2
Source8: xf86-input-elographics-1.1.0.tar.bz2
-Source9: xf86-input-evdev-X11R7.1-1.1.2.tar.bz2
+Source9: xf86-input-evdev-1.1.3.tar.bz2
Source10: xf86-input-fpit-X11R7.1-1.1.0.tar.bz2
Source11: xf86-input-hyperpen-X11R7.1-1.1.0.tar.bz2
Source12: xf86-input-jamstudio-X11R7.1-1.1.0.tar.bz2
Source13: xf86-input-joystick-X11R7.1-1.1.0.tar.bz2
-Source14: xf86-input-keyboard-X11R7.1-1.1.0.tar.bz2
+Source14: xf86-input-keyboard-1.1.1.tar.bz2
Source15: xf86-input-magellan-X11R7.1-1.1.0.tar.bz2
Source16: xf86-input-magictouch-X11R7.1-1.0.0.5.tar.bz2
Source17: xf86-input-microtouch-X11R7.1-1.1.0.tar.bz2
-Source18: xf86-input-mouse-1.1.1.tar.bz2
+Source18: xf86-input-mouse-1.1.2.tar.bz2
Source19: xf86-input-mutouch-X11R7.1-1.1.0.tar.bz2
Source20: xf86-input-palmax-X11R7.1-1.1.0.tar.bz2
Source21: xf86-input-penmount-1.2.0.tar.bz2
@@ -49,7 +49,6 @@
Source25: xf86-input-ur98-X11R7.1-1.1.0.tar.bz2
Source26: xf86-input-vmmouse-X11R7.1-12.4.0.tar.bz2
Source27: xf86-input-void-X11R7.1-1.1.0.tar.bz2
-Patch: 64bit.diff
Patch1: xf86-input-magictouch.diff
Patch2: xf86-input-jamstudio.diff
Patch3: p_mouse_misc.diff
@@ -65,9 +64,6 @@
%setup -n . -T -D
rm -rf $RPM_BUILD_DIR/*
for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
-pushd xf86-input-keyboard-*
-%patch -p1
-popd
pushd xf86-input-magictouch-*
%patch1
popd
@@ -118,6 +114,11 @@
%{_mandir}/man4x/*
%changelog -n xorg-x11-driver-input
+* Sat Oct 14 2006 - sndirsch@suse.de
+- X.Org 7.2RC1 package update:
+ * xf86-input-evdev-1.1.3
+ * xf86-input-keyboard-1.1.1
+ * /xf86-input-mouse-1.1.2
* Fri Sep 01 2006 - sndirsch@suse.de
- removed Requires: xorg-x11-server, since xorg-x11-input-input is
already required by xorg-x11-server, which resulted in a fatal
++++++ xf86-input-evdev-X11R7.1-1.1.2.tar.bz2 -> xf86-input-evdev-1.1.3.tar.bz2 ++++++
++++ 3528 lines of diff (skipped)
++++++ xf86-input-keyboard-X11R7.1-1.1.0.tar.bz2 -> xf86-input-keyboard-1.1.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-keyboard-X11R7.1-1.1.0/Makefile.in new/xf86-input-keyboard-1.1.1/Makefile.in
--- old/xf86-input-keyboard-X11R7.1-1.1.0/Makefile.in 2006-05-23 05:20:00.000000000 +0200
+++ new/xf86-input-keyboard-1.1.1/Makefile.in 2006-10-14 00:26:19.000000000 +0200
@@ -158,6 +158,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-keyboard-X11R7.1-1.1.0/aclocal.m4 new/xf86-input-keyboard-1.1.1/aclocal.m4
--- old/xf86-input-keyboard-X11R7.1-1.1.0/aclocal.m4 2006-05-23 05:19:52.000000000 +0200
+++ new/xf86-input-keyboard-1.1.1/aclocal.m4 2006-10-14 00:26:15.000000000 +0200
@@ -1597,7 +1597,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -4305,6 +4305,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -4438,11 +4441,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -4454,7 +4457,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -4534,7 +4537,7 @@
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -6370,6 +6373,7 @@
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6402,6 +6406,7 @@
done
])
SED=$lt_cv_path_SED
+AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
@@ -6543,7 +6548,8 @@
_PKG_TEXT
])],
- [$4])
+ [AC_MSG_RESULT([no])
+ $4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
@@ -6562,35 +6568,69 @@
fi[]dnl
])# PKG_CHECK_MODULES
-dnl $Id: xorg-macros.m4,v 1.8 2005/12/09 15:28:41 kem Exp $
dnl
-dnl Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation.
-dnl
-dnl The above copyright notice and this permission notice shall be included
-dnl in all copies or substantial portions of the Software.
+dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
dnl
+dnl Permission is hereby granted, free of charge, to any person obtaining a
+dnl copy of this software and associated documentation files (the
+dnl "Software"), to deal in the Software without restriction, including
+dnl without limitation the rights to use, copy, modify, merge, publish,
+dnl distribute, and/or sell copies of the Software, and to permit persons
+dnl to whom the Software is furnished to do so, provided that the above
+dnl copyright notice(s) and this permission notice appear in all copies of
+dnl the Software and that both the above copyright notice(s) and this
+dnl permission notice appear in supporting documentation.
+dnl
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-dnl OTHER DEALINGS IN THE SOFTWARE.
-dnl
-dnl Except as contained in this notice, the name of the copyright holders shall
-dnl not be used in advertising or otherwise to promote the sale, use or
-dnl other dealings in this Software without prior written authorization
-dnl from the copyright holders.
-dnl
+dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Except as contained in this notice, the name of a copyright holder
+dnl shall not be used in advertising or otherwise to promote the sale, use
+dnl or other dealings in this Software without prior written authorization
+dnl of the copyright holder.
+
+# XORG_MACROS_VERSION(required-version)
+# -------------------------------------
+# Minimum version: 1.1.0
+#
+# If you're using a macro added in Version 1.1 or newer, include this in
+# your configure.ac with the minimum required version, such as:
+# XORG_MACROS_VERSION(1.1)
+#
+# To force at least a version with this macro defined, also add:
+# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
+#
+#
+# See the "minimum version" comment for each macro you use to see what
+# version you require.
+AC_DEFUN([XORG_MACROS_VERSION],[
+ [XORG_MACROS_needed_version=$1
+ 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.1
+ 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
+ AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
+ fi
+ if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
+ AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
+ fi
+ AC_MSG_RESULT([yes, $XORG_MACROS_version])
+]) # XORG_MACROS_VERSION
# XORG_PROG_RAWCPP()
# ------------------
+# Minimum version: 1.0.0
+#
# Find cpp program and necessary flags for use in pre-processing text files
# such as man pages and config files
AC_DEFUN([XORG_PROG_RAWCPP],[
@@ -6633,6 +6673,8 @@
# XORG_MANPAGE_SECTIONS()
# -----------------------
+# Minimum version: 1.0.0
+#
# Determine which sections man pages go in for the different man page types
# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files.
# Not sure if there's any better way than just hardcoding by OS name.
@@ -6642,75 +6684,47 @@
AC_REQUIRE([AC_CANONICAL_HOST])
if test x$APP_MAN_SUFFIX = x ; then
- case $host_os in
- linux*) APP_MAN_SUFFIX=1x ;;
- *) APP_MAN_SUFFIX=1 ;;
- esac
+ APP_MAN_SUFFIX=1
fi
if test x$APP_MAN_DIR = x ; then
- case $host_os in
- linux*) APP_MAN_DIR='$(mandir)/man1' ;;
- *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
- esac
+ APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
fi
if test x$LIB_MAN_SUFFIX = x ; then
- case $host_os in
- linux*) LIB_MAN_SUFFIX=3x ;;
- *) LIB_MAN_SUFFIX=3 ;;
- esac
+ LIB_MAN_SUFFIX=3
fi
if test x$LIB_MAN_DIR = x ; then
- case $host_os in
- linux*) LIB_MAN_DIR='$(mandir)/man3' ;;
- *) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
- esac
+ LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
fi
if test x$FILE_MAN_SUFFIX = x ; then
case $host_os in
- linux*) FILE_MAN_SUFFIX=5x ;;
solaris*) FILE_MAN_SUFFIX=4 ;;
*) FILE_MAN_SUFFIX=5 ;;
esac
fi
if test x$FILE_MAN_DIR = x ; then
- case $host_os in
- linux*) FILE_MAN_DIR='$(mandir)/man5' ;;
- *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
- esac
+ FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
fi
-# In Imake's linux.cf, the misc man suffix & dir was only changed for
-# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$MISC_MAN_SUFFIX = x ; then
case $host_os in
-# linux*) MISC_MAN_SUFFIX=7x ;;
solaris*) MISC_MAN_SUFFIX=5 ;;
*) MISC_MAN_SUFFIX=7 ;;
esac
fi
if test x$MISC_MAN_DIR = x ; then
- case $host_os in
-# linux*) MISC_MAN_DIR='$(mandir)/man7' ;;
- *) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
- esac
+ MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
fi
-# In Imake's linux.cf, the driver man suffix & dir was only changed for
-# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$DRIVER_MAN_SUFFIX = x ; then
case $host_os in
-# linux*) DRIVER_MAN_SUFFIX=4x ;;
solaris*) DRIVER_MAN_SUFFIX=7 ;;
*) DRIVER_MAN_SUFFIX=4 ;;
esac
fi
if test x$DRIVER_MAN_DIR = x ; then
- case $host_os in
-# linux*) DRIVER_MAN_DIR='$(mandir)/man4' ;;
- *) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
- esac
+ DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
fi
if test x$ADMIN_MAN_SUFFIX = x ; then
@@ -6740,6 +6754,8 @@
# XORG_CHECK_LINUXDOC
# -------------------
+# Minimum version: 1.0.0
+#
# Defines the variable MAKE_TEXT if the necessary tools and
# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt.
# Whether or not the necessary tools and files are found can be checked
@@ -6791,6 +6807,8 @@
# XORG_CHECK_MALLOC_ZERO
# ----------------------
+# Minimum version: 1.0.0
+#
# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if
# malloc(0) returns NULL. Packages should add one of these cflags to
# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
@@ -6835,6 +6853,78 @@
AC_SUBST([XTMALLOC_ZERO_CFLAGS])
]) # XORG_CHECK_MALLOC_ZERO
+# XORG_WITH_LINT()
+# ----------------
+# Minimum version: 1.1.0
+#
+# Sets up flags for source checkers such as lint and sparse if --with-lint
+# is specified. (Use --with-lint=sparse for sparse.)
+# Sets $LINT to name of source checker passed with --with-lint (default: lint)
+# Sets $LINT_FLAGS to flags to pass to source checker
+# Sets LINT automake conditional if enabled (default: disabled)
+#
+AC_DEFUN([XORG_WITH_LINT],[
+
+# Allow checking code with lint, sparse, etc.
+AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
+ [Use a lint-style source code checker (default: disabled)])],
+ [use_lint=$withval], [use_lint=no])
+if test "x$use_lint" = "xyes" ; then
+ LINT="lint"
+else
+ LINT="$use_lint"
+fi
+if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then
+ case $LINT in
+ lint|*/lint)
+ case $host_os in
+ solaris*)
+ LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
+ ;;
+ esac
+ ;;
+ esac
+fi
+
+AC_SUBST(LINT)
+AC_SUBST(LINT_FLAGS)
+AM_CONDITIONAL(LINT, [test x$LINT != xno])
+
+]) # XORG_WITH_LINT
+
+# XORG_LINT_LIBRARY(LIBNAME)
+# --------------------------
+# Minimum version: 1.1.0
+#
+# Sets up flags for building lint libraries for checking programs that call
+# functions in the library.
+# Disabled by default, enable with --enable-lint-library
+# Sets:
+# @LINTLIB@ - name of lint library file to make
+# MAKE_LINT_LIB - automake conditional
+#
+
+AC_DEFUN([XORG_LINT_LIBRARY],[
+AC_REQUIRE([XORG_WITH_LINT])
+# Build lint "library" for more indepth checks of programs calling this library
+AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
+ [Create lint library (default: disabled)])],
+ [make_lint_lib=$enableval], [make_lint_lib=no])
+if test "x$make_lint_lib" != "xno" ; then
+ if test "x$LINT" = "xno" ; then
+ AC_MSG_ERROR([Cannot make lint library without --with-lint])
+ fi
+ if test "x$make_lint_lib" = "xyes" ; then
+ LINTLIB=llib-l$1.ln
+ else
+ LINTLIB=$make_lint_lib
+ fi
+fi
+AC_SUBST(LINTLIB)
+AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
+
+]) # XORG_LINT_LIBRARY
+
dnl Copyright 2005 Red Hat, Inc
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-keyboard-X11R7.1-1.1.0/configure new/xf86-input-keyboard-1.1.1/configure
--- old/xf86-input-keyboard-X11R7.1-1.1.0/configure 2006-05-23 05:19:57.000000000 +0200
+++ new/xf86-input-keyboard-1.1.1/configure 2006-10-14 00:26:18.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for xf86-input-keyboard 1.1.0.
+# Generated by GNU Autoconf 2.59 for xf86-input-keyboard 1.1.1.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-input-keyboard'
PACKAGE_TARNAME='xf86-input-keyboard'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='xf86-input-keyboard 1.1.0'
+PACKAGE_VERSION='1.1.1'
+PACKAGE_STRING='xf86-input-keyboard 1.1.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -465,7 +465,7 @@
# include
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT DRIVER_NAME COMPAT_DRIVER_NAME build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCX
X_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL inputdir PKG_CONFIG ac_pt_PKG_CONFIG XORG_CFLAGS XORG_LIBS APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT DRIVER_NAME COMPAT_DRIVER_NAME build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastd
epCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL inputdir PKG_CONFIG ac_pt_PKG_CONFIG XORG_CFLAGS XORG_LIBS APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -966,7 +966,7 @@
# 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.0 to adapt to many kinds of systems.
+\`configure' configures xf86-input-keyboard 1.1.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1032,7 +1032,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-keyboard 1.1.0:";;
+ short | recursive ) echo "Configuration of xf86-input-keyboard 1.1.1:";;
esac
cat <<\_ACEOF
@@ -1182,7 +1182,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-keyboard configure 1.1.0
+xf86-input-keyboard configure 1.1.1
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1196,7 +1196,7 @@
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.0, which was
+It was created by xf86-input-keyboard $as_me 1.1.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1841,7 +1841,7 @@
# Define the identity of the package.
PACKAGE='xf86-input-keyboard'
- VERSION='1.1.0'
+ VERSION='1.1.1'
cat >>confdefs.h <<_ACEOF
@@ -3258,6 +3258,7 @@
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -3292,6 +3293,7 @@
fi
SED=$lt_cv_path_SED
+
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
@@ -3732,7 +3734,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3735 "configure"' > conftest.$ac_ext
+ echo '#line 3737 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5331,7 +5333,7 @@
# Provide some information about the compiler.
-echo "$as_me:5334:" \
+echo "$as_me:5336:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5
@@ -6394,11 +6396,11 @@
-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:6397: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6399: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6401: \$? = $ac_status" >&5
+ echo "$as_me:6403: \$? = $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.
@@ -6662,11 +6664,11 @@
-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:6665: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6667: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6669: \$? = $ac_status" >&5
+ echo "$as_me:6671: \$? = $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.
@@ -6766,11 +6768,11 @@
-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:6769: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6771: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6773: \$? = $ac_status" >&5
+ echo "$as_me:6775: \$? = $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
@@ -8235,7 +8237,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8238 "configure"' > conftest.$ac_ext
+ echo '#line 8240 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8254,7 +8256,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -9132,7 +9134,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:11580: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11579: \$? = $ac_status" >&5
+ echo "$as_me:11584: \$? = $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.
@@ -11676,11 +11681,11 @@
-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:11679: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11684: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11683: \$? = $ac_status" >&5
+ echo "$as_me:11688: \$? = $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
@@ -12212,7 +12217,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12215 "configure"' > conftest.$ac_ext
+ echo '#line 12220 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -12231,7 +12236,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -12616,6 +12621,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_CXX
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -12749,11 +12757,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_CXX
+predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_CXX
+postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -12765,7 +12773,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -12845,7 +12853,7 @@
link_all_deplibs=$link_all_deplibs_CXX
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -13267,11 +13275,11 @@
-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:13270: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13278: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13274: \$? = $ac_status" >&5
+ echo "$as_me:13282: \$? = $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.
@@ -13371,11 +13379,11 @@
-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:13374: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13382: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13378: \$? = $ac_status" >&5
+ echo "$as_me:13386: \$? = $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
@@ -14820,7 +14828,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 14823 "configure"' > conftest.$ac_ext
+ echo '#line 14831 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -14839,7 +14847,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -15224,6 +15232,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_F77
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -15357,11 +15368,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_F77
+predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_F77
+postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -15373,7 +15384,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -15453,7 +15464,7 @@
link_all_deplibs=$link_all_deplibs_F77
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -15595,11 +15606,11 @@
-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:15598: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15609: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15602: \$? = $ac_status" >&5
+ echo "$as_me:15613: \$? = $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.
@@ -15863,11 +15874,11 @@
-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:15866: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15877: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15870: \$? = $ac_status" >&5
+ echo "$as_me:15881: \$? = $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.
@@ -15967,11 +15978,11 @@
-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:15970: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15981: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15974: \$? = $ac_status" >&5
+ echo "$as_me:15985: \$? = $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
@@ -17436,7 +17447,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 17439 "configure"' > conftest.$ac_ext
+ echo '#line 17450 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -17455,7 +17466,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
@@ -17840,6 +17851,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_GCJ
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -17973,11 +17987,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_GCJ
+predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
+postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -17989,7 +18003,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18069,7 +18083,7 @@
link_all_deplibs=$link_all_deplibs_GCJ
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18321,6 +18335,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_RC
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18454,11 +18471,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_RC
+predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_RC
+postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18470,7 +18487,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18550,7 +18567,7 @@
link_all_deplibs=$link_all_deplibs_RC
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -20127,75 +20144,47 @@
if test x$APP_MAN_SUFFIX = x ; then
- case $host_os in
- linux*) APP_MAN_SUFFIX=1x ;;
- *) APP_MAN_SUFFIX=1 ;;
- esac
+ APP_MAN_SUFFIX=1
fi
if test x$APP_MAN_DIR = x ; then
- case $host_os in
- linux*) APP_MAN_DIR='$(mandir)/man1' ;;
- *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
- esac
+ APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
fi
if test x$LIB_MAN_SUFFIX = x ; then
- case $host_os in
- linux*) LIB_MAN_SUFFIX=3x ;;
- *) LIB_MAN_SUFFIX=3 ;;
- esac
+ LIB_MAN_SUFFIX=3
fi
if test x$LIB_MAN_DIR = x ; then
- case $host_os in
- linux*) LIB_MAN_DIR='$(mandir)/man3' ;;
- *) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
- esac
+ LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
fi
if test x$FILE_MAN_SUFFIX = x ; then
case $host_os in
- linux*) FILE_MAN_SUFFIX=5x ;;
solaris*) FILE_MAN_SUFFIX=4 ;;
*) FILE_MAN_SUFFIX=5 ;;
esac
fi
if test x$FILE_MAN_DIR = x ; then
- case $host_os in
- linux*) FILE_MAN_DIR='$(mandir)/man5' ;;
- *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
- esac
+ FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
fi
-# In Imake's linux.cf, the misc man suffix & dir was only changed for
-# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$MISC_MAN_SUFFIX = x ; then
case $host_os in
-# linux*) MISC_MAN_SUFFIX=7x ;;
solaris*) MISC_MAN_SUFFIX=5 ;;
*) MISC_MAN_SUFFIX=7 ;;
esac
fi
if test x$MISC_MAN_DIR = x ; then
- case $host_os in
-# linux*) MISC_MAN_DIR='$(mandir)/man7' ;;
- *) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
- esac
+ MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
fi
-# In Imake's linux.cf, the driver man suffix & dir was only changed for
-# LinuxDebian, not other Linuxes, so we leave it unchanged here
if test x$DRIVER_MAN_SUFFIX = x ; then
case $host_os in
-# linux*) DRIVER_MAN_SUFFIX=4x ;;
solaris*) DRIVER_MAN_SUFFIX=7 ;;
*) DRIVER_MAN_SUFFIX=4 ;;
esac
fi
if test x$DRIVER_MAN_DIR = x ; then
- case $host_os in
-# linux*) DRIVER_MAN_DIR='$(mandir)/man4' ;;
- *) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
- esac
+ DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
fi
if test x$ADMIN_MAN_SUFFIX = x ; then
@@ -20637,7 +20626,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by xf86-input-keyboard $as_me 1.1.0, which was
+This file was extended by xf86-input-keyboard $as_me 1.1.1, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20700,7 +20689,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-input-keyboard config.status 1.1.0
+xf86-input-keyboard config.status 1.1.1
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -20951,6 +20940,7 @@
s,@CCDEPMODE@,$CCDEPMODE,;t t
s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+s,@SED@,$SED,;t t
s,@EGREP@,$EGREP,;t t
s,@LN_S@,$LN_S,;t t
s,@ECHO@,$ECHO,;t t
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-keyboard-X11R7.1-1.1.0/configure.ac new/xf86-input-keyboard-1.1.1/configure.ac
--- old/xf86-input-keyboard-X11R7.1-1.1.0/configure.ac 2006-04-07 19:47:17.000000000 +0200
+++ new/xf86-input-keyboard-1.1.1/configure.ac 2006-10-14 00:26:05.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-keyboard],
- 1.1.0,
+ 1.1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-keyboard)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-keyboard-X11R7.1-1.1.0/ltmain.sh new/xf86-input-keyboard-1.1.1/ltmain.sh
--- old/xf86-input-keyboard-X11R7.1-1.1.0/ltmain.sh 2006-02-12 01:50:49.000000000 +0100
+++ new/xf86-input-keyboard-1.1.1/ltmain.sh 2006-07-13 09:12:13.000000000 +0200
@@ -46,10 +46,16 @@
VERSION=1.5.22
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
# Check that we have a working $echo.
@@ -105,12 +111,14 @@
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
- save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+ eval "if test \"\${$lt_var+set}\" = set; then
+ save_$lt_var=\$$lt_var
+ $lt_var=C
+ export $lt_var
+ fi"
+done
# Make sure IFS has a sensible default
lt_nl='
@@ -136,6 +144,8 @@
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
#####################################
# Shell function definitions:
@@ -327,7 +337,17 @@
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
- my_xdir="$my_gentop/$my_xlib"
+ my_xlib_u=$my_xlib
+ while :; do
+ case " $extracted_archives " in
+ *" $my_xlib_u "*)
+ extracted_serial=`expr $extracted_serial + 1`
+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
+ *) break ;;
+ esac
+ done
+ extracted_archives="$extracted_archives $my_xlib_u"
+ my_xdir="$my_gentop/$my_xlib_u"
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
@@ -758,6 +778,7 @@
*.f90) xform=f90 ;;
*.for) xform=for ;;
*.java) xform=java ;;
+ *.obj) xform=obj ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1159,9 @@
for arg
do
case $arg in
- -all-static | -static)
- if test "X$arg" = "X-all-static"; then
+ -all-static | -static | -static-libtool-libs)
+ case $arg in
+ -all-static)
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
fi
@@ -1147,12 +1169,20 @@
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
- else
+ ;;
+ -static)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=built
- fi
+ ;;
+ -static-libtool-libs)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=yes
+ ;;
+ esac
build_libtool_libs=no
build_old_libs=yes
break
@@ -1712,7 +1742,7 @@
continue
;;
- -static)
+ -static | -static-libtool-libs)
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
@@ -2490,7 +2520,9 @@
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ { { test "$prefer_static_libs" = no ||
+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ test -z "$old_library"; }; then
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
@@ -3186,7 +3218,7 @@
# which has an extra 1 added just for fun
#
case $version_type in
- darwin|linux|osf|windows)
+ darwin|linux|osf|windows|none)
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
@@ -3410,11 +3442,11 @@
fi
# Eliminate all temporary directories.
- for path in $notinst_path; do
- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
- done
+# for path in $notinst_path; do
+# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+# done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
@@ -3515,13 +3547,12 @@
int main() { return 0; }
EOF
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
ldd_output=`ldd conftest`
for i in $deplibs; do
name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" -ne "0"; then
+ if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -3560,9 +3591,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $i
- # Did it work?
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
@@ -3594,7 +3623,7 @@
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
- $echo "*** make it link in! You will probably need to install it or some"
+ $echo "*** make it link in! You will probably need to install it or some"
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
@@ -4239,12 +4268,14 @@
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec
+ # -Wl from whole_archive_flag_spec and hope we can get by with
+ # turning comma into space..
wl=
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@@ -4692,16 +4723,16 @@
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
else
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
fi
;;
* )
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
;;
esac
;;
@@ -4716,13 +4747,13 @@
# really was required.
# Nullify the symbol file.
- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
fi
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4840,7 @@
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
else
# fast_install is set to needless
relink_command=
@@ -4846,7 +4877,7 @@
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
fi
# Quote $echo for shipping.
@@ -5253,6 +5284,18 @@
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
+else
+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5438,7 @@
;;
esac
$echo >> $output "\
- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+ \$echo \"\$0: cannot exec \$program \$*\"
exit $EXIT_FAILURE
fi
else
@@ -5581,7 +5624,7 @@
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -5926,9 +5969,9 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
else
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6180,7 @@
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
$show "$relink_command"
if $run eval "$relink_command"; then :
@@ -6413,12 +6456,15 @@
fi
# Restore saved environment variables
- if test "${save_LC_ALL+set}" = set; then
- LC_ALL="$save_LC_ALL"; export LC_ALL
- fi
- if test "${save_LANG+set}" = set; then
- LANG="$save_LANG"; export LANG
- fi
+ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ do
+ eval "if test \"\${save_$lt_var+set}\" = set; then
+ $lt_var=\$save_$lt_var; export $lt_var
+ else
+ $lt_unset $lt_var
+ fi"
+ done
+
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
@@ -6775,9 +6821,9 @@
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
- try to export only the symbols listed in SYMFILE
+ try to export only the symbols listed in SYMFILE
-export-symbols-regex REGEX
- try to export only the symbols matching REGEX
+ try to export only the symbols matching REGEX
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
@@ -6791,9 +6837,11 @@
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
- -static do not do any dynamic linking of libtool libraries
+ -static do not do any dynamic linking of uninstalled libtool libraries
+ -static-libtool-libs
+ do not do any dynamic linking of libtool libraries
-version-info CURRENT[:REVISION[:AGE]]
- specify library version info [each variable defaults to 0]
+ specify library version info [each variable defaults to 0]
All other options (arguments beginning with \`-') are ignored.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-keyboard-X11R7.1-1.1.0/man/Makefile.am new/xf86-input-keyboard-1.1.1/man/Makefile.am
--- old/xf86-input-keyboard-X11R7.1-1.1.0/man/Makefile.am 2005-12-06 23:48:30.000000000 +0100
+++ new/xf86-input-keyboard-1.1.1/man/Makefile.am 2006-10-12 00:23:44.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.7 2005/11/28 22:04:07 alanc Exp $
+# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-keyboard-X11R7.1-1.1.0/man/Makefile.in new/xf86-input-keyboard-1.1.1/man/Makefile.in
--- old/xf86-input-keyboard-X11R7.1-1.1.0/man/Makefile.in 2006-05-23 05:20:00.000000000 +0200
+++ new/xf86-input-keyboard-1.1.1/man/Makefile.in 2006-10-14 00:26:19.000000000 +0200
@@ -14,7 +14,7 @@
@SET_MAKE@
-# $Id: Makefile.am,v 1.7 2005/11/28 22:04:07 alanc Exp $
+# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
@@ -151,6 +151,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SED = sed
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -207,7 +208,6 @@
driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
EXTRA_DIST = @DRIVER_NAME@.man @COMPAT_DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA)
-SED = sed
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-keyboard-X11R7.1-1.1.0/man/kbd.man new/xf86-input-keyboard-1.1.1/man/kbd.man
--- old/xf86-input-keyboard-X11R7.1-1.1.0/man/kbd.man 2005-12-19 10:07:50.000000000 +0100
+++ new/xf86-input-keyboard-1.1.1/man/kbd.man 2006-10-12 00:23:44.000000000 +0200
@@ -1,4 +1,4 @@
-.\" $XdotOrg: driver/xf86-input-keyboard/man/kbd.man,v 1.4 2005/12/19 09:07:50 alanc Exp $
+.\" $XdotOrg: $
.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/keyboard.man,v 1.2 2001/01/27 18:20:57 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-keyboard-X11R7.1-1.1.0/man/keyboard.man new/xf86-input-keyboard-1.1.1/man/keyboard.man
--- old/xf86-input-keyboard-X11R7.1-1.1.0/man/keyboard.man 2005-12-19 10:07:50.000000000 +0100
+++ new/xf86-input-keyboard-1.1.1/man/keyboard.man 2006-10-12 00:23:44.000000000 +0200
@@ -1,4 +1,4 @@
-.\" $XdotOrg: driver/xf86-input-keyboard/man/keyboard.man,v 1.4 2005/12/19 09:07:50 alanc Exp $
+.\" $XdotOrg: $
.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/keyboard.man,v 1.2 2001/01/27 18:20:57 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-keyboard-X11R7.1-1.1.0/src/Makefile.in new/xf86-input-keyboard-1.1.1/src/Makefile.in
--- old/xf86-input-keyboard-X11R7.1-1.1.0/src/Makefile.in 2006-05-23 05:20:00.000000000 +0200
+++ new/xf86-input-keyboard-1.1.1/src/Makefile.in 2006-10-14 00:26:19.000000000 +0200
@@ -169,6 +169,7 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-input-keyboard-X11R7.1-1.1.0/src/kbd.c new/xf86-input-keyboard-1.1.1/src/kbd.c
--- old/xf86-input-keyboard-X11R7.1-1.1.0/src/kbd.c 2006-04-07 19:47:17.000000000 +0200
+++ new/xf86-input-keyboard-1.1.1/src/kbd.c 2006-10-12 00:23:44.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XdotOrg: driver/xf86-input-keyboard/src/kbd.c,v 1.20 2006/04/07 17:47:17 ajax Exp $ */
+/* $XdotOrg: driver/xf86-input-keyboard/src/kbd.c,v 1.19 2005/11/09 21:31:23 kem Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.8 2003/11/03 05:11:47 tsi Exp $ */
/*
@@ -12,13 +12,16 @@
* xf86Events.c and xf86Io.c which are
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
*/
-/* $XdotOrg: driver/xf86-input-keyboard/src/kbd.c,v 1.20 2006/04/07 17:47:17 ajax Exp $ */
+/* $XdotOrg: driver/xf86-input-keyboard/src/kbd.c,v 1.19 2005/11/09 21:31:23 kem Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include
+#include
+#include
+#include
#define NEED_EVENTS
#include
++++++ xf86-input-mouse-1.1.1.tar.bz2 -> xf86-input-mouse-1.1.2.tar.bz2 ++++++
++++ 15894 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-mouse-1.1.1/configure.ac new/xf86-input-mouse-1.1.2/configure.ac
--- old/xf86-input-mouse-1.1.1/configure.ac 2006-05-15 12:33:45.000000000 +0200
+++ new/xf86-input-mouse-1.1.2/configure.ac 2006-10-14 00:28:11.000000000 +0200
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-mouse],
- 1.1.1,
+ 1.1.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-mouse)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-mouse-1.1.1/man/Makefile.am new/xf86-input-mouse-1.1.2/man/Makefile.am
--- old/xf86-input-mouse-1.1.1/man/Makefile.am 2005-12-06 23:48:31.000000000 +0100
+++ new/xf86-input-mouse-1.1.2/man/Makefile.am 2006-10-12 00:23:54.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.7 2005/12/06 22:48:31 kem Exp $
+# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
@@ -27,11 +27,11 @@
drivermandir = $(DRIVER_MAN_DIR)
-driverman_PRE = @DRIVER_NAME@.man
+driverman_PRE = mousedrv.man
driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
-EXTRA_DIST = @DRIVER_NAME@.man
+EXTRA_DIST = mousedrv.man
CLEANFILES = $(driverman_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-mouse-1.1.1/man/mouse.man new/xf86-input-mouse-1.1.2/man/mouse.man
--- old/xf86-input-mouse-1.1.1/man/mouse.man 2006-04-21 12:48:11.000000000 +0200
+++ new/xf86-input-mouse-1.1.2/man/mouse.man 1970-01-01 01:00:00.000000000 +0100
@@ -1,248 +0,0 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.man,v 1.6 2003/04/03 22:18:31 dawes Exp $
-.\" shorthand for double quote that works everywhere.
-.ds q \N'34'
-.TH MOUSE __drivermansuffix__ __vendorversion__
-.SH NAME
-mouse \- Mouse input driver
-.SH SYNOPSIS
-.nf
-.B "Section \*qInputDevice\*q"
-.BI " Identifier \*q" idevname \*q
-.B " Driver \*qmouse\*q"
-.BI " Option \*qProtocol\*q \*q" protoname \*q
-.BI " Option \*qDevice\*q \*q" devpath \*q
-\ \ ...
-.B EndSection
-.fi
-.SH DESCRIPTION
-.B mouse
-is an __xservername__ input driver for mice. The driver supports most available
-mouse types and interfaces. USB mice are only supported on some OSs,
-and the level of support for PS/2 mice depends on the OS.
-.PP
-The
-.B mouse
-driver functions as a pointer input device, and may be used as the
-X server's core pointer. Multiple mice are supported by multiple
-instances of this driver.
-.SH SUPPORTED HARDWARE
-There is a detailed list of hardware that the
-.B mouse
-driver supports in the
-.I README.mouse
-document. This can be found
-in __projectroot__/lib/X11/doc/, or online at
-http://www.x.org/current/mouse.html.
-.SH CONFIGURATION DETAILS
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
-details and for options that can be used with all input drivers. This
-section only covers configuration details specific to this driver.
-.PP
-The driver can auto-detect the mouse type on some platforms. On some
-platforms this is limited to plug and play serial mice, and on some the
-auto-detection works for any mouse that the OS's kernel driver supports.
-On others, it is always necessary to specify the mouse protocol in the
-config file. The
-.I README.mouse
-document contains some detailed information about this.
-.PP
-The following driver
-.B Options
-are supported:
-.TP 7
-.BI "Option \*qProtocol\*q \*q" string \*q
-Specify the mouse protocol. Valid protocol types include:
-.PP
-.RS 12
-Auto, Microsoft, MouseSystems, MMSeries, Logitech, MouseMan, MMHitTab,
-GlidePoint, IntelliMouse, ThinkingMouse, ValuMouseScroll, AceCad, PS/2, ImPS/2,
-ExplorerPS/2, ThinkingMousePS/2, MouseManPlusPS/2, GlidePointPS/2,
-NetMousePS/2, NetScrollPS/2, BusMouse, SysMouse, WSMouse, USB, VUID, Xqueue.
-.RE
-.PP
-.RS 7
-Not all protocols are supported on all platforms. The "Auto" platform
-specifies that protocol auto-detection should be attempted. There is no
-default protocol setting, and specifying this option is mandatory.
-.RE
-.TP 7
-.BI "Option \*qDevice\*q \*q" string \*q
-Specifies the device through which the mouse can be accessed. A common
-setting is "/dev/mouse", which is often a symbolic link to the real
-device. This option is mandatory, and there is no default setting.
-.TP 7
-.BI "Option \*qButtons\*q \*q" integer \*q
-Specifies the number of mouse buttons. In cases where the number of buttons
-cannot be auto-detected, the default value is 3. The maximum number is 24.
-.TP 7
-.BI "Option \*qEmulate3Buttons\*q \*q" boolean \*q
-Enable/disable the emulation of the third (middle) mouse button for mice
-which only have two physical buttons. The third button is emulated by
-pressing both buttons simultaneously. Default: off
-.TP 7
-.BI "Option \*qEmulate3Timeout\*q \*q" integer \*q
-Sets the timeout (in milliseconds) that the driver waits before deciding
-if two buttons where pressed "simultaneously" when 3 button emulation is
-enabled. Default: 50.
-.TP 7
-.BI "Option \*qChordMiddle\*q \*q" boolean \*q
-Enable/disable handling of mice that send left+right events when the middle
-button is used. Default: off.
-.TP 7
-.BI "Option \*qEmulateWheel\*q \*q" boolean \*q
-Enable/disable "wheel" emulation. Wheel emulation means emulating button
-press/release events when the mouse is moved while a specific real button
-is pressed. Wheel button events (typically buttons 4 and 5) are
-usually used for scrolling. Wheel emulation is useful for getting wheel-like
-behaviour with trackballs. It can also be useful for mice with 4 or
-more buttons but no wheel. See the description of the
-.BR EmulateWheelButton ,
-.BR EmulateWheelInertia ,
-.BR XAxisMapping ,
-and
-.B YAxisMapping
-options below. Default: off.
-.TP 7
-.BI "Option \*qEmulateWheelButton\*q \*q" integer \*q
-Specifies which button must be held down to enable wheel emulation mode.
-While this button is down, X and/or Y pointer movement will generate button
-press/release events as specified for the
-.B XAxisMapping
-and
-.B YAxisMapping
-settings. Default: 4.
-.TP 7
-.BI "Option \*qEmulateWheelInertia\*q \*q" integer \*q
-Specifies how far (in pixels) the pointer must move to generate button
-press/release events in wheel emulation mode. Default: 10.
-.TP 7
-.BI "Option \*qEmulateWheelTimeout\*q \*q" integer \*q
-Specifies the time in milliseconds the
-.BR EmulateWheelButton
-must be pressed before wheel emulation is started. If the
-.BR EmulateWheelButton
-is released before this timeout, the original button press/release event
-is sent. Default: 200.
-.TP 7
-.BI "Option \*qXAxisMapping\*q \*q" "N1 N2" \*q
-Specifies which buttons are mapped to motion in the X direction in wheel
-emulation mode. Button number
-.I N1
-is mapped to the negative X axis motion and button number
-.I N2
-is mapped to the positive X axis motion. Default: no mapping.
-.TP 7
-.BI "Option \*qYAxisMapping\*q \*q" "N1 N2" \*q
-Specifies which buttons are mapped to motion in the Y direction in wheel
-emulation mode. Button number
-.I N1
-is mapped to the negative Y axis motion and button number
-.I N2
-is mapped to the positive Y axis motion. Default: no mapping.
-.TP 7
-.BI "Option \*qZAxisMapping\*q \*qX\*q"
-.TP 7
-.BI "Option \*qZAxisMapping\*q \*qY\*q"
-.TP 7
-.BI "Option \*qZAxisMapping\*q \*q" "N1 N2" \*q
-.TP 7
-.BI "Option \*qZAxisMapping\*q \*q" "N1 N2 N3 N4" \*q
-Set the mapping for the Z axis (wheel) motion to buttons or another axis
-.RB ( X
-or
-.BR Y ).
-Button number
-.I N1
-is mapped to the negative Z axis motion and button number
-.I N2
-is mapped to the positive Z axis motion. For mice with two wheels,
-four button numbers can be specified, with the negative and positive motion
-of the second wheel mapped respectively to buttons number
-.I N3
-and
-.IR N4 .
-Note that the protocols for mice with one and two wheels can be different
-and the driver may not be able to autodetect it.
-Default: "4 5".
-.TP 7
-.BI "Option \*qButtonMapping\*q \*q" "N1 N2 [...]" \*q
-Specifies how physical mouse buttons are mapped to logical buttons.
-Physcial button 1 is mapped to logical button
-.IR N1 ,
-physical button 2 to
-.IR N2 ,
-and so forth. This enables the use of physical buttons that are obscured by
-.IR ZAxisMapping .
-Default:\ "1\ 2\ 3\ 8\ 9\ 10\ ...".
-.TP 7
-.BI "Option \*qFlipXY\*q \*q" boolean \*q
-Enable/disable swapping the X and Y axes. This transformation is applied
-after the
-.BR InvX ,
-.B InvY
-and
-.BR AngleOffset
-transformations. Default: off.
-.TP 7
-.BI "Option \*qInvX\*q \*q" boolean \*q
-Invert the X axis. Default: off.
-.TP 7
-.BI "Option \*qInvY\*q \*q" boolean \*q
-Invert the Y axis. Default: off.
-.TP 7
-.BI "Option \*qAngleOffset\*q \*q" integer \*q
-Specify a clockwise angular offset (in degrees) to apply to the pointer
-motion. This transformation is applied before the
-.BR FlipXY ,
-.B InvX
-and
-.B InvY
-transformations. Default: 0.
-.TP 7
-.BI "Option \*qSampleRate\*q \*q" integer \*q
-Sets the number of motion/button events the mouse sends per second. Setting
-this is only supported for some mice, including some Logitech mice and
-some PS/2 mice on some platforms. Default: whatever the mouse is
-already set to.
-.TP 7
-.BI "Option \*qResolution\*q \*q" integer \*q
-Sets the resolution of the device in counts per inch. Setting this is
-only supported for some mice, including some PS/2 mice on some platforms.
-Default: whatever the mouse is already set to.
-.TP 7
-.BI "Option \*qDragLockButtons\*q \*q" "L1 B2 L3 B4" \*q
-Sets \*qdrag lock buttons\*q that simulate holding a button down, so
-that low dexterity people do not have to hold a button down at the
-same time they move a mouse cursor. Button numbers occur in pairs,
-with the lock button number occurring first, followed by the button
-number that is the target of the lock button.
-.TP 7
-.BI "Option \*qDragLockButtons\*q \*q" "M1" \*q
-Sets a \*qmaster drag lock button\*q that acts as a \*qMeta Key\*q
-indicating that the next button pressed is to be
-\*qdrag locked\*q.
-.TP 7
-.BI "Option \*qClearDTR\*q \*q" boolean \*q
-Enable/disable clearing the DTR line on the serial port used by the mouse.
-Some dual-protocol mice require the DTR line to be cleared to operate
-in the non-default protocol. This option is for serial mice only.
-Default: off.
-.TP 7
-.BI "Option \*qClearRTS\*q \*q" boolean \*q
-Enable/disable clearing the RTS line on the serial port used by the mouse.
-Some dual-protocol mice require the RTS line to be cleared to operate
-in the non-default protocol. This option is for serial mice only.
-Default: off.
-.TP 7
-.BI "Option \*qBaudRate\*q \*q" integer \*q
-Set the baud rate to use for communicating with a serial mouse. This
-option should rarely be required because the default is correct for almost
-all situations. Valid values include: 300, 1200, 2400, 4800, 9600, 19200.
-Default: 1200.
-.PP
-There are some other options that may be used to control various parameters
-for serial port communication, but they are not documented here because
-the driver sets them correctly for each mouse protocol type.
-.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__),
-README.mouse.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-mouse-1.1.1/man/mousedrv.man new/xf86-input-mouse-1.1.2/man/mousedrv.man
--- old/xf86-input-mouse-1.1.1/man/mousedrv.man 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-input-mouse-1.1.2/man/mousedrv.man 2006-10-12 00:23:54.000000000 +0200
@@ -0,0 +1,248 @@
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.man,v 1.6 2003/04/03 22:18:31 dawes Exp $
+.\" shorthand for double quote that works everywhere.
+.ds q \N'34'
+.TH MOUSE __drivermansuffix__ __vendorversion__
+.SH NAME
+mouse \- Mouse input driver
+.SH SYNOPSIS
+.nf
+.B "Section \*qInputDevice\*q"
+.BI " Identifier \*q" idevname \*q
+.B " Driver \*qmouse\*q"
+.BI " Option \*qProtocol\*q \*q" protoname \*q
+.BI " Option \*qDevice\*q \*q" devpath \*q
+\ \ ...
+.B EndSection
+.fi
+.SH DESCRIPTION
+.B mouse
+is an __xservername__ input driver for mice. The driver supports most available
+mouse types and interfaces. USB mice are only supported on some OSs,
+and the level of support for PS/2 mice depends on the OS.
+.PP
+The
+.B mouse
+driver functions as a pointer input device, and may be used as the
+X server's core pointer. Multiple mice are supported by multiple
+instances of this driver.
+.SH SUPPORTED HARDWARE
+There is a detailed list of hardware that the
+.B mouse
+driver supports in the
+.I README.mouse
+document. This can be found
+in __projectroot__/lib/X11/doc/, or online at
+http://www.x.org/current/mouse.html.
+.SH CONFIGURATION DETAILS
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
+details and for options that can be used with all input drivers. This
+section only covers configuration details specific to this driver.
+.PP
+The driver can auto-detect the mouse type on some platforms. On some
+platforms this is limited to plug and play serial mice, and on some the
+auto-detection works for any mouse that the OS's kernel driver supports.
+On others, it is always necessary to specify the mouse protocol in the
+config file. The
+.I README.mouse
+document contains some detailed information about this.
+.PP
+The following driver
+.B Options
+are supported:
+.TP 7
+.BI "Option \*qProtocol\*q \*q" string \*q
+Specify the mouse protocol. Valid protocol types include:
+.PP
+.RS 12
+Auto, Microsoft, MouseSystems, MMSeries, Logitech, MouseMan, MMHitTab,
+GlidePoint, IntelliMouse, ThinkingMouse, ValuMouseScroll, AceCad, PS/2, ImPS/2,
+ExplorerPS/2, ThinkingMousePS/2, MouseManPlusPS/2, GlidePointPS/2,
+NetMousePS/2, NetScrollPS/2, BusMouse, SysMouse, WSMouse, USB, VUID, Xqueue.
+.RE
+.PP
+.RS 7
+Not all protocols are supported on all platforms. The "Auto" platform
+specifies that protocol auto-detection should be attempted. There is no
+default protocol setting, and specifying this option is mandatory.
+.RE
+.TP 7
+.BI "Option \*qDevice\*q \*q" string \*q
+Specifies the device through which the mouse can be accessed. A common
+setting is "/dev/mouse", which is often a symbolic link to the real
+device. This option is mandatory, and there is no default setting.
+.TP 7
+.BI "Option \*qButtons\*q \*q" integer \*q
+Specifies the number of mouse buttons. In cases where the number of buttons
+cannot be auto-detected, the default value is 3. The maximum number is 24.
+.TP 7
+.BI "Option \*qEmulate3Buttons\*q \*q" boolean \*q
+Enable/disable the emulation of the third (middle) mouse button for mice
+which only have two physical buttons. The third button is emulated by
+pressing both buttons simultaneously. Default: off
+.TP 7
+.BI "Option \*qEmulate3Timeout\*q \*q" integer \*q
+Sets the timeout (in milliseconds) that the driver waits before deciding
+if two buttons where pressed "simultaneously" when 3 button emulation is
+enabled. Default: 50.
+.TP 7
+.BI "Option \*qChordMiddle\*q \*q" boolean \*q
+Enable/disable handling of mice that send left+right events when the middle
+button is used. Default: off.
+.TP 7
+.BI "Option \*qEmulateWheel\*q \*q" boolean \*q
+Enable/disable "wheel" emulation. Wheel emulation means emulating button
+press/release events when the mouse is moved while a specific real button
+is pressed. Wheel button events (typically buttons 4 and 5) are
+usually used for scrolling. Wheel emulation is useful for getting wheel-like
+behaviour with trackballs. It can also be useful for mice with 4 or
+more buttons but no wheel. See the description of the
+.BR EmulateWheelButton ,
+.BR EmulateWheelInertia ,
+.BR XAxisMapping ,
+and
+.B YAxisMapping
+options below. Default: off.
+.TP 7
+.BI "Option \*qEmulateWheelButton\*q \*q" integer \*q
+Specifies which button must be held down to enable wheel emulation mode.
+While this button is down, X and/or Y pointer movement will generate button
+press/release events as specified for the
+.B XAxisMapping
+and
+.B YAxisMapping
+settings. Default: 4.
+.TP 7
+.BI "Option \*qEmulateWheelInertia\*q \*q" integer \*q
+Specifies how far (in pixels) the pointer must move to generate button
+press/release events in wheel emulation mode. Default: 10.
+.TP 7
+.BI "Option \*qEmulateWheelTimeout\*q \*q" integer \*q
+Specifies the time in milliseconds the
+.BR EmulateWheelButton
+must be pressed before wheel emulation is started. If the
+.BR EmulateWheelButton
+is released before this timeout, the original button press/release event
+is sent. Default: 200.
+.TP 7
+.BI "Option \*qXAxisMapping\*q \*q" "N1 N2" \*q
+Specifies which buttons are mapped to motion in the X direction in wheel
+emulation mode. Button number
+.I N1
+is mapped to the negative X axis motion and button number
+.I N2
+is mapped to the positive X axis motion. Default: no mapping.
+.TP 7
+.BI "Option \*qYAxisMapping\*q \*q" "N1 N2" \*q
+Specifies which buttons are mapped to motion in the Y direction in wheel
+emulation mode. Button number
+.I N1
+is mapped to the negative Y axis motion and button number
+.I N2
+is mapped to the positive Y axis motion. Default: no mapping.
+.TP 7
+.BI "Option \*qZAxisMapping\*q \*qX\*q"
+.TP 7
+.BI "Option \*qZAxisMapping\*q \*qY\*q"
+.TP 7
+.BI "Option \*qZAxisMapping\*q \*q" "N1 N2" \*q
+.TP 7
+.BI "Option \*qZAxisMapping\*q \*q" "N1 N2 N3 N4" \*q
+Set the mapping for the Z axis (wheel) motion to buttons or another axis
+.RB ( X
+or
+.BR Y ).
+Button number
+.I N1
+is mapped to the negative Z axis motion and button number
+.I N2
+is mapped to the positive Z axis motion. For mice with two wheels,
+four button numbers can be specified, with the negative and positive motion
+of the second wheel mapped respectively to buttons number
+.I N3
+and
+.IR N4 .
+Note that the protocols for mice with one and two wheels can be different
+and the driver may not be able to autodetect it.
+Default: "4 5".
+.TP 7
+.BI "Option \*qButtonMapping\*q \*q" "N1 N2 [...]" \*q
+Specifies how physical mouse buttons are mapped to logical buttons.
+Physcial button 1 is mapped to logical button
+.IR N1 ,
+physical button 2 to
+.IR N2 ,
+and so forth. This enables the use of physical buttons that are obscured by
+.IR ZAxisMapping .
+Default:\ "1\ 2\ 3\ 8\ 9\ 10\ ...".
+.TP 7
+.BI "Option \*qFlipXY\*q \*q" boolean \*q
+Enable/disable swapping the X and Y axes. This transformation is applied
+after the
+.BR InvX ,
+.B InvY
+and
+.BR AngleOffset
+transformations. Default: off.
+.TP 7
+.BI "Option \*qInvX\*q \*q" boolean \*q
+Invert the X axis. Default: off.
+.TP 7
+.BI "Option \*qInvY\*q \*q" boolean \*q
+Invert the Y axis. Default: off.
+.TP 7
+.BI "Option \*qAngleOffset\*q \*q" integer \*q
+Specify a clockwise angular offset (in degrees) to apply to the pointer
+motion. This transformation is applied before the
+.BR FlipXY ,
+.B InvX
+and
+.B InvY
+transformations. Default: 0.
+.TP 7
+.BI "Option \*qSampleRate\*q \*q" integer \*q
+Sets the number of motion/button events the mouse sends per second. Setting
+this is only supported for some mice, including some Logitech mice and
+some PS/2 mice on some platforms. Default: whatever the mouse is
+already set to.
+.TP 7
+.BI "Option \*qResolution\*q \*q" integer \*q
+Sets the resolution of the device in counts per inch. Setting this is
+only supported for some mice, including some PS/2 mice on some platforms.
+Default: whatever the mouse is already set to.
+.TP 7
+.BI "Option \*qDragLockButtons\*q \*q" "L1 B2 L3 B4" \*q
+Sets \*qdrag lock buttons\*q that simulate holding a button down, so
+that low dexterity people do not have to hold a button down at the
+same time they move a mouse cursor. Button numbers occur in pairs,
+with the lock button number occurring first, followed by the button
+number that is the target of the lock button.
+.TP 7
+.BI "Option \*qDragLockButtons\*q \*q" "M1" \*q
+Sets a \*qmaster drag lock button\*q that acts as a \*qMeta Key\*q
+indicating that the next button pressed is to be
+\*qdrag locked\*q.
+.TP 7
+.BI "Option \*qClearDTR\*q \*q" boolean \*q
+Enable/disable clearing the DTR line on the serial port used by the mouse.
+Some dual-protocol mice require the DTR line to be cleared to operate
+in the non-default protocol. This option is for serial mice only.
+Default: off.
+.TP 7
+.BI "Option \*qClearRTS\*q \*q" boolean \*q
+Enable/disable clearing the RTS line on the serial port used by the mouse.
+Some dual-protocol mice require the RTS line to be cleared to operate
+in the non-default protocol. This option is for serial mice only.
+Default: off.
+.TP 7
+.BI "Option \*qBaudRate\*q \*q" integer \*q
+Set the baud rate to use for communicating with a serial mouse. This
+option should rarely be required because the default is correct for almost
+all situations. Valid values include: 300, 1200, 2400, 4800, 9600, 19200.
+Default: 1200.
+.PP
+There are some other options that may be used to control various parameters
+for serial port communication, but they are not documented here because
+the driver sets them correctly for each mouse protocol type.
+.SH "SEE ALSO"
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__),
+README.mouse.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-mouse-1.1.1/src/mouse.c new/xf86-input-mouse-1.1.2/src/mouse.c
--- old/xf86-input-mouse-1.1.1/src/mouse.c 2006-05-26 15:55:39.000000000 +0200
+++ new/xf86-input-mouse-1.1.2/src/mouse.c 2006-10-12 00:23:54.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XdotOrg: driver/xf86-input-mouse/src/mouse.c,v 1.30 2006/05/26 13:55:39 mhopf Exp $ */
+/* $XdotOrg: driver/xf86-input-mouse/src/mouse.c,v 1.29 2006/04/21 11:15:23 mhopf Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v 1.79 2003/11/03 05:11:48 tsi Exp $ */
/*
*
@@ -52,6 +52,7 @@
#include
#include
#include
+#include
#define NEED_EVENTS
#include
#include
@@ -70,7 +71,11 @@
#include "xf86Xinput.h"
#include "xf86_OSproc.h"
#include "xf86OSmouse.h"
+
+#ifndef NEED_XF86_TYPES
#define NEED_XF86_TYPES /* for xisb.h when !XFree86LOADER */
+#endif
+
#include "compiler.h"
#include "xisb.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-mouse-1.1.1/src/pnp.c new/xf86-input-mouse-1.1.2/src/pnp.c
--- old/xf86-input-mouse-1.1.1/src/pnp.c 2006-04-19 13:45:37.000000000 +0200
+++ new/xf86-input-mouse-1.1.2/src/pnp.c 2006-10-12 00:23:54.000000000 +0200
@@ -26,6 +26,8 @@
#endif
#include
+#include
+#include
#define NEED_EVENTS
#include
#include
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org