xmodmap 1.0.3.

2007-08-13 15:12:20 +02:00 · 2007-08-13 15:12:20 +02:00 · a078a0f511
parent e45c60e611
commit a078a0f511
21 changed files with 2074 additions and 1877 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -2,9 +2,11 @@ x11-xserver-utils (7.2+4) UNRELEASED; urgency=low
  * iceauth 1.0.2.
    + removes blank line in the manpage (closes: #25285).
  * xmodmap 1.0.3.
    + manpage updated to state that -pm is the default (closes: #236198)
  * Add upstream URL to debian/copyright.
- -- Julien Cristau <jcristau@debian.org>  Mon, 13 Aug 2007 15:03:45 +0200
+ -- Julien Cristau <jcristau@debian.org>  Mon, 13 Aug 2007 15:10:05 +0200
 x11-xserver-utils (7.2+3) experimental; urgency=low
--- a/xmodmap/ChangeLog
+++ b/xmodmap/ChangeLog
@ -1,38 +1,279 @@
-2006-04-26  Adam Jackson  <ajax@freedesktop.org>
+commit 8d9922bdc53c5538dbfbba65f5a3e15afc8aea91
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon Aug 6 15:58:57 2007 -0700
    Version bump: 1.0.3
 commit 822b6bffce953041accc13f4633d2c5d4a8c8dcd
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Tue Jul 17 15:57:10 2007 -0700
    Use strncasecmp if we can, instead of our own homegrown strncmp_nocase
 commit d76839f34692c7bc4ad1337ca23a3362534c1172
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Tue Jul 17 15:52:39 2007 -0700
    Change usage messages from arrays of strings to simple const strings
 commit 658d0022a87c5d3afe3e006e539c5c1b981a8d73
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Tue Jul 17 13:27:50 2007 -0700
    Constify some simple cases
 commit b7aafba248db5e9c3ba39e4819d0b9ae156d2c82
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Tue Jul 17 13:03:38 2007 -0700
    sparse warning: non-ANSI definition of function 'process_file' & 'process_line'
 commit e1cb231b31be520b76aeb72acc1af9ff6682fa9d
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Tue Jul 17 13:01:07 2007 -0700
    Add hooks for checking source code with lint/sparse/etc.
 commit eda127631001674cd40466fddb5225e618c2a327
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Tue Jul 17 12:54:16 2007 -0700
    Remove unused code
 commit b57637a154a40e874a6bcb351aaa8335e86ae3c0
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Tue Jul 17 12:48:31 2007 -0700
    Coverity #678: get_keysym_list: Returned without freeing storage "keysymlist"
    Free allocated memory in error path when it's not being returned
 commit 72a01c6a3bae2cf113ab0ec812df41fec9b99a51
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Tue Jul 17 11:04:16 2007 -0700
    Replace static ChangeLog with dist-hook to generate from git log
 commit 4dfbd74bda684bea748fbbcbfc172f6325423d12
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Tue Jul 17 10:37:57 2007 -0700
    Use AM_CFLAGS instead of xmodmap_CFLAGS to avoid automake-1.10 warnings
 commit fd25acd688b86a1490198d61f66d2503a87883a0
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Apr 11 15:30:16 2007 -0700
    Bug 10616: manpage should note -pm is the default if no options are given
    X.Org Bugzilla #10616 <https://bugs.freedesktop.org/show_bug.cgi?id=10616>
    Reported upstream from
    Debian Bug #236918 <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=236198>
 commit 15a83b060b9b4bd7d6a64eacc7191e33eb91b269
 Author: Adam Jackson <ajax@benzedrine.nwnk.net>
 Date:   Fri Oct 13 17:55:42 2006 -0400
    Bump to 1.0.2
 commit 27404e37e50fe637f33f6efac2fa73c9cfc1026c
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Sep 13 15:08:59 2006 -0700
    Add *~ to .gitignore to ignore emacs droppings
 commit 98063dc377dff55f1b057eda14ace69beed82c16
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Sep 13 15:08:19 2006 -0700
    renamed: .cvsignore -> .gitignore
 commit 86a4f2a2d66bbeb6c9deee9133eb335f593c47f9
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Sep 13 15:07:16 2006 -0700
    Sun bug 6459447: Add note on reversing CapsLock/Control swap to man page
    http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6459447
 commit 7410e78207ca01d70d9df14eb1e4e07e7fe5f237
 Author: Adam Jackson <ajax@nwnk.net>
 Date:   Wed Apr 26 23:42:50 2006 +0000
 	* configure.ac:
    Bump to 1.0.1
-2006-03-22  Matthias Hopf  <mhopf@suse.de>
+commit e8a5353022f9e616c22a7a1659ff4d4d968f5d88
 Author: Matthias Hopf <mhopf@suse.de>
 Date:   Wed Mar 22 15:14:31 2006 +0000
 	* handle.c: (do_pointer):
    Allow changing of only a few buttons (not all).
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit b9854ab5e66bf9ec8911d6573440738325cd51b4
 Author: Kevin E Martin <kem@kem.org>
 Date:   Thu Dec 15 00:24:09 2005 +0000
 	* configure.ac:
    Update package version number for final X11R7 release candidate.
-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit a01cd5fe1c387c62b11368e3fac100e24e7d841e
 Author: Kevin E Martin <kem@kem.org>
 Date:   Tue Dec 6 22:48:24 2005 +0000
 	* Makefile.am:
    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit d39efd733ad56391082b08f9f486cf147e931197
 Author: Kevin E Martin <kem@kem.org>
 Date:   Sat Dec 3 05:49:26 2005 +0000
 	* configure.ac:
    Update package version number for X11R7 RC3 release.
-2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 8a0747a21f9737212784c55b62044e86caf1fbc8
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Mon Nov 28 22:01:45 2005 +0000
    Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
        update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
 commit 5e4dec81bffb5f296773c43aa45f52dc354c1886
 Author: Eric Anholt <anholt@freebsd.org>
 Date:   Mon Nov 21 10:35:05 2005 +0000
    Another pass at .cvsignores for apps.
 commit f9c0b2a947ea8690ac73e8f9ce857cd195551c01
 Author: Eric Anholt <anholt@freebsd.org>
 Date:   Sun Nov 20 22:08:54 2005 +0000
    Add/improve .cvsignore files for apps.
 commit 65fb2a168c968e486be090caad29349427e4d65e
 Author: Kevin E Martin <kem@kem.org>
 Date:   Wed Oct 19 02:47:56 2005 +0000
 	* configure.ac:
    Update package version number for RC1 release.
-2005-09-28  Kristian Høgsberg  <krh@redhat.com>
+commit 4c47648e4789efe03eec74c39b2ab6b9b27230fc
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Mon Oct 17 23:56:24 2005 +0000
-	* AUTHORS: Copy bits from COPYING here.
+    Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
        work better with BSD make
-	* README: Copy first paragraph from man page.
+commit 356f26e95eb7003f9f65ffe480773f0d788dc871
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Fri Oct 14 00:25:47 2005 +0000
-	* Makefile.am (EXTRA_DIST): Add swap.km.
+    Use sed to fill in variables in man page
 commit c4483b314106bcd2bb13e49650cfd279f74da73e
 Author: Kristian Høgsberg <krh@redhat.com>
 Date:   Wed Sep 28 19:28:15 2005 +0000
    Copy bits from COPYING here.
    Copy first paragraph from man page.
    Add swap.km.
 commit 149fc373521b4ceb33e37c693834a27a702fcc2b
 Author: Kevin E Martin <kem@kem.org>
 Date:   Fri Jul 29 21:22:36 2005 +0000
    Various changes preparing packages for RC0:
    - Verify and update package version numbers as needed
    - Implement versioning scheme
    - Change bug address to point to bugzilla bug entry form
    - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
        reenable it)
    - Fix makedepend to use pkgconfig and pass distcheck
    - Update build script to build macros first
    - Update modular Xorg version
 commit 327ffdf93fd0b8f7942c08653cb644be2062428c
 Author: Kevin E Martin <kem@kem.org>
 Date:   Thu Jul 28 02:58:59 2005 +0000
    Add build system for xmodmap Add xmodmap to build script
 commit 9145de293109ba96fc8b97ac59c16c51b992f416
 Author: Kristian Høgsberg <krh@redhat.com>
 Date:   Thu Nov 11 15:37:01 2004 +0000
    Fix #1818
 commit d9e41011e4477f581fb5592ad81fc081e0b606b9
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Sat Oct 30 20:33:44 2004 +0000
    Add -d flag for compilers like the Sun C compilers that produce dependency
        lists themselves. To use with the Sun compilers, add to host.def: #
        define UseCCMakeDepend YES # define DependFlags -cc $(CC) -d -xM (Sun
        bug id #4245688 - fix by Alan Coopersmith)
    Add Solaris to the platforms on which mprotect is run to set execute
        permissions when necessary. (Sun bug id #6175128 - fix by Alan
        Coopersmith)
    Internationalize digital output (Sun bug id #4119396 - fix by Steve
        Swales), add -bgpixmap option to set XPM file as background (originally
        from STSF project version of xclock by Alan Coopersmith)
    xc/programs/xmodmap/handle.c,pf.c xmodmap was printing line numbers which
        are one too low in error messages (Xorg bugzilla #1739, Sun bug id
        4637857 - fix by Sam Lau)
 commit ce64b2b312a73b9a4f266da8810ab552af4fbb1e
 Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
 Date:   Fri Oct 15 00:44:08 2004 +0000
    Thu Oct 14 20:43:03 2004 Søren Sandmann <sandmann@redhat.com>
    Fix a write-to-constant-string issue.
    Fix several buffer overruns.
 commit 8ad5d3b908d68353d407fa8f678c93320760eb12
 Author: Egbert Eich <eich@suse.de>
 Date:   Fri Apr 23 19:54:59 2004 +0000
    Merging XORG-CURRENT into trunk
 commit 536ef73f2a5310f25c99a9c3a41f71d032ef95a6
 Author: Egbert Eich <eich@suse.de>
 Date:   Sun Mar 14 08:35:42 2004 +0000
    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
 commit 11073ef989618e076133b1f58be7a406ba373b1b
 Author: Egbert Eich <eich@suse.de>
 Date:   Wed Mar 3 12:13:15 2004 +0000
    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
 commit e8ce00f47c06ea1bfcfd6538a80a10b868cee19e
 Author: Egbert Eich <eich@suse.de>
 Date:   Thu Feb 26 13:36:26 2004 +0000
    readding XFree86's cvs IDs
 commit 072ef0f49182d381ac7e630eccd1b5b6749334a7
 Author: Egbert Eich <eich@suse.de>
 Date:   Thu Feb 26 09:24:14 2004 +0000
    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
 commit eb9faf624f11691c4ca7344f4169117718cea9c7
 Author: Kaleb Keithley <kaleb@freedesktop.org>
 Date:   Thu Dec 4 22:03:56 2003 +0000
    XFree86 4.3.99.901 (RC 1)
 commit d678c60d8b5bede9e61f532aa1740d741b8bbe90
 Author: Kaleb Keithley <kaleb@freedesktop.org>
 Date:   Tue Nov 25 19:29:15 2003 +0000
    XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
 commit dc0f15394719e18bb9b01e70468f4d9908488d35
 Author: Kaleb Keithley <kaleb@freedesktop.org>
 Date:   Fri Nov 14 16:49:23 2003 +0000
    XFree86 4.3.0.1
 commit e29f1f1ed2128d7382a72ccb1684045fe4bc8183
 Author: Kaleb Keithley <kaleb@freedesktop.org>
 Date:   Fri Nov 14 15:54:54 2003 +0000
    R6.6 is the Xorg base-line
--- a/xmodmap/INSTALL
+++ b/xmodmap/INSTALL
@ -1,236 +0,0 @@
 Installation Instructions
 *************************
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
 Software Foundation, Inc.
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 Basic Installation
 ==================
 These are generic installation instructions.
   The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
 those values to create a `Makefile' in each directory of the package.
 It may also create one or more `.h' files containing system-dependent
 definitions.  Finally, it creates a shell script `config.status' that
 you can run in the future to recreate the current configuration, and a
 file `config.log' containing compiler output (useful mainly for
 debugging `configure').
   It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
 the results of its tests to speed up reconfiguring.  (Caching is
 disabled by default to prevent problems with accidental use of stale
 cache files.)
   If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
 diffs or instructions to the address given in the `README' so they can
 be considered for the next release.  If you are using the cache, and at
 some point `config.cache' contains results you don't want to keep, you
 may remove or edit it.
   The file `configure.ac' (or `configure.in') is used to create
 `configure' by a program called `autoconf'.  You only need
 `configure.ac' if you want to change it or regenerate `configure' using
 a newer version of `autoconf'.
 The simplest way to compile this package is:
  1. `cd' to the directory containing the package's source code and type
     `./configure' to configure the package for your system.  If you're
     using `csh' on an old version of System V, you might need to type
     `sh ./configure' instead to prevent `csh' from trying to execute
     `configure' itself.
     Running `configure' takes awhile.  While running, it prints some
     messages telling which features it is checking for.
  2. Type `make' to compile the package.
  3. Optionally, type `make check' to run any self-tests that come with
     the package.
  4. Type `make install' to install the programs and any data files and
     documentation.
  5. You can remove the program binaries and object files from the
     source code directory by typing `make clean'.  To also remove the
     files that `configure' created (so you can compile the package for
     a different kind of computer), type `make distclean'.  There is
     also a `make maintainer-clean' target, but that is intended mainly
     for the package's developers.  If you use it, you may have to get
     all sorts of other programs in order to regenerate files that came
     with the distribution.
 Compilers and Options
 =====================
 Some systems require unusual options for compilation or linking that the
 `configure' script does not know about.  Run `./configure --help' for
 details on some of the pertinent environment variables.
   You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
 is an example:
     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
   *Note Defining Variables::, for more details.
 Compiling For Multiple Architectures
 ====================================
 You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you must use a version of `make' that
 supports the `VPATH' variable, such as GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
   If you have to use a `make' that does not support the `VPATH'
 variable, you have to compile the package for one architecture at a
 time in the source code directory.  After you have installed the
 package for one architecture, use `make distclean' before reconfiguring
 for another architecture.
 Installation Names
 ==================
 By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
 `configure' the option `--prefix=PREFIX'.
   You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
 pass the option `--exec-prefix=PREFIX' to `configure', the package uses
 PREFIX as the prefix for installing programs and libraries.
 Documentation and other data files still use the regular prefix.
   In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
   If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 Optional Features
 =================
 Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
 `README' should mention any `--enable-' and `--with-' options that the
 package recognizes.
   For packages that use the X Window System, `configure' can usually
 find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 Specifying the System Type
 ==========================
 There may be some features `configure' cannot figure out automatically,
 but needs to determine by the type of machine the package will run on.
 Usually, assuming the package is built to be run on the _same_
 architectures, `configure' can figure that out, but if it prints a
 message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
     CPU-COMPANY-SYSTEM
 where SYSTEM can have one of these forms:
     OS KERNEL-OS
   See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
 need to know the machine type.
   If you are _building_ compiler tools for cross-compiling, you should
 use the option `--target=TYPE' to select the type of system they will
 produce code for.
   If you want to _use_ a cross compiler, that generates code for a
 platform different from the build platform, you should specify the
 "host" platform (i.e., that on which the generated programs will
 eventually be run) with `--host=TYPE'.
 Sharing Defaults
 ================
 If you want to set default values for `configure' scripts to share, you
 can create a site shell script called `config.site' that gives default
 values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
 A warning: not all `configure' scripts look for a site script.
 Defining Variables
 ==================
 Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
 them in the `configure' command line, using `VAR=value'.  For example:
     ./configure CC=/usr/local2/bin/gcc
 causes the specified `gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).  Here is a another example:
     /bin/bash ./configure CONFIG_SHELL=/bin/bash
 Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
 configuration-related scripts to be executed by `/bin/bash'.
 `configure' Invocation
 ======================
 `configure' recognizes the following options to control how it operates.
 `--help'
 `-h'
     Print a summary of the options to `configure', and exit.
 `--version'
 `-V'
     Print the version of Autoconf used to generate the `configure'
     script, and exit.
 `--cache-file=FILE'
     Enable the cache: use and save the results of the tests in FILE,
     traditionally `config.cache'.  FILE defaults to `/dev/null' to
     disable caching.
 `--config-cache'
 `-C'
     Alias for `--cache-file=config.cache'.
 `--quiet'
 `--silent'
 `-q'
     Do not print messages saying which checks are being made.  To
     suppress all normal output, redirect it to `/dev/null' (any error
     messages will still be shown).
 `--srcdir=DIR'
     Look for the package's source code in directory DIR.  Usually
     `configure' can determine that directory automatically.
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
--- a/xmodmap/Makefile.am
+++ b/xmodmap/Makefile.am
@ -21,7 +21,7 @@
 bin_PROGRAMS = xmodmap
-xmodmap_CFLAGS = $(DEP_CFLAGS)
+AM_CFLAGS = $(DEP_CFLAGS)
 xmodmap_LDADD = $(DEP_LIBS)
 xmodmap_SOURCES =	\
@ -36,6 +36,8 @@ appman_PRE = \
        xmodmap.man
 EXTRA_DIST = \
 	ChangeLog \
 	autogen.sh \
 	swap.km
 appmandir = $(APP_MAN_DIR)
@ -68,3 +70,20 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
 MAINTAINERCLEANFILES = ChangeLog
 .PHONY: ChangeLog
 ChangeLog:
 	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
 dist-hook: ChangeLog
 if LINT
 ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 		$(AM_CPPFLAGS) $(CPPFLAGS)
 lint:
 	$(LINT) $(ALL_LINT_FLAGS) $(AM_CFLAGS) $(xmodmap_SOURCES)
 endif LINT
--- a/xmodmap/Makefile.in
+++ b/xmodmap/Makefile.in
@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@ -36,15 +36,11 @@
 #  PERFORMANCE OF THIS SOFTWARE.
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@ -59,29 +55,29 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = xmodmap$(EXEEXT)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile config.guess config.sub depcomp install-sh missing
+	config.guess config.sub depcomp install-sh missing
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_xmodmap_OBJECTS = xmodmap-exec.$(OBJEXT) xmodmap-handle.$(OBJEXT) \
+am_xmodmap_OBJECTS = exec.$(OBJEXT) handle.$(OBJEXT) pf.$(OBJEXT) \
-	xmodmap-pf.$(OBJEXT) xmodmap-xmodmap.$(OBJEXT)
+	xmodmap.$(OBJEXT)
 xmodmap_OBJECTS = $(am_xmodmap_OBJECTS)
 am__DEPENDENCIES_1 =
 xmodmap_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@ -114,8 +110,6 @@ distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@ -140,6 +134,7 @@ ECHO_T = @ECHO_T@
 EXEEXT = @EXEEXT@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -149,13 +144,14 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
 LINT_FLAGS = @LINT_FLAGS@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -169,9 +165,11 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@ -183,6 +181,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@ -210,9 +209,12 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-xmodmap_CFLAGS = $(DEP_CFLAGS)
+top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CFLAGS = $(DEP_CFLAGS)
 xmodmap_LDADD = $(DEP_LIBS)
 xmodmap_SOURCES = \
        exec.c \
@ -225,7 +227,7 @@ xmodmap_SOURCES = \
 appman_PRE = \
        xmodmap.man
-EXTRA_DIST = swap.km $(appman_PRE)
+EXTRA_DIST = ChangeLog autogen.sh swap.km $(appman_PRE)
 appmandir = $(APP_MAN_DIR)
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
 CLEANFILES = $(appman_DATA)
@ -248,6 +250,10 @@ MAN_SUBSTS = \
 	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
 MAINTAINERCLEANFILES = ChangeLog
@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@LINT_TRUE@		$(AM_CPPFLAGS) $(CPPFLAGS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@ -290,7 +296,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@ -305,7 +311,7 @@ distclean-hdr:
 	-rm -f config.h stamp-h1
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@ -328,7 +334,7 @@ clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 xmodmap$(EXEEXT): $(xmodmap_OBJECTS) $(xmodmap_DEPENDENCIES) 
 	@rm -f xmodmap$(EXEEXT)
-	$(LINK) $(xmodmap_LDFLAGS) $(xmodmap_OBJECTS) $(xmodmap_LDADD) $(LIBS)
+	$(LINK) $(xmodmap_OBJECTS) $(xmodmap_LDADD) $(LIBS)
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@ -336,84 +342,27 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmodmap-exec.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exec.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmodmap-handle.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/handle.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmodmap-pf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmodmap-xmodmap.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmodmap.Po@am__quote@
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 xmodmap-exec.o: exec.c
@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmodmap_CFLAGS) $(CFLAGS) -MT xmodmap-exec.o -MD -MP -MF "$(DEPDIR)/xmodmap-exec.Tpo" -c -o xmodmap-exec.o `test -f 'exec.c' || echo '$(srcdir)/'`exec.c; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xmodmap-exec.Tpo" "$(DEPDIR)/xmodmap-exec.Po"; else rm -f "$(DEPDIR)/xmodmap-exec.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='exec.c' object='xmodmap-exec.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmodmap_CFLAGS) $(CFLAGS) -c -o xmodmap-exec.o `test -f 'exec.c' || echo '$(srcdir)/'`exec.c
 xmodmap-exec.obj: exec.c
@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmodmap_CFLAGS) $(CFLAGS) -MT xmodmap-exec.obj -MD -MP -MF "$(DEPDIR)/xmodmap-exec.Tpo" -c -o xmodmap-exec.obj `if test -f 'exec.c'; then $(CYGPATH_W) 'exec.c'; else $(CYGPATH_W) '$(srcdir)/exec.c'; fi`; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xmodmap-exec.Tpo" "$(DEPDIR)/xmodmap-exec.Po"; else rm -f "$(DEPDIR)/xmodmap-exec.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='exec.c' object='xmodmap-exec.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmodmap_CFLAGS) $(CFLAGS) -c -o xmodmap-exec.obj `if test -f 'exec.c'; then $(CYGPATH_W) 'exec.c'; else $(CYGPATH_W) '$(srcdir)/exec.c'; fi`
 xmodmap-handle.o: handle.c
@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmodmap_CFLAGS) $(CFLAGS) -MT xmodmap-handle.o -MD -MP -MF "$(DEPDIR)/xmodmap-handle.Tpo" -c -o xmodmap-handle.o `test -f 'handle.c' || echo '$(srcdir)/'`handle.c; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xmodmap-handle.Tpo" "$(DEPDIR)/xmodmap-handle.Po"; else rm -f "$(DEPDIR)/xmodmap-handle.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='handle.c' object='xmodmap-handle.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmodmap_CFLAGS) $(CFLAGS) -c -o xmodmap-handle.o `test -f 'handle.c' || echo '$(srcdir)/'`handle.c
 xmodmap-handle.obj: handle.c
@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmodmap_CFLAGS) $(CFLAGS) -MT xmodmap-handle.obj -MD -MP -MF "$(DEPDIR)/xmodmap-handle.Tpo" -c -o xmodmap-handle.obj `if test -f 'handle.c'; then $(CYGPATH_W) 'handle.c'; else $(CYGPATH_W) '$(srcdir)/handle.c'; fi`; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xmodmap-handle.Tpo" "$(DEPDIR)/xmodmap-handle.Po"; else rm -f "$(DEPDIR)/xmodmap-handle.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='handle.c' object='xmodmap-handle.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmodmap_CFLAGS) $(CFLAGS) -c -o xmodmap-handle.obj `if test -f 'handle.c'; then $(CYGPATH_W) 'handle.c'; else $(CYGPATH_W) '$(srcdir)/handle.c'; fi`
 xmodmap-pf.o: pf.c
@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmodmap_CFLAGS) $(CFLAGS) -MT xmodmap-pf.o -MD -MP -MF "$(DEPDIR)/xmodmap-pf.Tpo" -c -o xmodmap-pf.o `test -f 'pf.c' || echo '$(srcdir)/'`pf.c; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xmodmap-pf.Tpo" "$(DEPDIR)/xmodmap-pf.Po"; else rm -f "$(DEPDIR)/xmodmap-pf.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pf.c' object='xmodmap-pf.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmodmap_CFLAGS) $(CFLAGS) -c -o xmodmap-pf.o `test -f 'pf.c' || echo '$(srcdir)/'`pf.c
 xmodmap-pf.obj: pf.c
@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmodmap_CFLAGS) $(CFLAGS) -MT xmodmap-pf.obj -MD -MP -MF "$(DEPDIR)/xmodmap-pf.Tpo" -c -o xmodmap-pf.obj `if test -f 'pf.c'; then $(CYGPATH_W) 'pf.c'; else $(CYGPATH_W) '$(srcdir)/pf.c'; fi`; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xmodmap-pf.Tpo" "$(DEPDIR)/xmodmap-pf.Po"; else rm -f "$(DEPDIR)/xmodmap-pf.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pf.c' object='xmodmap-pf.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmodmap_CFLAGS) $(CFLAGS) -c -o xmodmap-pf.obj `if test -f 'pf.c'; then $(CYGPATH_W) 'pf.c'; else $(CYGPATH_W) '$(srcdir)/pf.c'; fi`
 xmodmap-xmodmap.o: xmodmap.c
@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmodmap_CFLAGS) $(CFLAGS) -MT xmodmap-xmodmap.o -MD -MP -MF "$(DEPDIR)/xmodmap-xmodmap.Tpo" -c -o xmodmap-xmodmap.o `test -f 'xmodmap.c' || echo '$(srcdir)/'`xmodmap.c; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xmodmap-xmodmap.Tpo" "$(DEPDIR)/xmodmap-xmodmap.Po"; else rm -f "$(DEPDIR)/xmodmap-xmodmap.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmodmap.c' object='xmodmap-xmodmap.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmodmap_CFLAGS) $(CFLAGS) -c -o xmodmap-xmodmap.o `test -f 'xmodmap.c' || echo '$(srcdir)/'`xmodmap.c
 xmodmap-xmodmap.obj: xmodmap.c
@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmodmap_CFLAGS) $(CFLAGS) -MT xmodmap-xmodmap.obj -MD -MP -MF "$(DEPDIR)/xmodmap-xmodmap.Tpo" -c -o xmodmap-xmodmap.obj `if test -f 'xmodmap.c'; then $(CYGPATH_W) 'xmodmap.c'; else $(CYGPATH_W) '$(srcdir)/xmodmap.c'; fi`; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xmodmap-xmodmap.Tpo" "$(DEPDIR)/xmodmap-xmodmap.Po"; else rm -f "$(DEPDIR)/xmodmap-xmodmap.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xmodmap.c' object='xmodmap-xmodmap.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmodmap_CFLAGS) $(CFLAGS) -c -o xmodmap-xmodmap.obj `if test -f 'xmodmap.c'; then $(CYGPATH_W) 'xmodmap.c'; else $(CYGPATH_W) '$(srcdir)/xmodmap.c'; fi`
 uninstall-info-am:
 install-appmanDATA: $(appman_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)"
+	test -z "$(appmandir)" || $(MKDIR_P) "$(DESTDIR)$(appmandir)"
 	@list='$(appman_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@ -479,23 +428,22 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
+	test -d $(distdir) || mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
+	list='$(DISTFILES)'; \
-	  case $$file in \
+	  dist_files=`for file in $$list; do echo $$file; done | \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	  sed -e "s|^$$srcdirstrip/||;t" \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
 	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@ -506,10 +454,13 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
 	$(MAKE) $(AM_MAKEFLAGS) \
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@ -584,7 +535,7 @@ distcheck: dist
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@ -608,7 +559,7 @@ check: check-am
 all-am: Makefile $(PROGRAMS) $(DATA) config.h
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@ -635,6 +586,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@ -658,12 +610,20 @@ info-am:
 install-data-am: install-appmanDATA
 install-dvi: install-dvi-am
 install-exec-am: install-binPROGRAMS
 install-html: install-html-am
 install-info: install-info-am
 install-man:
 install-pdf: install-pdf-am
 install-ps: install-ps-am
 installcheck-am:
 maintainer-clean: maintainer-clean-am
