xhost 1.0.2.

2007-07-17 18:16:56 +02:00 · 2007-07-17 18:16:56 +02:00 · 38d8e3eecf
parent 9f53940343
commit 38d8e3eecf
16 changed files with 887 additions and 668 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,10 @@
 x11-xserver-utils (7.2+3) UNRELEASED; urgency=low
  * xhost 1.0.2.
    + fixes typo in man page (closes: #232384).
 -- Julien Cristau <jcristau@debian.org>  Tue, 17 Jul 2007 18:27:30 +0200
 x11-xserver-utils (7.2-2) experimental; urgency=low
  * Add xrandr 1.2.2.
--- a/xhost/ChangeLog
+++ b/xhost/ChangeLog
@ -1,38 +1,227 @@
-2006-04-14  Adam Jackson  <ajax@freedesktop.org>
+commit ebf6f7d4b36d69a83aeca39405d6140d8cbdcb01
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon Jul 16 14:51:39 2007 -0700
-	* xhost.c:
+    Version bump: 1.0.2
 	Coverity #610, #611: Various minor memory leaks.
-	* configure.ac:
+commit 9ef704675867ab08bc8ea129825d4ba32061dded
-	Bump to 1.0.1.
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon Jul 16 14:26:03 2007 -0700
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    Replace static ChangeLog with dist-hook to generate from git log
-	* configure.ac:
+commit 39ebc64fcc7ed7abdd529100da4cc6ba59ccff9d
-	Update package version number for final X11R7 release candidate.
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed Apr 11 14:54:42 2007 -0700
-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    Bug #10616: Typo in xhost.man: s/effect/affect/
-	* Makefile.am:
+    X.Org Bugzilla #10616 <https://bugs.freedesktop.org/show_bug.cgi?id=10616>
-	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+    Reported upstream from
    Debian bug #232384 <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=232384>
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 7f505a8462be4fa4cde6314fc9bff66ce298722a
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Fri Feb 2 13:36:24 2007 -0800
-	* configure.ac:
+    renamed: .cvsignore -> .gitignore
 	Update package version number for X11R7 RC3 release.
-2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit adbf515413070f64a15bb3b12c810c906075529a
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Fri Feb 2 13:36:00 2007 -0800
-	* configure.ac:
+    Add note pointing to Xsecurity man page for more info on SI options
 	Update package version number for X11R7 RC2 release.
-2005-11-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit f74dafdf0b8e15cc1a92466f2c92facd470895b8
 Author: Adam Jackson <ajax@nwnk.net>
 Date:   Sat Apr 15 00:10:10 2006 +0000
-	* configure.ac:
+    Coverity #610, #611: Various minor memory leaks. Bump to 1.0.1.
 	Update pkgcheck depedencies to work with separate build roots.
-2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit dc62a07856fb98a1c11abb6146146e91f520908b
 Author: Kevin E Martin <kem@kem.org>
 Date:   Thu Dec 15 00:24:07 2005 +0000
-	* configure.ac:
+    Update package version number for final X11R7 release candidate.
 	Update package version number for RC1 release.
 commit 8984dd78af13984d80d6f1b751be415b30940816
 Author: Kevin E Martin <kem@kem.org>
 Date:   Tue Dec 6 22:48:22 2005 +0000
    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
 commit 5f042cf69982bfb6bf045a543de232b0658f06bc
 Author: Kevin E Martin <kem@kem.org>
 Date:   Sat Dec 3 05:49:24 2005 +0000
    Update package version number for X11R7 RC3 release.
 commit e77e96f2427e7ae4f26886463f82753f5307de2b
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Mon Nov 28 22:01:43 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 5283dd84d2d8ca67edf136fd4306852c18a1ca6d
 Author: Eric Anholt <anholt@freebsd.org>
 Date:   Mon Nov 21 10:35:01 2005 +0000
    Another pass at .cvsignores for apps.
 commit 8ecde78ea1374b23238cafb07eb4b1769c0ef5bb
 Author: Eric Anholt <anholt@freebsd.org>
 Date:   Sun Nov 20 22:08:53 2005 +0000
    Add/improve .cvsignore files for apps.
 commit 71c8ff9e7e33d461c429069f2626ab2b4239001f
 Author: Kevin E Martin <kem@kem.org>
 Date:   Wed Nov 9 21:09:21 2005 +0000
    Update package version number for X11R7 RC2 release.
 commit 726c26bcec28843c6f5038bba46f3d87a56b8a58
 Author: Kevin E Martin <kem@kem.org>
 Date:   Tue Nov 1 15:05:18 2005 +0000
    Update pkgcheck depedencies to work with separate build roots.
 commit decc11f72d68d91578ec5491282ee2c619a7f6d4
 Author: Kevin E Martin <kem@kem.org>
 Date:   Wed Oct 19 02:47:54 2005 +0000
    Update package version number for RC1 release.
 commit 4364ba6829303bd09f4713b50fe44a2fa89872a5
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Mon Oct 17 23:56:22 2005 +0000
    Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
        work better with BSD make
 commit fbfc3a3410f51b1e0706ffd115a41e9ae1e36160
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Fri Oct 14 00:25:46 2005 +0000
    Use sed to fill in variables in man page
 commit 7e1c137dc842830927dcc6cd8ddf06422e5eb32a
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Mon Aug 1 20:25:30 2005 +0000
    Install man pages to section 1 instead of section m (Patch from Donnie
        Berkholz)
 commit 7a832df9178f26f471287b8cac3604121a635e68
 Author: Kevin E Martin <kem@kem.org>
 Date:   Fri Jul 29 21:22:34 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 50727a26edab129d555150cca271c23c4228426d
 Author: Kevin E Martin <kem@kem.org>
 Date:   Thu Jul 28 15:57:12 2005 +0000
    Fix distcheck for remaining apps
 commit 1618ebd6cd76fb6afc63d68966905e4948b5ebb4
 Author: Adam Jackson <ajax@nwnk.net>
 Date:   Wed Jul 20 19:31:57 2005 +0000
    Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
        configure cache, you cache it, and the cached value is probably wrong.
 commit 8b783444a5341f4698027d3a66650c179bc8fa2e
 Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
 Date:   Tue Jul 5 21:12:45 2005 +0000
    Add autogen.sh for xhost
 commit 4f7044d76de402585b7bcc33b6803f6d5182dd61
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Fri Jul 1 16:55:14 2005 +0000
    More freedestkop->freedesktop typo fixes
 commit 6717fca843fbcf3c79574dd1f574fbf78ff99285
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Sat Jun 18 08:16:09 2005 +0000
    Whoops. Uses Xmuu, not Xmu
 commit 1ff19e0b04fbc458d87b9582223a7e60fd18ffb2
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Sat Jun 18 08:03:35 2005 +0000
    Autotooling: Add #include "config.h" & use RETSIGTYPE if defined.
    cvs: ----------------------------------------------------------------------
 commit e6443cf2d16a842e3dcefadbfb7be50484ee2f47
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Sat Jun 18 07:49:39 2005 +0000
    autotool xhost
 commit beba11cfe89a04a5c315d6b9b48201204af31a18
 Author: Matthieu Herrb <matthieu.herrb@laas.fr>
 Date:   Tue Jul 27 06:06:06 2004 +0000
    - remove remaining AMOEBA references.
    - remove unused file.
 commit 9a00449e017738f0e60c1bf296659a535b1469f2
 Author: Egbert Eich <eich@suse.de>
 Date:   Fri Apr 23 19:54:49 2004 +0000
    Merging XORG-CURRENT into trunk
 commit d60614f08958004ab613f62470f14c2fab6e59f5
 Author: Egbert Eich <eich@suse.de>
 Date:   Sun Mar 14 08:35:24 2004 +0000
    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
 commit 18cd6b229ebc28d5e9875465f4eadff856b94b83
 Author: Egbert Eich <eich@suse.de>
 Date:   Wed Mar 3 12:13:08 2004 +0000
    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
 commit 451e972cf47c66069d791e5436f6c9eac9f0e116
 Author: Egbert Eich <eich@suse.de>
 Date:   Thu Feb 26 13:36:24 2004 +0000
    readding XFree86's cvs IDs
 commit f17a619e50d3243f3cc62251fed63a1bc46cb120
 Author: Egbert Eich <eich@suse.de>
 Date:   Thu Feb 26 09:24:08 2004 +0000
    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
 commit fb6a09667fede1013cbb01f57ccccd7b726fbecf
 Author: Kaleb Keithley <kaleb@freedesktop.org>
 Date:   Tue Nov 25 19:29:13 2003 +0000
    XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
 commit 8318f3de7a64f63e05adae22f9452af19e5df725
 Author: Kaleb Keithley <kaleb@freedesktop.org>
 Date:   Fri Nov 14 16:49:22 2003 +0000
    XFree86 4.3.0.1
 commit 5b721f5b0d168e466b968d3a3089ab1e3be82233
 Author: Kaleb Keithley <kaleb@freedesktop.org>
 Date:   Fri Nov 14 15:54:53 2003 +0000
    R6.6 is the Xorg base-line
--- a/xhost/INSTALL
+++ b/xhost/INSTALL
@ -1,8 +1,8 @@
 Installation Instructions
 *************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-Software Foundation, Inc.
+2006 Free Software Foundation, Inc.
 This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@ -10,7 +10,10 @@ unlimited permission to copy, distribute and modify it.
 Basic Installation
 ==================
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.
   The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@ -23,9 +26,9 @@ 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
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+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
@ -35,20 +38,17 @@ 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' by a program called `autoconf'.  You need `configure.ac' if
-`configure.ac' if you want to change it or regenerate `configure' using
+you want to change it or regenerate `configure' using a newer version
-a newer version of `autoconf'.
+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
+     `./configure' to configure the package for your system.
     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
+     Running `configure' might take a while.  While running, it prints
-     messages telling which features it is checking for.
+     some messages telling which features it is checking for.
  2. Type `make' to compile the package.
@ -78,7 +78,7 @@ details on some of the pertinent environment variables.
 by setting variables in the command line or in the environment.  Here
 is an example:
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
   *Note Defining Variables::, for more details.
@ -87,17 +87,15 @@ 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
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 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'
+   With a non-GNU `make', it is safer to compile the package for one
-variable, you have to compile the package for one architecture at a
+architecture at a time in the source code directory.  After you have
-time in the source code directory.  After you have installed the
+installed the package for one architecture, use `make distclean' before
-package for one architecture, use `make distclean' before reconfiguring
+reconfiguring for another architecture.
 for another architecture.
 Installation Names
 ==================
@ -190,12 +188,12 @@ 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:
+overridden in the site shell script).
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
 an Autoconf bug.  Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 configuration-related scripts to be executed by `/bin/bash'.
 `configure' Invocation
 ======================