@ -685,27 +645,39 @@ ps: ps-am
 ps-am:
-uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
+uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS
-	uninstall-info-am
+
 .MAKE: install-am install-strip
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+	dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
-	distclean-compile distclean-generic distclean-hdr \
+	distclean distclean-compile distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-appmanDATA install-binPROGRAMS install-data \
-	install-data-am install-exec install-exec-am install-info \
+	install-data-am install-dvi install-dvi-am install-exec \
-	install-info-am install-man install-strip installcheck \
+	install-exec-am install-html install-html-am install-info \
 	install-info-am install-man install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-appmanDATA uninstall-binPROGRAMS \
+	uninstall-am uninstall-appmanDATA uninstall-binPROGRAMS
 	uninstall-info-am
 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
 .PHONY: ChangeLog
 ChangeLog:
 	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
 dist-hook: ChangeLog
@LINT_TRUE@lint:
@LINT_TRUE@	$(LINT) $(ALL_LINT_FLAGS) $(AM_CFLAGS) $(xmodmap_SOURCES)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- a/xmodmap/aclocal.m4
+++ b/xmodmap/aclocal.m4
--- a/xmodmap/autogen.sh
+++ b/xmodmap/autogen.sh
@ -0,0 +1,13 @@
 #! /bin/sh
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 ORIGDIR=`pwd`
 cd $srcdir
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
 $srcdir/configure --enable-maintainer-mode "$@"