--- a/xhost/Makefile.am
+++ b/xhost/Makefile.am
@ -12,8 +12,16 @@ appmandir = $(APP_MAN_DIR)
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
 CLEANFILES = $(appman_DATA)
 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
 SED = sed
--- a/xhost/Makefile.in
+++ b/xhost/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.
@ -15,15 +15,11 @@
@SET_MAKE@
 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
@ -38,19 +34,18 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = xhost$(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
 	mkinstalldirs
 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 = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
@ -59,7 +54,9 @@ PROGRAMS = $(bin_PROGRAMS)
 am_xhost_OBJECTS = xhost-xhost.$(OBJEXT)
 xhost_OBJECTS = $(am_xhost_OBJECTS)
 xhost_DEPENDENCIES =
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+xhost_LINK = $(CCLD) $(xhost_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@ -92,8 +89,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@
@ -116,6 +111,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@
@ -127,11 +123,10 @@ LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 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@
@ -147,9 +142,11 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 XHOST_CFLAGS = @XHOST_CFLAGS@
 XHOST_LIBS = @XHOST_LIBS@
 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@
@ -161,6 +158,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@
@ -188,16 +186,20 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 xhost_SOURCES = xhost.c
 xhost_CFLAGS = @XHOST_CFLAGS@
 xhost_LDADD = @XHOST_LIBS@
 appman_PRE = xhost.man
 appmandir = $(APP_MAN_DIR)
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
 CLEANFILES = $(appman_DATA)
 MAINTAINERCLEANFILES = ChangeLog
 SED = sed
 # Strings to replace in man pages
@ -259,7 +261,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
@ -274,7 +276,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 \
@ -297,7 +299,7 @@ clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 xhost$(EXEEXT): $(xhost_OBJECTS) $(xhost_DEPENDENCIES) 
 	@rm -f xhost$(EXEEXT)
-	$(LINK) $(xhost_LDFLAGS) $(xhost_OBJECTS) $(xhost_LDADD) $(LIBS)
+	$(xhost_LINK) $(xhost_OBJECTS) $(xhost_LDADD) $(LIBS)
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@ -308,36 +310,35 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xhost-xhost.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) '$<'`
 xhost-xhost.o: xhost.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xhost_CFLAGS) $(CFLAGS) -MT xhost-xhost.o -MD -MP -MF "$(DEPDIR)/xhost-xhost.Tpo" -c -o xhost-xhost.o `test -f 'xhost.c' || echo '$(srcdir)/'`xhost.c; \
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xhost_CFLAGS) $(CFLAGS) -MT xhost-xhost.o -MD -MP -MF $(DEPDIR)/xhost-xhost.Tpo -c -o xhost-xhost.o `test -f 'xhost.c' || echo '$(srcdir)/'`xhost.c
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xhost-xhost.Tpo" "$(DEPDIR)/xhost-xhost.Po"; else rm -f "$(DEPDIR)/xhost-xhost.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xhost-xhost.Tpo $(DEPDIR)/xhost-xhost.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xhost.c' object='xhost-xhost.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) $(xhost_CFLAGS) $(CFLAGS) -c -o xhost-xhost.o `test -f 'xhost.c' || echo '$(srcdir)/'`xhost.c
 xhost-xhost.obj: xhost.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xhost_CFLAGS) $(CFLAGS) -MT xhost-xhost.obj -MD -MP -MF "$(DEPDIR)/xhost-xhost.Tpo" -c -o xhost-xhost.obj `if test -f 'xhost.c'; then $(CYGPATH_W) 'xhost.c'; else $(CYGPATH_W) '$(srcdir)/xhost.c'; fi`; \
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xhost_CFLAGS) $(CFLAGS) -MT xhost-xhost.obj -MD -MP -MF $(DEPDIR)/xhost-xhost.Tpo -c -o xhost-xhost.obj `if test -f 'xhost.c'; then $(CYGPATH_W) 'xhost.c'; else $(CYGPATH_W) '$(srcdir)/xhost.c'; fi`
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xhost-xhost.Tpo" "$(DEPDIR)/xhost-xhost.Po"; else rm -f "$(DEPDIR)/xhost-xhost.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xhost-xhost.Tpo $(DEPDIR)/xhost-xhost.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xhost.c' object='xhost-xhost.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) $(xhost_CFLAGS) $(CFLAGS) -c -o xhost-xhost.obj `if test -f 'xhost.c'; then $(CYGPATH_W) 'xhost.c'; else $(CYGPATH_W) '$(srcdir)/xhost.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) \
@ -403,23 +404,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"`; \
-	  esac; \
+	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; \
@ -430,10 +430,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
@ -508,7 +511,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 \
@ -532,7 +535,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
@ -559,6 +562,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
@ -582,12 +586,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
@ -609,25 +621,34 @@ 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
 .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
 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/xhost/aclocal.m4
+++ b/xhost/aclocal.m4
@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006  Free Software Foundation, Inc.
 # This file 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.
@ -11,6 +11,11 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 m4_if(m4_PACKAGE_VERSION, [2.61],,
 [m4_fatal([this file was generated for autoconf 2.61.
 You have another version of autoconf.  If you want to use that,
 you should regenerate the build system entirely.], [63])])
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # 
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
@ -159,7 +164,7 @@ path to pkg-config.
 _PKG_TEXT
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
 		[$4])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@ -782,7 +787,7 @@ AC_DEFUN([XTRANS_SECURE_RPC_FLAGS],
 ]) # XTRANS_SECURE_RPC_FLAGS
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -792,14 +797,29 @@ AC_DEFUN([XTRANS_SECURE_RPC_FLAGS],
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.10'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
 m4_if([$1], [1.10], [],
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 # _AM_AUTOCONF_VERSION(VERSION)
 # -----------------------------
 # aclocal traces this macro to find the Autoconf version.
 # This is a private macro too.  Using m4_define simplifies
 # the logic in aclocal, which can simply ignore this definition.
 m4_define([_AM_AUTOCONF_VERSION], [])
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10])dnl
 _AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
@ -856,14 +876,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 # AM_CONDITIONAL                                            -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file 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.
-# serial 7
+# serial 8
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@ -872,8 +892,10 @@ AC_DEFUN([AM_CONDITIONAL],
 [AC_PREREQ(2.52)dnl
 ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
+AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
 _AM_SUBST_NOTMAKE([$1_FALSE])dnl
 if $2; then
  $1_TRUE=
  $1_FALSE='#'
@ -887,15 +909,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
-
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 #
 # This file 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.
-# serial 8
+# serial 9
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@ -923,6 +944,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
 ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                   [depcc="$$1"   am_compiler_list=])
@ -988,6 +1010,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
       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
@ -1040,7 +1063,8 @@ if test "x$enable_dependency_tracking" != xno; then
  AMDEPBACKSLASH='\'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 ])
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@ -1065,8 +1089,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
  # 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")`
  else
    continue
@ -1125,8 +1150,8 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # Do all the work for Automake.                             -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -1149,16 +1174,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.60])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
-# 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."
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
  # test to see if srcdir already configured
  if test -f $srcdir/config.status; then
    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
  fi
 fi
 # test whether we have cygpath
@ -1178,6 +1207,9 @@ m4_ifval([$2],
 AC_SUBST([PACKAGE], [$1])dnl
 AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
 m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
@ -1213,6 +1245,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
                  [_AM_DEPENDENCIES(CXX)],
                  [define([AC_PROG_CXX],
                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
                  [_AM_DEPENDENCIES(OBJC)],
                  [define([AC_PROG_OBJC],
                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
 ])
@ -1248,7 +1284,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@ -1355,14 +1391,14 @@ rm -f confinc confmf
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 #
 # This file 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.
-# serial 4
+# serial 5
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@ -1378,6 +1414,7 @@ AC_SUBST($1)])
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
@ -1388,7 +1425,7 @@ else
 fi
 ])
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -1396,60 +1433,23 @@ fi
 # AM_PROG_MKDIR_P
 # ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+# Check for `mkdir -p'.
 #
 # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
 # created by `make install' are always world readable, even if the
 # installer happens to have an overly restrictive umask (e.g. 077).
 # This was a mistake.  There are at least two reasons why we must not
 # use `-m 0755':
 #   - it causes special bits like SGID to be ignored,
 #   - it may be too restrictive (some setups expect 775 directories).
 #
 # Do not use -m 0755 and let people choose whatever they expect by
 # setting umask.
 #
 # We cannot accept any implementation of `mkdir' that recognizes `-p'.
 # Some implementations (such as Solaris 8's) are not thread-safe: if a
 # parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
 # concurrently, both version can detect that a/ is missing, but only
 # one can create it and the other will error out.  Consequently we
 # restrict ourselves to GNU make (using the --version option ensures
 # this.)
 AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+[AC_PREREQ([2.60])dnl
-  # We used to keeping the `.' as first argument, in order to
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-  # allow $(mkdir_p) to be used without argument.  As in
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-  #   $(mkdir_p) $(somedir)
+dnl while keeping a definition of mkdir_p for backward compatibility.
-  # where $(somedir) is conditionally defined.  However this is wrong
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-  # for two reasons:
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-  #  1. if the package is installed by a user who cannot write `.'
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
-  #     make install will fail,
+dnl adjustment using top_builddir (which is defined more often than
-  #  2. the above comment should most certainly read
+dnl MKDIR_P).
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-  #     so it does not work when $(somedir) is undefined and
+case $mkdir_p in
-  #     $(DESTDIR) is not.
+  [[\\/$]]* | ?:[[\\/]]*) ;;
-  #  To support the latter case, we have to write
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+esac
-  #  so the `.' trick is pointless.
+])
  mkdir_p='mkdir -p --'
 else
  # On NextStep and OpenStep, the `mkdir' command does not
  # recognize any option.  It will interpret all options as
  # directories to create, and then abort because `.' already
  # exists.
  for d in ./-p ./--version;
  do
    test -d $d && rmdir $d
  done
  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
  if test -f "$ac_aux_dir/mkinstalldirs"; then
    mkdir_p='$(mkinstalldirs)'
  else
    mkdir_p='$(install_sh) -d'
  fi
 fi
 AC_SUBST([mkdir_p])])
 # Helper functions for option handling.                     -*- Autoconf -*-