--- a/xmodmap/compile
+++ b/xmodmap/compile
@ -1,142 +0,0 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 scriptversion=2005-05-14.22
 # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 # This file is maintained in Automake, please report
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 case $1 in
  '')
     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
     exit 1;
     ;;
  -h | --h*)
    cat <<\EOF
 Usage: compile [--help] [--version] PROGRAM [ARGS]
 Wrapper for compilers which do not understand `-c -o'.
 Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
 arguments, and rename the output as expected.
 If you are trying to build a whole package this is not the
 right script to run: please start by reading the file `INSTALL'.
 Report bugs to <bug-automake@gnu.org>.
 EOF
    exit $?
    ;;
  -v | --v*)
    echo "compile $scriptversion"
    exit $?
    ;;
 esac
 ofile=
 cfile=
 eat=
 for arg
 do
  if test -n "$eat"; then
    eat=
  else
    case $1 in
      -o)
 	# configure might choose to run compile as `compile cc -o foo foo.c'.
 	# So we strip `-o arg' only if arg is an object.
 	eat=1
 	case $2 in
 	  *.o | *.obj)
 	    ofile=$2
 	    ;;
 	  *)
 	    set x "$@" -o "$2"
 	    shift
 	    ;;
 	esac
 	;;
      *.c)
 	cfile=$1
 	set x "$@" "$1"
 	shift
 	;;
      *)
 	set x "$@" "$1"
 	shift
 	;;
    esac
  fi
  shift
 done
 if test -z "$ofile" || test -z "$cfile"; then
  # If no `-o' option was seen then we might have been invoked from a
  # pattern rule where we don't need one.  That is ok -- this is a
  # normal compilation that the losing compiler can handle.  If no
  # `.c' file was seen then we are probably linking.  That is also
  # ok.
  exec "$@"
 fi
 # Name of file we expect compiler to create.
 cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
 # Create the lock directory.
 # Note: use `[/.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
 lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
 while true; do
  if mkdir "$lockdir" >/dev/null 2>&1; then
    break
  fi
  sleep 1
 done
 # FIXME: race condition here if user kills between mkdir and trap.
 trap "rmdir '$lockdir'; exit 1" 1 2 15
 # Run the compile.
 "$@"
 ret=$?
 if test -f "$cofile"; then
  mv "$cofile" "$ofile"
 elif test -f "${cofile}bj"; then
  mv "${cofile}bj" "$ofile"
 fi
 rmdir "$lockdir"
 exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-end: "$"
 # End:
--- a/xmodmap/config.guess
+++ b/xmodmap/config.guess
@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
-timestamp='2007-03-06'
+timestamp='2006-07-02'
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -161,7 +161,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@ -781,7 +780,7 @@ EOF
    i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    *:MINGW*:*)
+    i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
    i*:windows32*:*)
@ -791,15 +790,12 @@ EOF
    i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
+    x86:Interix*:[3456]*)
    	case ${UNAME_MACHINE} in
 	    x86) 
 	echo i586-pc-interix${UNAME_RELEASE}
 	exit ;;
-	    EM64T | authenticamd)
+    EM64T:Interix*:[3456]*)
 	echo x86_64-unknown-interix${UNAME_RELEASE}
 	exit ;;
 	esac ;;
    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@ -954,9 +950,6 @@ EOF
    x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
    xtensa:Linux:*:*)
    	echo xtensa-unknown-linux-gnu
 	exit ;;
    i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@ -1215,15 +1208,6 @@ EOF
    SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
    SX-7:SUPER-UX:*:*)
 	echo sx7-nec-superux${UNAME_RELEASE}
 	exit ;;
    SX-8:SUPER-UX:*:*)
 	echo sx8-nec-superux${UNAME_RELEASE}
 	exit ;;
    SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
    Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
--- a/xmodmap/config.h.in
+++ b/xmodmap/config.h.in
@ -1,5 +1,8 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 /* Define to 1 if you have the `strncasecmp' function. */
 #undef HAVE_STRNCASECMP
 /* Name of package */
 #undef PACKAGE
--- a/xmodmap/config.sub
+++ b/xmodmap/config.sub
@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
-timestamp='2007-01-18'
+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
@ -245,12 +245,12 @@ case $basic_machine in
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
+	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
+	| maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@ -324,7 +324,7 @@ case $basic_machine in
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
@ -925,9 +925,6 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
 	sh5el)
 		basic_machine=sh5le-unknown
 		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@ -1222,7 +1219,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@ -1417,9 +1414,6 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
        mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
 		os=-elf
 		;;
--- a/xmodmap/configure
+++ b/xmodmap/configure
@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xmodmap 1.0.2.
+# Generated by GNU Autoconf 2.61 for xmodmap 1.0.3.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xmodmap'
 PACKAGE_TARNAME='xmodmap'
-PACKAGE_VERSION='1.0.2'
+PACKAGE_VERSION='1.0.3'
-PACKAGE_STRING='xmodmap 1.0.2'
+PACKAGE_STRING='xmodmap 1.0.3'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 ac_subst_vars='SHELL
@ -618,6 +618,7 @@ target_alias
 INSTALL_PROGRAM
 INSTALL_SCRIPT
 INSTALL_DATA
 am__isrc
 CYGPATH_W
 PACKAGE
 VERSION
@ -658,6 +659,10 @@ am__fastdepCC_FALSE
 PKG_CONFIG
 DEP_CFLAGS
 DEP_LIBS
 LINT
 LINT_FLAGS
 LINT_TRUE
 LINT_FALSE
 build
 build_cpu
 build_vendor
@ -1194,7 +1199,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 xmodmap 1.0.2 to adapt to many kinds of systems.
+\`configure' configures xmodmap 1.0.3 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1264,7 +1269,7 @@ fi
 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of xmodmap 1.0.2:";;
+     short | recursive ) echo "Configuration of xmodmap 1.0.3:";;
   esac
  cat <<\_ACEOF
@ -1279,6 +1284,8 @@ Optional Features:
 Optional Packages:
  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
  --with-lint             Use a lint-style source code checker (default:
                          disabled)
  --with-release-version=STRING
                          Use release version string in package name
@ -1358,7 +1365,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-xmodmap configure 1.0.2
+xmodmap configure 1.0.3
 generated by GNU Autoconf 2.61
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1372,7 +1379,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 xmodmap $as_me 1.0.2, which was
+It was created by xmodmap $as_me 1.0.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
  $ $0 $@
@ -1725,7 +1732,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-am__api_version="1.9"
+am__api_version='1.10'
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
  if test -f "$ac_dir/install-sh"; then
@ -1908,38 +1916,53 @@ else
 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-  # We used to keeping the `.' as first argument, in order to
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-  # allow $(mkdir_p) to be used without argument.  As in
+if test -z "$MKDIR_P"; then
-  #   $(mkdir_p) $(somedir)
+  if test "${ac_cv_path_mkdir+set}" = set; then
-  # where $(somedir) is conditionally defined.  However this is wrong
+  echo $ECHO_N "(cached) $ECHO_C" >&6
  # for two reasons:
  #  1. if the package is installed by a user who cannot write `.'
  #     make install will fail,
  #  2. the above comment should most certainly read
  #     $(mkdir_p) $(DESTDIR)$(somedir)
  #     so it does not work when $(somedir) is undefined and
  #     $(DESTDIR) is not.
  #  To support the latter case, we have to write
  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
  #  so the `.' trick is pointless.
  mkdir_p='mkdir -p --'
 else
-  # On NextStep and OpenStep, the `mkdir' command does not
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-  # recognize any option.  It will interpret all options as
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-  # directories to create, and then abort because `.' already
+do
-  # exists.
+  IFS=$as_save_IFS
-  for d in ./-p ./--version;
+  test -z "$as_dir" && as_dir=.
-  do
+  for ac_prog in mkdir gmkdir; do
-    test -d $d && rmdir $d
+	 for ac_exec_ext in '' $ac_executable_extensions; do
 	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
 	     'mkdir (fileutils) '4.1*)
 	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
 	       break 3;;
 	   esac
 	 done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+       done
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
+done
-    mkdir_p='$(mkinstalldirs)'
+IFS=$as_save_IFS
 fi
  if test "${ac_cv_path_mkdir+set}" = set; then
    MKDIR_P="$ac_cv_path_mkdir -p"
  else
-    mkdir_p='$(install_sh) -d'
+    # As a last resort, use the slow shell script.  Don't cache a
    # value for MKDIR_P within a source directory, because that will
    # break other packages using the cache if that directory is
    # removed, or if the value is a relative name.
    test -d ./--version && rmdir ./--version
    MKDIR_P="$ac_install_sh -d"
  fi
 fi
 { echo "$as_me:$LINENO: result: $MKDIR_P" >&5
 echo "${ECHO_T}$MKDIR_P" >&6; }
 mkdir_p="$MKDIR_P"
 case $mkdir_p in
  [\\/$]* | ?:[\\/]*) ;;
  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
 esac
 for ac_prog in gawk mawk nawk awk
 do
@ -2022,12 +2045,16 @@ else
 fi
 rmdir .tst 2>/dev/null
-# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-   test -f $srcdir/config.status; then
+  # is not polluted with repeated "-I."
  am__isrc=' -I$(srcdir)'
  # test to see if srcdir already configured
  if test -f $srcdir/config.status; then
    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
   { (exit 1); exit 1; }; }
  fi
 fi
 # test whether we have cygpath
@ -2042,7 +2069,7 @@ fi
 # Define the identity of the package.
 PACKAGE='xmodmap'