@ -1561,9 +1561,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
 if test "$cross_compiling" != no; then
  AC_CHECK_TOOL([STRIP], [strip], :)
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 # Copyright (C) 2006  Free Software Foundation, Inc.
 #
 # This file 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.
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Check how to create a tarball.                            -*- Autoconf -*-
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
--- a/xhost/autogen.sh
+++ b/xhost/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/xhost/compile
+++ b/xhost/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/xhost/configure
+++ b/xhost/configure
@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xhost 1.0.1.
+# Generated by GNU Autoconf 2.61 for xhost 1.0.2.
 #
 # 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='xhost'
 PACKAGE_TARNAME='xhost'
-PACKAGE_VERSION='1.0.1'
+PACKAGE_VERSION='1.0.2'
-PACKAGE_STRING='xhost 1.0.1'
+PACKAGE_STRING='xhost 1.0.2'
 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
@ -1194,7 +1195,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 xhost 1.0.1 to adapt to many kinds of systems.
+\`configure' configures xhost 1.0.2 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1264,7 +1265,7 @@ fi
 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of xhost 1.0.1:";;
+     short | recursive ) echo "Configuration of xhost 1.0.2:";;
   esac
  cat <<\_ACEOF
@ -1365,7 +1366,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-xhost configure 1.0.1
+xhost configure 1.0.2
 generated by GNU Autoconf 2.61
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1379,7 +1380,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 xhost $as_me 1.0.1, which was
+It was created by xhost $as_me 1.0.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
  $ $0 $@
@ -1732,7 +1733,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
@ -1915,38 +1917,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
-  done
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
+	     'mkdir (GNU coreutils) '* | \
-    mkdir_p='$(mkinstalldirs)'
+	     'mkdir (coreutils) '* | \
 	     'mkdir (fileutils) '4.1*)
 	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
 	       break 3;;
 	   esac
 	 done
       done
 done
 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
@ -2029,12 +2046,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."
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+  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
@ -2049,7 +2070,7 @@ fi
 # Define the identity of the package.
 PACKAGE='xhost'
- VERSION='1.0.1'
+ VERSION='1.0.2'
 cat >>confdefs.h <<_ACEOF
@ -2077,7 +2098,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
@ -2181,7 +2202,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.
@ -2206,9 +2227,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
@ -3194,9 +3213,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
@ -3206,7 +3223,6 @@ fi
 depcc="$CC"   am_compiler_list=
 { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
@ -3274,6 +3290,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
@ -3303,9 +3320,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=
@ -3668,7 +3683,7 @@ Alternatively, you may set the environment variables XHOST_CFLAGS
 and XHOST_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&5
 echo "$as_me: 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
@ -3678,7 +3693,7 @@ Alternatively, you may set the environment variables XHOST_CFLAGS
 and XHOST_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&2;}
   { (exit 1); exit 1; }; }
 else
@ -4971,7 +4986,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 xhost $as_me 1.0.1, which was
+This file was extended by xhost $as_me 1.0.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
  CONFIG_FILES    = $CONFIG_FILES
@ -5024,7 +5039,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-xhost config.status 1.0.1
+xhost config.status 1.0.2
 configured by $0, generated by GNU Autoconf 2.61,
  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@ -5035,6 +5050,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
@ -5242,6 +5258,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
@ -5298,7 +5315,6 @@ 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
@ -5340,6 +5356,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
  cat >conf$$subs.sed <<_ACEOF
 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
@ -5347,7 +5364,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` = 6; then
    break
  elif $ac_last_try; then
    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@ -5574,6 +5591,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