- VERSION='1.0.2'
+ VERSION='1.0.3'
 cat >>confdefs.h <<_ACEOF
@ -2070,7 +2097,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 # Installed binaries are usually stripped using `strip' when the user
 # run `make install-strip'.  However `strip' might not be the right
@ -2174,7 +2201,7 @@ else
 fi
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@ -2199,9 +2226,7 @@ fi
  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
 echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
-
+   if test $USE_MAINTAINER_MODE = yes; then
 if test $USE_MAINTAINER_MODE = yes; then
  MAINTAINER_MODE_TRUE=
  MAINTAINER_MODE_FALSE='#'
 else
@ -3187,9 +3212,7 @@ if test "x$enable_dependency_tracking" != xno; then
  am_depcomp="$ac_aux_dir/depcomp"
  AMDEPBACKSLASH='\'
 fi
-
+ if test "x$enable_dependency_tracking" != xno; then
 if test "x$enable_dependency_tracking" != xno; then
  AMDEP_TRUE=
  AMDEP_FALSE='#'
 else
@ -3199,7 +3222,6 @@ fi
 depcc="$CC"   am_compiler_list=
 { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
@ -3267,6 +3289,7 @@ else
       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
         >/dev/null 2>conftest.err &&
       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@ -3296,9 +3319,7 @@ fi
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
+ if
 if
  test "x$enable_dependency_tracking" != xno \
  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
  am__fastdepCC_TRUE=
@ -3390,6 +3411,102 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 for ac_func in strncasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 #define $ac_func innocuous_$ac_func
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func (); below.
    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
    <limits.h> exists even on freestanding compilers.  */
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
 #undef $ac_func
 /* Override any GCC internal prototype to avoid an error.
   Use char because int might match the return type of a GCC
   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char $ac_func ();
 /* The GNU C library defines this for functions which it implements
    to always fail with ENOSYS.  Some functions are actually named
    something starting with __ and the normal name is an alias.  */
 #if defined __stub_$ac_func || defined __stub___$ac_func
 choke me
 #endif
 int
 main ()
 {
 return $ac_func ();
  ;
  return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
 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_link") 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_exeext &&
       $as_test_x conftest$ac_exeext; then
  eval "$as_ac_var=yes"
 else
  echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_var=no"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
      conftest$ac_exeext conftest.$ac_ext
 fi
 ac_res=`eval echo '${'$as_ac_var'}'`
 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_var'}'` = yes; then
  cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 fi
 done
 # Checks for pkg-config packages
@ -3517,9 +3634,6 @@ pkg_failed=no
 echo $ECHO_N "checking for DEP... $ECHO_C" >&6; }
 if test -n "$PKG_CONFIG"; then
    if test -n "$DEP_CFLAGS"; then
        pkg_cv_DEP_CFLAGS="$DEP_CFLAGS"
    else
        if test -n "$PKG_CONFIG" && \
    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
  ($PKG_CONFIG --exists --print-errors "x11") 2>&5
@ -3530,14 +3644,10 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
    fi
 else
 	pkg_failed=untried
 fi
 if test -n "$PKG_CONFIG"; then
    if test -n "$DEP_LIBS"; then
        pkg_cv_DEP_LIBS="$DEP_LIBS"
    else
        if test -n "$PKG_CONFIG" && \
    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
  ($PKG_CONFIG --exists --print-errors "x11") 2>&5
@ -3548,59 +3658,38 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
    fi
 else
 	pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
        _pkg_short_errors_supported=yes
 else
        _pkg_short_errors_supported=no
 fi
        if test $_pkg_short_errors_supported = yes; then
 	        DEP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"`
        else
 	DEP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"`
        fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$DEP_PKG_ERRORS" >&5
+	echo "$DEP_PKG_ERRORS" 1>&5
 	{ { echo "$as_me:$LINENO: error: Package requirements (x11) were not met:
 $DEP_PKG_ERRORS
 	{ { echo "$as_me:$LINENO: error: Package requirements (x11) were not met.
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
-Alternatively, you may set the environment variables DEP_CFLAGS
+Alternatively you may set the DEP_CFLAGS and DEP_LIBS environment variables
-and DEP_LIBS to avoid the need to call pkg-config.
+to avoid the need to call pkg-config.  See the pkg-config man page for
-See the pkg-config man page for more details.
+more details." >&5
-" >&5
+echo "$as_me: error: Package requirements (x11) were not met.
 echo "$as_me: error: Package requirements (x11) were not met:
 $DEP_PKG_ERRORS
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
-Alternatively, you may set the environment variables DEP_CFLAGS
+Alternatively you may set the DEP_CFLAGS and DEP_LIBS environment variables
-and DEP_LIBS to avoid the need to call pkg-config.
+to avoid the need to call pkg-config.  See the pkg-config man page for
-See the pkg-config man page for more details.
+more details." >&2;}
 " >&2;}
   { (exit 1); exit 1; }; }
 elif test $pkg_failed = untried; then
 	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
-Alternatively, you may set the environment variables DEP_CFLAGS
+Alternatively you may set the DEP_CFLAGS and DEP_LIBS environment variables
-and DEP_LIBS to avoid the need to call pkg-config.
+to avoid the need to call pkg-config.  See the pkg-config man page for
-See the pkg-config man page for more details.
+more details.
 To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
 See \`config.log' for more details." >&5
@ -3608,9 +3697,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old.  Ma
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
-Alternatively, you may set the environment variables DEP_CFLAGS
+Alternatively you may set the DEP_CFLAGS and DEP_LIBS environment variables
-and DEP_LIBS to avoid the need to call pkg-config.
+to avoid the need to call pkg-config.  See the pkg-config man page for
-See the pkg-config man page for more details.
+more details.
 To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
 See \`config.log' for more details." >&2;}
@ -3625,6 +3714,47 @@ fi
 # Allow checking code with lint, sparse, etc.
 # Check whether --with-lint was given.
 if test "${with_lint+set}" = set; then
  withval=$with_lint; use_lint=$withval
 else
  use_lint=no
 fi
 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
 if test x$LINT != xno; then
  LINT_TRUE=
  LINT_FALSE='#'
 else
  LINT_TRUE='#'
  LINT_FALSE=
 fi
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
@ -3938,6 +4068,13 @@ 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 "${LINT_TRUE}" && test -z "${LINT_FALSE}"; then
  { { echo "$as_me:$LINENO: error: conditional \"LINT\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
 echo "$as_me: error: conditional \"LINT\" 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
@ -4238,7 +4375,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 xmodmap $as_me 1.0.2, which was
+This file was extended by xmodmap $as_me 1.0.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
  CONFIG_FILES    = $CONFIG_FILES
@ -4291,7 +4428,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-xmodmap config.status 1.0.2
+xmodmap config.status 1.0.3
 configured by $0, generated by GNU Autoconf 2.61,
  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@ -4302,6 +4439,7 @@ gives unlimited permission to copy, distribute and modify it."
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF
@ -4509,6 +4647,7 @@ target_alias!$target_alias$ac_delim
 INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
 INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
 INSTALL_DATA!$INSTALL_DATA$ac_delim
 am__isrc!$am__isrc$ac_delim
 CYGPATH_W!$CYGPATH_W$ac_delim
 PACKAGE!$PACKAGE$ac_delim
 VERSION!$VERSION$ac_delim
@ -4549,6 +4688,10 @@ am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
 DEP_CFLAGS!$DEP_CFLAGS$ac_delim
 DEP_LIBS!$DEP_LIBS$ac_delim
 LINT!$LINT$ac_delim
 LINT_FLAGS!$LINT_FLAGS$ac_delim
 LINT_TRUE!$LINT_TRUE$ac_delim
 LINT_FALSE!$LINT_FALSE$ac_delim
 build!$build$ac_delim
 build_cpu!$build_cpu$ac_delim
 build_vendor!$build_vendor$ac_delim
@ -4561,11 +4704,6 @@ APP_MAN_SUFFIX!$APP_MAN_SUFFIX$ac_delim
 LIB_MAN_SUFFIX!$LIB_MAN_SUFFIX$ac_delim
 FILE_MAN_SUFFIX!$FILE_MAN_SUFFIX$ac_delim
 MISC_MAN_SUFFIX!$MISC_MAN_SUFFIX$ac_delim
 DRIVER_MAN_SUFFIX!$DRIVER_MAN_SUFFIX$ac_delim
 ADMIN_MAN_SUFFIX!$ADMIN_MAN_SUFFIX$ac_delim
 APP_MAN_DIR!$APP_MAN_DIR$ac_delim
 LIB_MAN_DIR!$LIB_MAN_DIR$ac_delim
 FILE_MAN_DIR!$FILE_MAN_DIR$ac_delim
 _ACEOF
  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -4607,6 +4745,11 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
  cat >conf$$subs.sed <<_ACEOF
 DRIVER_MAN_SUFFIX!$DRIVER_MAN_SUFFIX$ac_delim
 ADMIN_MAN_SUFFIX!$ADMIN_MAN_SUFFIX$ac_delim
 APP_MAN_DIR!$APP_MAN_DIR$ac_delim
 LIB_MAN_DIR!$LIB_MAN_DIR$ac_delim
 FILE_MAN_DIR!$FILE_MAN_DIR$ac_delim
 MISC_MAN_DIR!$MISC_MAN_DIR$ac_delim
 DRIVER_MAN_DIR!$DRIVER_MAN_DIR$ac_delim
 ADMIN_MAN_DIR!$ADMIN_MAN_DIR$ac_delim
@ -4614,7 +4757,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` = 5; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then
    break
  elif $ac_last_try; then
    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@ -4841,6 +4984,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
  esac
  ac_MKDIR_P=$MKDIR_P
  case $MKDIR_P in
  [\\/$]* | ?:[\\/]* ) ;;
  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
  esac
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF
@ -4894,6 +5042,7 @@ s&@builddir@&$ac_builddir&;t t
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
@ -5058,8 +5207,9 @@ echo "$as_me: executing $ac_file commands" >&6;}
  # some people rename them; so instead we look at the file content.
  # Grep'ing the first line is not enough: some people post-process
  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
+  # Grep'ing the whole file is not good either: AIX grep has a line
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # limit of 2048, but all sed's we know have understand at least 4000.
  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
    dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
--- a/xmodmap/configure.ac
+++ b/xmodmap/configure.ac
@ -22,7 +22,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 AC_PREREQ([2.57])
-AC_INIT(xmodmap,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xmodmap)
+AC_INIT(xmodmap,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xmodmap)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
@ -31,11 +31,16 @@ AM_CONFIG_HEADER(config.h)
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_CHECK_FUNCS([strncasecmp])
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(DEP, x11)
 AC_SUBST(DEP_CFLAGS)
 AC_SUBST(DEP_LIBS)
 dnl Allow checking code with lint, sparse, etc.
 XORG_WITH_LINT
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
--- a/xmodmap/depcomp
+++ b/xmodmap/depcomp
@ -1,9 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
-scriptversion=2005-07-09.11
+scriptversion=2006-10-15.18
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
 # Foundation, Inc.
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@ -91,7 +92,20 @@ gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
 ## the command line argument order; so add the flags where they
 ## appear in depend2.am.  Note that the slowdown incurred here
 ## affects only configure: in makefiles, %FASTDEP% shortcuts this.
  for arg
  do
    case $arg in
    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
    *)  set fnord "$@" "$arg" ;;
    esac
    shift # fnord
    shift # $arg
  done
  "$@"
  stat=$?
  if test $stat -eq 0; then :
  else
@ -276,6 +290,46 @@ icc)
  rm -f "$tmpdepfile"
  ;;
 hp2)
  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
  # compilers, which have integrated preprocessors.  The correct option
  # to use with these is +Maked; it writes dependencies to a file named
  # 'foo.d', which lands next to the object file, wherever that
  # happens to be.
  # Much of this is similar to the tru64 case; see comments there.
  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
  test "x$dir" = "x$object" && dir=
  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
  if test "$libtool" = yes; then
    tmpdepfile1=$dir$base.d
    tmpdepfile2=$dir.libs/$base.d
    "$@" -Wc,+Maked
  else
    tmpdepfile1=$dir$base.d
    tmpdepfile2=$dir$base.d
    "$@" +Maked
  fi
  stat=$?
  if test $stat -eq 0; then :
  else
     rm -f "$tmpdepfile1" "$tmpdepfile2"
     exit $stat
  fi
  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
  do
    test -f "$tmpdepfile" && break
  done
  if test -f "$tmpdepfile"; then
    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
    # Add `dependent.h:' lines.
    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
  else
    echo "#dummy" > "$depfile"
  fi
  rm -f "$tmpdepfile" "$tmpdepfile2"
  ;;
 tru64)
   # The Tru64 compiler uses -MD to generate dependencies as a side
   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@ -288,13 +342,13 @@ tru64)
   if test "$libtool" = yes; then
      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
+      # static library.  This mechanism is used in libtool 1.4 series to
      # handle both shared and static libraries in a single compilation.
      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
      #
      # With libtool 1.5 this exception was removed, and libtool now
      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # compilations output dependencies in $dir.libs/$base.o.d and
      # in $dir$base.o.d.  We have to check for both files, because
      # one of the two compilations can be disabled.  We should prefer
      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
--- a/xmodmap/handle.c
+++ b/xmodmap/handle.c
@ -28,6 +28,7 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/xmodmap/handle.c,v 3.6 2001/07/25 15:05:27 dawes Exp $ */
 #include "config.h"
 #include <X11/Xos.h>
 #include <X11/Xlib.h>
 #include <stdio.h>
@ -78,7 +79,7 @@ KeysymToKeycodes(Display *dpy, KeySym keysym, int *pnum_kcs)
 }
 static char *
-copy_to_scratch(char *s, int len)
+copy_to_scratch(const char *s, int len)
 {
    static char *buf = NULL;
    static int buflen = 0;
@ -121,19 +122,19 @@ initialize_map (void)
 static void do_keycode ( char *line, int len );
 static void do_keysym ( char *line, int len );
-static void finish_keycodes ( char *line, int len, KeyCode *keycodes, 
+static void finish_keycodes ( const char *line, int len, KeyCode *keycodes, 
 			      int count );
 static void do_add ( char *line, int len );
 static void do_remove ( char *line, int len );
 static void do_clear ( char *line, int len );
 static void do_pointer ( char *line, int len );
-static int get_keysym_list ( char *line, int len, int *np, KeySym **kslistp );
+static int get_keysym_list ( const char *line, int len, int *np, KeySym **kslistp );
 static void print_opcode(union op *op);
-static int skip_word ( char *s, int len );
+static int skip_word ( const char *s, int len );
-static int skip_chars ( char *s, int len );
+static int skip_chars ( const char *s, int len );
-static int skip_space ( char *s, int len );
+static int skip_space ( const char *s, int len );
 static struct dt {
    char *command;			/* name of input command */
@ -188,7 +189,7 @@ handle_line(char *line,		/* string to parse */
 */ 
 static int 
-skip_word (char *s, int len)
+skip_word (const char *s, int len)
 {
    register int n;
@ -197,7 +198,7 @@ skip_word (char *s, int len)
 }
 static int 
-skip_chars(char *s, int len)
+skip_chars(const char *s, int len)
 {
    register int i;
@ -210,7 +211,7 @@ skip_chars(char *s, int len)
 }
 static int 
-skip_space(char *s, int len)
+skip_space(const char *s, int len)
 {
    register int i;
@ -224,7 +225,7 @@ skip_space(char *s, int len)
 static int 
-skip_until_char(char *s, int len, char c)
+skip_until_char(const char *s, int len, char c)
 {
    register int i;
@ -234,24 +235,6 @@ skip_until_char(char *s, int len, char c)
    return (i);
 }
 #if 0
 static int 
 skip_until_chars(char *s, int len, char *cs, int cslen)
 {
    int i;
    for (i = 0; i < len; i++) {
 	register int j;
 	register char c = s[i];
 	for (j = 0; j < cslen; j++) {
 	    if (c == cs[j]) goto done;
 	}
    }
  done:
    return (i);
 }
 #endif
 /*
 * The action routines.
@ -284,23 +267,8 @@ add_to_work_queue(union op *p)	/* this can become a macro someday */
    return;
 }
 #if 0
 static char *
 copystring(char *s, int len)
 {
    char *retval;
    retval = (char *) malloc (len+1);
    if (retval) {
 	strncpy (retval, s, len);
 	retval[len] = '\0';
    }
    return (retval);
 }
 #endif
 static Bool 
-parse_number(char *str, unsigned long *val)
+parse_number(const char *str, unsigned long *val)
 {
    char *fmt = "%ld";
@ -320,7 +288,7 @@ parse_number(char *str, unsigned long *val)
 }
 static Bool 
-parse_keysym(char *line, int n, char **name, KeySym *keysym)
+parse_keysym(const char *line, int n, char **name, KeySym *keysym)
 {
    *name = copy_to_scratch (line, n);
    if (!strcmp(*name, "NoSymbol")) {
@ -433,7 +401,7 @@ do_keysym(char *line, int len)
 }
 static void 
-finish_keycodes(char *line, int len, KeyCode *keycodes, int count)
+finish_keycodes(const char *line, int len, KeyCode *keycodes, int count)
 {
    int n;
    KeySym *kslist;
@ -824,8 +792,9 @@ do_clear(char *line, int len)
    add_to_work_queue (uop);
 }
 #ifndef HAVE_STRNCASECMP
 static int 
-strncmp_nocase(char *a, char *b, int n)
+strncasecmp(const char *a, const char *b, int n)
 {
    int i;
    int a1, b1;
@ -842,7 +811,7 @@ strncmp_nocase(char *a, char *b, int n)
    }
    return 0;
 }
-
+#endif
 /*
 * do_pointer = get list of numbers of the form
@ -884,7 +853,7 @@ do_pointer(char *line, int len)
    line += n, len -= n;
    i = 0;
-    if (len < 7 || strncmp_nocase (line, "default", 7) != 0) {
+    if (len < 7 || strncasecmp (line, "default", 7) != 0) {
 	while (len > 0) {
 	    n = skip_space (line, len);
 	    line += n, len -= n;
@ -941,7 +910,7 @@ do_pointer(char *line, int len)
 */
 static int 
-get_keysym_list(char *line, int len, int *np, KeySym **kslistp)
+get_keysym_list(const char *line, int len, int *np, KeySym **kslistp)
 {
    int havesofar, maxcanhave;
    KeySym *keysymlist;
@ -972,6 +941,7 @@ get_keysym_list(char *line, int len, int *np, KeySym **kslistp)
 	n = skip_chars (line, len);
 	if (n < 0) {
 	    badmsg0 ("keysym name list");
 	    free(keysymlist);
 	    return (-1);
 	}
@ -990,12 +960,14 @@ get_keysym_list(char *line, int len, int *np, KeySym **kslistp)
 	/* grow the list bigger if necessary */
 	if (havesofar >= maxcanhave) {
 	    KeySym *origkeysymlist = keysymlist;
 	    maxcanhave *= 2;
 	    keysymlist = (KeySym *) realloc (keysymlist,
 					     maxcanhave * sizeof (KeySym));
 	    if (!keysymlist) {
 		badmsg ("attempt to grow keysym list to %ld bytes",
 			(long) (maxcanhave * sizeof (KeySym)));
 		free(origkeysymlist);
 		return (-1);
 	    }
 	}
--- a/xmodmap/install-sh
+++ b/xmodmap/install-sh
@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
-scriptversion=2005-05-14.22
+scriptversion=2006-10-14.15
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@ -39,15 +39,24 @@ scriptversion=2005-05-14.22
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
+# from scratch.
-# shared with many OS's install programs.
+
 nl='
 '
 IFS=" ""	$nl"
 # set DOITPROG to echo to test this script
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
 if test -z "$doit"; then
  doit_exec=exec
 else
  doit_exec=$doit
 fi
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
 # or use environment vars.
 mvprog="${MVPROG-mv}"
 cpprog="${CPPROG-cp}"
@ -58,7 +67,13 @@ stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
-chmodcmd="$chmodprog 0755"
+posix_glob=
 posix_mkdir=
 # Desired mode of installed file.
 mode=0755
 chmodcmd=$chmodprog
 chowncmd=
 chgrpcmd=
 stripcmd=
@ -95,7 +110,7 @@ Environment variables override the default commands:
  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
 "
-while test -n "$1"; do
+while test $# -ne 0; do
  case $1 in
    -c) shift
        continue;;
@ -111,9 +126,15 @@ while test -n "$1"; do
    --help) echo "$usage"; exit $?;;
-    -m) chmodcmd="$chmodprog $2"
+    -m) mode=$2
        shift
        shift
 	case $mode in
 	  *' '* | *'	'* | *'
 '*	  | *'*'* | *'?'* | *'['*)
 	    echo "$0: invalid mode: $mode" >&2
 	    exit 1;;
 	esac
        continue;;
    -o) chowncmd="$chownprog $2"
@ -136,9 +157,19 @@ while test -n "$1"; do
    --version) echo "$0 $scriptversion"; exit $?;;