@ -5627,6 +5649,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
@ -5791,8 +5814,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/xhost/configure.ac
+++ b/xhost/configure.ac
@ -1,7 +1,7 @@
-# $XdotOrg: app/xhost/configure.ac,v 1.11 2006/04/15 00:10:10 ajax Exp $
+# $XdotOrg: app/xhost/configure.ac,v 1.10 2005/12/15 00:24:07 kem Exp $
 AC_PREREQ([2.57])
-AC_INIT(xhost,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xhost)
+AC_INIT(xhost,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xhost)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
--- a/xhost/depcomp
+++ b/xhost/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/xhost/install-sh
+++ b/xhost/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,25 +157,33 @@ while test -n "$1"; do
    --version) echo "$0 $scriptversion"; exit $?;;
-    *)  # When -d is used, all remaining arguments are directories to create.
+    --)	shift
 	# 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
          if test -n "$dstarg"; then
 	    # $@ is not empty: it contains at least $arg.
 	    set fnord "$@" "$dstarg"
 	    shift # fnord
 	  fi
 	  shift # arg
 	  dstarg=$arg
 	done
 	break;;
    -*)	echo "$0: invalid option: $1" >&2
 	exit 1;;
    *)  break;;
  esac
 done
-if test -z "$1"; then
+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.
  # Otherwise, the last argument is the destination.  Remove it from $@.
  for arg
  do
    if test -n "$dstarg"; then
      # $@ is not empty: it contains at least $arg.
      set fnord "$@" "$dstarg"
      shift # fnord
    fi
    shift # arg
    dstarg=$arg
  done
 fi
 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"