-    *)  # When -d is used, all remaining arguments are directories to create.
+    --)	shift
 	break;;
    -*)	echo "$0: invalid option: $1" >&2
 	exit 1;;
    *)  break;;
  esac
 done
 if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
  # When -d is used, all remaining arguments are directories to create.
  # When -t is used, the destination is already specified.
 	test -n "$dir_arg$dstarg" && break
  # Otherwise, the last argument is the destination.  Remove it from $@.
  for arg
  do
@ -150,11 +181,9 @@ while test -n "$1"; do
    shift # arg
    dstarg=$arg
  done
-	break;;
+fi
  esac
 done
-if test -z "$1"; then
+if test $# -eq 0; then
  if test -z "$dir_arg"; then
    echo "$0: no input file specified." >&2
    exit 1
@ -164,6 +193,33 @@ if test -z "$1"; then
  exit 0
 fi
 if test -z "$dir_arg"; then
  trap '(exit $?); exit' 1 2 13 15
  # Set umask so as not to create temps with too-generous modes.
  # However, 'strip' requires both read and write access to temps.
  case $mode in
    # Optimize common cases.
    *644) cp_umask=133;;
    *755) cp_umask=22;;
    *[0-7])
      if test -z "$stripcmd"; then
 	u_plus_rw=
      else
 	u_plus_rw='% 200'
      fi
      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
    *)
      if test -z "$stripcmd"; then
 	u_plus_rw=
      else
 	u_plus_rw=,u+rw
      fi
      cp_umask=$mode$u_plus_rw;;
  esac
 fi
 for src
 do
  # Protect names starting with `-'.
@ -173,15 +229,11 @@ do
  if test -n "$dir_arg"; then
    dst=$src
-    src=
+    dstdir=$dst
    test -d "$dstdir"
    dstdir_status=$?
  else
    if test -d "$dst"; then
      mkdircmd=:
      chmodcmd=
    else
      mkdircmd=$mkdirprog
    fi
  else
    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
    # might cause directories to be created, which would be especially bad
    # if $src (and thus $dsttmp) contains '*'.
@ -208,53 +260,188 @@ do
 	echo "$0: $dstarg: Is a directory" >&2
 	exit 1
      fi
-      dst=$dst/`basename "$src"`
+      dstdir=$dst
      dst=$dstdir/`basename "$src"`
      dstdir_status=0
    else
      # Prefer dirname, but fall back on a substitute if dirname fails.
      dstdir=`
 	(dirname "$dst") 2>/dev/null ||
 	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	     X"$dst" : 'X\(//\)[^/]' \| \
 	     X"$dst" : 'X\(//\)$' \| \
 	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
 	echo X"$dst" |
 	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)[^/].*/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\).*/{
 		   s//\1/
 		   q
 		 }
 		 s/.*/./; q'
      `
      test -d "$dstdir"
      dstdir_status=$?
    fi
  fi
-  # This sed command emulates the dirname command.
+  obsolete_mkdir_used=false
  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-  # Make sure that the destination directory exists.
+  if test $dstdir_status != 0; then
    case $posix_mkdir in
      '')
 	# Create intermediate dirs using mode 755 as modified by the umask.
 	# This is like FreeBSD 'install' as of 1997-10-28.
 	umask=`umask`
 	case $stripcmd.$umask in
 	  # Optimize common cases.
 	  *[2367][2367]) mkdir_umask=$umask;;
 	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-  # Skip lots of stat calls in the usual case.
+	  *[0-7])
-  if test ! -d "$dstdir"; then
+	    mkdir_umask=`expr $umask + 22 \
-    defaultIFS='
+	      - $umask % 100 % 40 + $umask % 20 \
-	 '
+	      - $umask % 10 % 4 + $umask % 2
-    IFS="${IFS-$defaultIFS}"
+	    `;;
 	  *) mkdir_umask=$umask,go-w;;
 	esac
 	# With -d, create the new directory with the user-specified mode.
 	# Otherwise, rely on $mkdir_umask.
 	if test -n "$dir_arg"; then
 	  mkdir_mode=-m$mode
 	else
 	  mkdir_mode=
 	fi
 	posix_mkdir=false
 	case $umask in
 	  *[123567][0-7][0-7])
 	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
 	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
 	    ;;
 	  *)
 	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
 	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
 	    if (umask $mkdir_umask &&
 		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
 	    then
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
 		   # other-writeable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
 		     d????-?r-*) different_mode=700;;
 		     d????-?--*) different_mode=755;;
 		     *) false;;
 		   esac &&
 		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
 		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
 		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
 		   }
 		 }
 	      then posix_mkdir=:
 	      fi
 	      rmdir "$tmpdir/d" "$tmpdir"
 	    else
 	      # Remove any dirs left behind by ancient mkdir implementations.
 	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
 	    fi
 	    trap '' 0;;
 	esac;;
    esac
    if
      $posix_mkdir && (
 	umask $mkdir_umask &&
 	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
      )
    then :
    else
      # The umask is ridiculous, or mkdir does not conform to POSIX,
      # or it failed possibly due to a race condition.  Create the
      # directory the slow way, step by step, checking for races as we go.
      case $dstdir in
 	/*) prefix=/ ;;
 	-*) prefix=./ ;;
 	*)  prefix= ;;
      esac
      case $posix_glob in
        '')
 	  if (set -f) 2>/dev/null; then
 	    posix_glob=true
 	  else
 	    posix_glob=false
 	  fi ;;
      esac
      oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
+      IFS=/
-    IFS='%'
+      $posix_glob && set -f
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+      set fnord $dstdir
      shift
      $posix_glob && set +f
      IFS=$oIFS
-    pathcomp=
+      prefixes=
-    while test $# -ne 0 ; do
+      for d
-      pathcomp=$pathcomp$1
+      do
-      shift
+	test -z "$d" && continue
-      if test ! -d "$pathcomp"; then
+
-        $mkdirprog "$pathcomp"
+	prefix=$prefix$d
-	# mkdir can fail with a `File exist' error in case several
+	if test -d "$prefix"; then
-	# install-sh are creating the directory concurrently.  This
+	  prefixes=
-	# is OK.
+	else
-	test -d "$pathcomp" || exit
+	  if $posix_mkdir; then
 	    (umask=$mkdir_umask &&
 	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
 	    # Don't fail if two instances are running concurrently.
 	    test -d "$prefix" || exit 1
 	  else
 	    case $prefix in
 	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
 	      *) qprefix=$prefix;;
 	    esac
 	    prefixes="$prefixes '$qprefix'"
 	  fi
-      pathcomp=$pathcomp/
+	fi
 	prefix=$prefix/
      done
      if test -n "$prefixes"; then
 	# Don't fail if two instances are running concurrently.
 	(umask $mkdir_umask &&
 	 eval "\$doit_exec \$mkdirprog $prefixes") ||
 	  test -d "$dstdir" || exit 1
 	obsolete_mkdir_used=true
      fi
    fi
  fi
  if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
  else
    dstfile=`basename "$dst"`
    # Make a couple of temp file names in the proper directory.
    dsttmp=$dstdir/_inst.$$_
@ -262,10 +449,9 @@ do
    # Trap to clean up those temp files at exit.
    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
    trap '(exit $?); exit' 1 2 13 15
    # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
    # and set any options; do chmod last to preserve setuid bits.
    #
@ -276,10 +462,10 @@ do
    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
      || {
 	   # The rename failed, perhaps because mv can't rename something else
 	   # to itself, or perhaps because mv is so ancient that it does not
@ -291,11 +477,12 @@ do
 	   # reasons.  In this case, the final cleanup might fail but the new
 	   # file should still install successfully.
 	   {
-	     if test -f "$dstdir/$dstfile"; then
+	     if test -f "$dst"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       $doit $rmcmd -f "$dst" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
 		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
 	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 echo "$0: cannot unlink or rename $dst" >&2
 		 (exit 1); exit 1
 	       }
 	     else
@ -304,16 +491,13 @@ do
 	   } &&
 	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	   $doit $mvcmd "$dsttmp" "$dst"
 	 }
-    }
+    } || exit 1
  fi || { (exit 1); exit 1; }
 done
-# The final little trick to "correctly" pass the exit status to the exit trap.
+    trap '' 0
-{
+  fi
-  (exit 0); exit 0
+done
 }
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
--- a/xmodmap/missing
+++ b/xmodmap/missing
@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
@ -33,6 +33,8 @@ if test $# -eq 0; then
 fi
 run=:
 sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
 sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@ -44,7 +46,7 @@ fi
 msg="missing on your system"
-case "$1" in
+case $1 in
 --run)
  # Try to run requested program, and just exit if it succeeds.
  run=
@ -77,6 +79,7 @@ Supported PROGRAM values:
  aclocal      touch file \`aclocal.m4'
  autoconf     touch file \`configure'
  autoheader   touch file \`config.h.in'
  autom4te     touch the output file, or create a stub one
  automake     touch all \`Makefile.in' files
  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
  flex         create \`lex.yy.c', if possible, from existing .c
@ -106,7 +109,7 @@ esac
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).
-case "$1" in
+case $1 in
  lex|yacc)
    # Not GNU programs, they don't have --version.
    ;;
@ -135,7 +138,7 @@ esac
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case "$1" in
+case $1 in
  aclocal*)
    echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@ -164,7 +167,7 @@ WARNING: \`$1' is $msg.  You should only need it if
    test -z "$files" && files="config.h"
    touch_files=
    for f in $files; do
-      case "$f" in
+      case $f in
      *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
      *) touch_files="$touch_files $f.in";;
@ -192,8 +195,8 @@ WARNING: \`$1' is needed, but is $msg.
         You can get \`$1' as part of \`Autoconf' from any GNU
         archive site."
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
    if test -f "$file"; then
 	touch $file
    else
@ -214,25 +217,25 @@ WARNING: \`$1' $msg.  You should only need it if
         in order for those modifications to take effect.  You can get
         \`Bison' from any GNU archive site."
    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
        eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
    fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
 	echo >y.tab.h
    fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
    fi
    ;;
@ -244,18 +247,18 @@ WARNING: \`$1' is $msg.  You should only need it if
         in order for those modifications to take effect.  You can get
         \`Flex' from any GNU archive site."
    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
        eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
    fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
    fi
    ;;
@ -267,11 +270,9 @@ WARNING: \`$1' is $msg.  You should only need it if
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
-    if test -z "$file"; then
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
    fi
    if [ -f "$file" ]; then
 	touch $file
    else
 	test -z "$file" || exec >$file
@ -289,11 +290,17 @@ WARNING: \`$1' is $msg.  You should only need it if
         DU, IRIX).  You might want to install the \`Texinfo' package or
         the \`GNU make' package.  Grab either from any GNU archive site."
    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
    if test -z "$file"; then
      # ... or it is the one specified with @setfilename ...
      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      file=`sed -n '
 	/^@setfilename/{
 	  s/.* \([^ ]*\) *$/\1/
 	  p
 	  q
 	}' $infile`
      # ... or it is derived from the source name (dir/f.texi becomes f.info)
      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
    fi
@ -317,13 +324,13 @@ WARNING: \`$1' is $msg.  You should only need it if
    fi
    firstarg="$1"
    if shift; then
-	case "$firstarg" in
+	case $firstarg in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case "$firstarg" in
+	case $firstarg in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0
--- a/xmodmap/pf.c
+++ b/xmodmap/pf.c
@ -34,11 +34,10 @@ from The Open Group.
 #include "xmodmap.h"
 #define NOTINFILEFILENAME "commandline"
-char *inputFilename = NOTINFILEFILENAME;
+const char *inputFilename = NOTINFILEFILENAME;
 int lineno = 0;
-void process_file (filename)
+void process_file (const char *filename)	/* NULL means use stdin */
    char *filename;			/* NULL means use stdin */
 {
    FILE *fp;
    char buffer[BUFSIZ];
@ -80,8 +79,7 @@ void process_file (filename)
 }
-void process_line (buffer)
+void process_line (char *buffer)
    char *buffer;
 {
    int len;
    int i;
--- a/xmodmap/xmodmap.c
+++ b/xmodmap/xmodmap.c
@ -35,7 +35,7 @@ from The Open Group.
 #include <ctype.h>
 #include "xmodmap.h"
-char *ProgramName;
+const char *ProgramName;
 Display *dpy = NULL;
 int min_keycode, max_keycode;
 Bool verbose = False;
@ -62,66 +62,56 @@ chk_malloc(size_t n_bytes)
    return buf;
 }
-static char *help_message[] = {
+static const char help_message[] = 
-"\nwhere options include:",
+"\nwhere options include:\n"
-"    -display host:dpy            X server to use",
+"    -display host:dpy            X server to use\n"
-"    -verbose, -quiet             turn logging on or off",
+"    -verbose, -quiet             turn logging on or off\n"
-"    -n                           don't execute changes, just show like make",
+"    -n                           don't execute changes, just show like make\n"
-"    -e expression                execute string",
+"    -e expression                execute string\n"
-"    -pm                          print modifier map",
+"    -pm                          print modifier map\n"
-"    -pk                          print keymap table",
+"    -pk                          print keymap table\n"
-"    -pke                         print keymap table as expressions",
+"    -pke                         print keymap table as expressions\n"
-"    -pp                          print pointer map",
+"    -pp                          print pointer map\n"
-"    -grammar                     print out short help on allowable input",
+"    -grammar                     print out short help on allowable input\n"
-"    -                            read standard input",
+"    -                            read standard input\n"
-"",
+"\n";
 NULL};
 static void 
 usage(void)
 {
    char **cpp;
    fprintf (stderr, "usage:  %s [-options ...] [filename]\n", ProgramName);
-    for (cpp = help_message; *cpp; cpp++) {
+    fprintf (stderr, "%s\n", help_message);
 	fprintf (stderr, "%s\n", *cpp);
    }
    Exit (1);
 }
-static char *grammar_message[] = {
+static const char grammar_message[] = 
-"    pointer = default              reset pointer buttons to default",
+"    pointer = default              reset pointer buttons to default\n"
-"    pointer = NUMBER ...           set pointer button codes",
+"    pointer = NUMBER ...           set pointer button codes\n"
-"    keycode NUMBER = [KEYSYM ...]  map keycode to given keysyms",
+"    keycode NUMBER = [KEYSYM ...]  map keycode to given keysyms\n"
-"    keysym KEYSYM = [KEYSYM ...]   look up keysym and do a keycode operation",
+"    keysym KEYSYM = [KEYSYM ...]   look up keysym and do a keycode operation\n"
-"    clear MODIFIER                 remove all keys for this modifier",
+"    clear MODIFIER                 remove all keys for this modifier\n"
-"    add MODIFIER = KEYSYM ...      add the keysyms to the modifier",
+"    add MODIFIER = KEYSYM ...      add the keysyms to the modifier\n"
-"    remove MODIFIER = KEYSYM ...   remove the keysyms from the modifier",
+"    remove MODIFIER = KEYSYM ...   remove the keysyms from the modifier\n"
-"",
+"\n"
-"where NUMBER is a decimal, octal, or hex constant; KEYSYM is a valid",
+"where NUMBER is a decimal, octal, or hex constant; KEYSYM is a valid\n"
-"Key Symbol name; and MODIFIER is one of the eight modifier names:  Shift,",
+"Key Symbol name; and MODIFIER is one of the eight modifier names:  Shift,\n"
-"Lock, Control, Mod1, Mod2, Mod3, Mod4, or Mod5.  Lines beginning with",
+"Lock, Control, Mod1, Mod2, Mod3, Mod4, or Mod5.  Lines beginning with\n"
-"an exclamation mark (!) are taken as comments.  Case is significant except",
+"an exclamation mark (!) are taken as comments.  Case is significant except\n"
-"for MODIFIER names.",
+"for MODIFIER names.\n"
-"",
+"\n"
-"Keysyms on the left hand side of the = sign are looked up before any changes",
+"Keysyms on the left hand side of the = sign are looked up before any changes\n"
-"are made; keysyms on the right are looked up after all of those on the left",
+"are made; keysyms on the right are looked up after all of those on the left\n"
-"have been resolved.  This makes it possible to swap modifier keys.",
+"have been resolved.  This makes it possible to swap modifier keys.\n"
-"",
+"\n";
 NULL };
 static void 
 grammar_usage(void)
 {
    char **cpp;
    fprintf (stderr, "%s accepts the following input expressions:\n\n",
 	     ProgramName);
-    for (cpp = grammar_message; *cpp; cpp++) {
+    fprintf (stderr, "%s\n", grammar_message);
 	fprintf (stderr, "%s\n", *cpp);
    }
    Exit (0);
 }
--- a/xmodmap/xmodmap.h
+++ b/xmodmap/xmodmap.h
@ -28,17 +28,17 @@ from The Open Group.
 */
 /* $XFree86: xc/programs/xmodmap/xmodmap.h,v 1.4 2001/01/17 23:46:21 dawes Exp $ */
-extern char *ProgramName;
+extern const char *ProgramName;
 extern Display *dpy;
 extern int min_keycode, max_keycode;
 extern Bool verbose;
 extern Bool dontExecute;
-extern char *inputFilename;
+extern const char *inputFilename;
 extern int lineno;
 extern int parse_errors;
 extern void initialize_map(void);
-extern void process_file(char *filename);
+extern void process_file(const char *filename);
 extern void process_line(char *buffer);
 extern void handle_line(char *line, int len);
 extern void print_work_queue(void);
--- a/xmodmap/xmodmap.man
+++ b/xmodmap/xmodmap.man
@ -89,7 +89,8 @@ may be specified from the command line.
 .TP 8
 .B \-pm
 This option indicates that the current modifier map should be printed on the
-standard output.
+standard output.   This is the default mode of operation if no other mode
 options are specified.
 .TP 8
 .B \-pk
 This option indicates that the current keymap table should be printed on the