-    if test -d "$dst"; then
+    dstdir_status=$?
      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
-    oIFS=$IFS
+	# With -d, create the new directory with the user-specified mode.
-    # Some sh's can't handle IFS=/ for some reason.
+	# Otherwise, rely on $mkdir_umask.
-    IFS='%'
+	if test -n "$dir_arg"; then
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+	  mkdir_mode=-m$mode
-    shift
+	else
-    IFS=$oIFS
+	  mkdir_mode=
 	fi
-    pathcomp=
+	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
-    while test $# -ne 0 ; do
+	    if (umask $mkdir_umask &&
-      pathcomp=$pathcomp$1
+		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
      IFS=/
      $posix_glob && set -f
      set fnord $dstdir
      shift
-      if test ! -d "$pathcomp"; then
+      $posix_glob && set +f
-        $mkdirprog "$pathcomp"
+      IFS=$oIFS
-	# mkdir can fail with a `File exist' error in case several
+
-	# install-sh are creating the directory concurrently.  This
+      prefixes=
-	# is OK.
+
-	test -d "$pathcomp" || exit
+      for d
      do
 	test -z "$d" && continue
 	prefix=$prefix$d
 	if test -d "$prefix"; then
 	  prefixes=
 	else
 	  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
 	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
-      pathcomp=$pathcomp/
+    fi
    done
  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/xhost/missing
+++ b/xhost/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/xhost/mkinstalldirs
+++ b/xhost/mkinstalldirs
@ -1,158 +0,0 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 scriptversion=2005-06-29.22
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
 # Public domain.
 #
 # This file is maintained in Automake, please report
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 errstatus=0
 dirmode=
 usage="\
 Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
 Create each directory DIR (with mode MODE, if specified), including all
 leading file name components.
 Report bugs to <bug-automake@gnu.org>."
 # process command line arguments
 while test $# -gt 0 ; do
  case $1 in
    -h | --help | --h*)         # -h for help
      echo "$usage"
      exit $?
      ;;
    -m)                         # -m PERM arg
      shift
      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
      dirmode=$1
      shift
      ;;
    --version)
      echo "$0 $scriptversion"
      exit $?
      ;;
    --)                         # stop option processing
      shift
      break
      ;;
    -*)                         # unknown option
      echo "$usage" 1>&2
      exit 1
      ;;
    *)                          # first non-opt arg
      break
      ;;
  esac
 done
 for file
 do
  if test -d "$file"; then
    shift
  else
    break
  fi
 done
 case $# in
  0) exit 0 ;;
 esac
 # Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
 # mkdir -p a/c at the same time, both will detect that a is missing,
 # one will create a, then the other will try to create a and die with
 # a "File exists" error.  This is a problem when calling mkinstalldirs
 # from a parallel make.  We use --version in the probe to restrict
 # ourselves to GNU mkdir, which is thread-safe.
 case $dirmode in
  '')
    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
      echo "mkdir -p -- $*"
      exec mkdir -p -- "$@"
    else
      # On NextStep and OpenStep, the `mkdir' command does not
      # recognize any option.  It will interpret all options as
      # directories to create, and then abort because `.' already
      # exists.
      test -d ./-p && rmdir ./-p
      test -d ./--version && rmdir ./--version
    fi
    ;;
  *)
    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
       test ! -d ./--version; then
      echo "mkdir -m $dirmode -p -- $*"
      exec mkdir -m "$dirmode" -p -- "$@"
    else
      # Clean up after NextStep and OpenStep mkdir.
      for d in ./-m ./-p ./--version "./$dirmode";
      do
        test -d $d && rmdir $d
      done
    fi
    ;;
 esac
 for file
 do
  case $file in
    /*) pathcomp=/ ;;
    *)  pathcomp= ;;
  esac
  oIFS=$IFS
  IFS=/
  set fnord $file
  shift
  IFS=$oIFS
  for d
  do
    test "x$d" = x && continue
    pathcomp=$pathcomp$d
    case $pathcomp in
      -*) pathcomp=./$pathcomp ;;
    esac
    if test ! -d "$pathcomp"; then
      echo "mkdir $pathcomp"
      mkdir "$pathcomp" || lasterr=$?
      if test ! -d "$pathcomp"; then
 	errstatus=$lasterr
      else
 	if test ! -z "$dirmode"; then
 	  echo "chmod $dirmode $pathcomp"
 	  lasterr=
 	  chmod "$dirmode" "$pathcomp" || lasterr=$?
 	  if test ! -z "$lasterr"; then
 	    errstatus=$lasterr
 	  fi
 	fi
      fi
    fi
    pathcomp=$pathcomp/
  done
 done
 exit $errstatus
 # 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/xhost/xhost.c
+++ b/xhost/xhost.c
@ -1,5 +1,5 @@
 /* $Xorg: xhost.c,v 1.4 2001/02/09 02:05:46 xorgcvs Exp $ */
-/* $XdotOrg: app/xhost/xhost.c,v 1.5 2006/04/15 00:10:10 ajax Exp $ */
+/* $XdotOrg: app/xhost/xhost.c,v 1.4 2005/06/18 08:03:35 alanc Exp $ */
 /*
 Copyright 1985, 1986, 1987, 1998  The Open Group
--- a/xhost/xhost.man
+++ b/xhost/xhost.man
@ -1,5 +1,5 @@
 .\" $Xorg: xhost.man,v 1.4 2001/02/09 02:05:46 xorgcvs Exp $
-.\" $XdotOrg: app/xhost/xhost.man,v 1.2 2004/04/23 19:54:49 eich Exp $
+.\" $XdotOrg$
 .\"
 .\" Copyright 1988, 1998  The Open Group
 .\" Copyright 2004 Sun Microsystems, Inc.
@ -50,7 +50,7 @@ implement the user-based mechanism or use the hooks in the
 protocol for passing other authentication data to the server.
 .SH OPTIONS
 \fIXhost\fP accepts the following command line options described below.  For
-security, the options that effect access control may only be run from the
+security, the options that affect access control may only be run from the
 "controlling host".  For workstations, this is the same machine as the
 server.  For X terminals, it is the login host.
 .TP 8
@ -119,7 +119,9 @@ the access list in the appropriate inet or inet6 family.
 Server interpreted addresses consist of a case-sensitive type tag and a
 string representing a given value, separated by a colon.  For example,
 "si:hostname:almas" is a server interpreted address of type \fIhostname\fP,
-with a value of \fIalmas\fP.
+with a value of \fIalmas\fP.   For more information on the available forms
 of server interpreted addresses, see the \fIXsecurity\fP(__miscmansuffix__)
 manual page.
 .SH DIAGNOSTICS
 For each name added to the access control list,
 a line of the form "\fIname\fP being added to access control list"