iceauth 1.0.2.

2007-08-13 14:32:32 +02:00 · 2007-08-13 14:32:32 +02:00 · 4cb5e6b4bb
parent 22ec152fa7
commit 4cb5e6b4bb
20 changed files with 2138 additions and 2131 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,10 @@
 x11-xserver-utils (7.2+4) UNRELEASED; urgency=low
  * iceauth 1.0.2.
    + removes blank line in the manpage (closes: #25285).
 -- Julien Cristau <jcristau@debian.org>  Mon, 13 Aug 2007 14:28:38 +0200
 x11-xserver-utils (7.2+3) experimental; urgency=low
  * xhost 1.0.2.
--- a/iceauth/ChangeLog
+++ b/iceauth/ChangeLog
@ -1,30 +1,277 @@
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 5e52eb5d27986490dfad02781a452b8d0650f4b9
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon Jul 23 18:23:56 2007 -0700
-	* configure.ac:
+    Version bump: 1.0.2
 	Update package version for X11R7 release.
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 4471761150676a8cee5631615bc187019b760161
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon Jul 23 17:49:59 2007 -0700
-	* configure.ac:
+    Change iceauth_CFLAGS to AM_CFLAGS to avoid automake-1.10 warning
-	Update package version number for final X11R7 release candidate.
+    
    Makefile.am:27: compiling `iceauth.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit bc7a27ab2e4e3339b9c2ee3bb90a38662b128448
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Fri May 18 12:58:23 2007 -0700
-	* Makefile.am:
+    More constification and reduction of rw data in binary
 	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 45bb32cecdcf3319ae268f29a3ba1c33378e0acf
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Fri May 18 12:57:00 2007 -0700
-	* configure.ac:
+    Debian Bug #25285: iceauth manpage starts with blank screen
-	Update package version number for X11R7 RC3 release.
+    
    <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=25285>
-2005-11-20  Alan Coopersmith  <alan.coopersmith@sun.com>
+commit bff96f0f863ba98fe5a66110ae0e29ca26336861
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Thu May 17 14:08:03 2007 -0700
-	* configure.ac: 
+    Constify some static data constants
 	iceauth only depends on xproto headers, not x11 library
-2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit c5e43b03ca7176907dd8d0d0964e0fd0460b9ff5
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Thu May 17 13:50:05 2007 -0700
-	* configure.ac:
+    ANSIfy function declarations
 	Update package version number for RC1 release.
 commit b2761be7f786fe9fde424b4331479d3ac5082f16
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Thu May 17 13:23:25 2007 -0700
    Fix some lint warnings
    (611) warning: assignment of 64-bit integer to 32-bit integer
    (653) warning: variable argument to strcpy(); make sure it's safe
    (728) warning: sign extension from 32-bit to 64-bit integer
 commit 77cadcef6ea687e7181aa222c47402f34644a6ea
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Thu May 17 13:02:49 2007 -0700
    Add option to check code with lint/sparse/etc.
 commit 2afbb4393b1053fcb2edbec7c92575245efabffe
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Thu May 17 12:59:51 2007 -0700
    Replace static ChangeLog with disthook to generate from git log
 commit 0022cf7baf11bccea0024d0dc8c1ecc37e46ef3d
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Wed May 16 20:14:10 2007 -0700
    Bug 10739: iceauth dumps core if signal caught before initialization done
    X.Org Bugzilla #10739 <http://bugs.freedesktop.org/show_bug.cgi?id=10739>
    Adding a test for NULL filename before calling IceUnlockAuthFile in
    auth_finalize cleared the crash, but left the lock file behind.
    Moving the initialization of authfilename to earlier in auth_initialize()
    allowed the locks to be cleaned up as well.
 commit f749d926bd9796badee2efd1ee1da5905d6fd38d
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon May 14 19:04:24 2007 -0700
    Replace copystring() with strdup() calls
    Also solves Coverity #924: Function copystring:
      Pointer "src" dereferenced before NULL check
 commit 1a142e8b29113bbd9daf21b8371f1572cd0152dd
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon May 14 18:57:31 2007 -0700
    Coverity #1089: Double frees in error cleanup path
    Double free of pointer "(auth)->auth_data" in call to "free"
    Double free of pointer "(auth)->protocol_data" in call to "free"
 commit 4c1bd3d698bbb2ec4c1f8d3744549ec44c58d1bf
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon May 14 18:47:48 2007 -0700
    renamed: .cvsignore -> .gitignore
 commit ca8a9af2c282da78eac601e316d7db553cb411b3
 Author: Alan Coopersmith <alan.coopersmith@sun.com>
 Date:   Mon May 14 18:47:24 2007 -0700
    Coverity #1039: Using uninitialized value "authdata"
 commit 59ccc789fa5d7d34cd81d28f46b6022e92536d6b
 Author: Kevin E Martin <kem@kem.org>
 Date:   Wed Dec 21 02:29:42 2005 +0000
    Update package version for X11R7 release.
 commit d8dd7304386ba1ca8a6fbbcdcc6c4d790599ac91
 Author: Adam Jackson <ajax@nwnk.net>
 Date:   Mon Dec 19 16:22:40 2005 +0000
    Stub COPYING files
 commit f3a5ff191dda517c3331760d97549a826ede4266
 Author: Kevin E Martin <kem@kem.org>
 Date:   Thu Dec 15 00:24:02 2005 +0000
    Update package version number for final X11R7 release candidate.
 commit 589df4ac932d1c5616c12a331ef99c0ac6f75563
 Author: Kevin E Martin <kem@kem.org>
 Date:   Tue Dec 6 22:48:16 2005 +0000
    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
 commit 7ec4ba15177f055afb6dc9972763c25bfc79cec9
 Author: Kevin E Martin <kem@kem.org>
 Date:   Sat Dec 3 05:49:15 2005 +0000
    Update package version number for X11R7 RC3 release.
 commit 31a2c7a834076f86bb801de6f7c6ff2a454e3db3
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Mon Nov 28 22:01:37 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 de9318f27ce26c5362d71a970738db261277a630
 Author: Eric Anholt <anholt@freebsd.org>
 Date:   Mon Nov 21 10:34:55 2005 +0000
    Another pass at .cvsignores for apps.
 commit 9b58fd72a610a45eb5a93d04d6b7b883ca3b8faf
 Author: Eric Anholt <anholt@freebsd.org>
 Date:   Sun Nov 20 22:08:48 2005 +0000
    Add/improve .cvsignore files for apps.
 commit cab89641f369a196d4ad7ad23db8e6dfc2257d01
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Sun Nov 20 18:08:14 2005 +0000
    iceauth only depends on xproto headers, not x11 library
 commit e4b6fddc688dbb65353f818dd482c1a0dd9575f8
 Author: Kevin E Martin <kem@kem.org>
 Date:   Wed Oct 19 02:47:48 2005 +0000
    Update package version number for RC1 release.
 commit 1ded5d399305e930b7e3dcbb5ca48cbf5018faa7
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Mon Oct 17 23:56:19 2005 +0000
    Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
        work better with BSD make
 commit a0fcb616a2e44353758f3010769b1e975f7944b9
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Fri Oct 14 00:25:41 2005 +0000
    Use sed to fill in variables in man page
 commit 973f5b5e29f4ecc43e47799dcd747d67c956edd6
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Mon Aug 1 20:25:27 2005 +0000
    Install man pages to section 1 instead of section m (Patch from Donnie
        Berkholz)
 commit 8f0e8e0af05244c5a10914dc789c97f99e7a2aa3
 Author: Kevin E Martin <kem@kem.org>
 Date:   Fri Jul 29 21:22:29 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 ee46a1af27aabf3178af70b02d95356d757572d3
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Tue Jul 26 18:58:14 2005 +0000
    Use AC_TYPE_SIGNAL and AC_FUNC_VFORK to replace Imake's SIGNAL_DEFINES and
    -DHAS_VFORK
 commit c911c36dadcb8070fbdf94d7f9eef494e18b5094
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Tue Jul 26 18:55:42 2005 +0000
    Add config.h includes for modularization Use RETSIGTYPE if defined by
        autoconf in addition to Imake's SIGNALRETURNSINT. Use
        HAVE_WORKING_VFORK if defined by autoconf in addition to Imake's
        HAS_VFORK
 commit 055e01c0756e6aa8603169dd104cdd2153d2b749
 Author: Adam Jackson <ajax@nwnk.net>
 Date:   Wed Jul 20 19:31:48 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 c83a1200d2480ac67d755e4c589b524d1b834a6a
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Sat Jul 16 20:52:25 2005 +0000
    Mark variables modified in signal handlers as volatile (part of Sun bug id
        4496504)
 commit d0bc63cf13e98f686bd371a0ab609018e7fdf8c2
 Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
 Date:   Tue Jun 28 15:04:15 2005 +0000
    Add build system for iceauth
 commit 2562a65de3dfa44006c1f82052814d9b54e00f37
 Author: Egbert Eich <eich@suse.de>
 Date:   Fri Apr 23 19:54:33 2004 +0000
    Merging XORG-CURRENT into trunk
 commit d8eefa5e8a51e448eecb9ec6be656775be2884cd
 Author: Egbert Eich <eich@suse.de>
 Date:   Sun Mar 14 08:34:51 2004 +0000
    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
 commit c560cd34038b23f28862bc890f3aaf161bb64c32
 Author: Egbert Eich <eich@suse.de>
 Date:   Wed Mar 3 12:12:50 2004 +0000
    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
 commit d05d91dcd79d5ce8ce548da80ae6e11eb8a4fcc7
 Author: Egbert Eich <eich@suse.de>
 Date:   Thu Feb 26 13:36:15 2004 +0000
    readding XFree86's cvs IDs
 commit a833bab02a6cbe19724b6bb4583f4ffaa24a0534
 Author: Egbert Eich <eich@suse.de>
 Date:   Thu Feb 26 09:23:54 2004 +0000
    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
 commit a3101452dc6f4ef01c328fad7e18685363937bcf
 Author: Kaleb Keithley <kaleb@freedesktop.org>
 Date:   Fri Nov 14 16:48:57 2003 +0000
    XFree86 4.3.0.1
 commit 511f5a05d0cc763d60b6b39584ea29b287cb801c
 Author: Kaleb Keithley <kaleb@freedesktop.org>
 Date:   Fri Nov 14 15:54:52 2003 +0000
    R6.6 is the Xorg base-line
--- a/iceauth/INSTALL
+++ b/iceauth/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/iceauth/Makefile.am
+++ b/iceauth/Makefile.am
@ -21,7 +21,7 @@
 bin_PROGRAMS = iceauth
-iceauth_CFLAGS = $(ICEAUTH_CFLAGS)
+AM_CFLAGS = $(ICEAUTH_CFLAGS)
 iceauth_LDADD = $(ICEAUTH_LIBS)
 iceauth_SOURCES =	\
@ -37,9 +37,18 @@ 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
 # Strings to replace in man pages
@ -63,3 +72,10 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
 if LINT
 ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
                $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
 lint:
 	$(LINT) $(ALL_LINT_FLAGS) $(iceauth_SOURCES)
 endif LINT
--- a/iceauth/Makefile.in
+++ b/iceauth/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,30 +55,28 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = iceauth$(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)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_iceauth_OBJECTS = iceauth-iceauth.$(OBJEXT) \
+am_iceauth_OBJECTS = iceauth.$(OBJEXT) process.$(OBJEXT)
 	iceauth-process.$(OBJEXT)
 iceauth_OBJECTS = $(am_iceauth_OBJECTS)
 am__DEPENDENCIES_1 =
 iceauth_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) \
@ -115,8 +109,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@
@ -141,6 +133,7 @@ FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 ICEAUTH_CFLAGS = @ICEAUTH_CFLAGS@
 ICEAUTH_LIBS = @ICEAUTH_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -150,13 +143,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@
@ -170,9 +164,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@
@ -184,6 +180,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@
@ -211,9 +208,12 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-iceauth_CFLAGS = $(ICEAUTH_CFLAGS)
+top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CFLAGS = $(ICEAUTH_CFLAGS)
 iceauth_LDADD = $(ICEAUTH_LIBS)
 iceauth_SOURCES = \
        iceauth.c \
@ -225,8 +225,9 @@ appman_PRE = \
 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
@ -246,6 +247,9 @@ MAN_SUBSTS = \
 	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
 SUFFIXES = .$(APP_MAN_SUFFIX) .man
@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@LINT_TRUE@                $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@ -288,7 +292,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
@ -303,7 +307,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 \
@ -326,7 +330,7 @@ clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 iceauth$(EXEEXT): $(iceauth_OBJECTS) $(iceauth_DEPENDENCIES) 
 	@rm -f iceauth$(EXEEXT)
-	$(LINK) $(iceauth_LDFLAGS) $(iceauth_OBJECTS) $(iceauth_LDADD) $(LIBS)
+	$(LINK) $(iceauth_OBJECTS) $(iceauth_LDADD) $(LIBS)
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@ -334,54 +338,25 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iceauth-iceauth.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iceauth.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iceauth-process.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process.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) '$<'`
 iceauth-iceauth.o: iceauth.c
@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iceauth_CFLAGS) $(CFLAGS) -MT iceauth-iceauth.o -MD -MP -MF "$(DEPDIR)/iceauth-iceauth.Tpo" -c -o iceauth-iceauth.o `test -f 'iceauth.c' || echo '$(srcdir)/'`iceauth.c; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/iceauth-iceauth.Tpo" "$(DEPDIR)/iceauth-iceauth.Po"; else rm -f "$(DEPDIR)/iceauth-iceauth.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iceauth.c' object='iceauth-iceauth.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) $(iceauth_CFLAGS) $(CFLAGS) -c -o iceauth-iceauth.o `test -f 'iceauth.c' || echo '$(srcdir)/'`iceauth.c
 iceauth-iceauth.obj: iceauth.c
@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iceauth_CFLAGS) $(CFLAGS) -MT iceauth-iceauth.obj -MD -MP -MF "$(DEPDIR)/iceauth-iceauth.Tpo" -c -o iceauth-iceauth.obj `if test -f 'iceauth.c'; then $(CYGPATH_W) 'iceauth.c'; else $(CYGPATH_W) '$(srcdir)/iceauth.c'; fi`; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/iceauth-iceauth.Tpo" "$(DEPDIR)/iceauth-iceauth.Po"; else rm -f "$(DEPDIR)/iceauth-iceauth.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='iceauth.c' object='iceauth-iceauth.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) $(iceauth_CFLAGS) $(CFLAGS) -c -o iceauth-iceauth.obj `if test -f 'iceauth.c'; then $(CYGPATH_W) 'iceauth.c'; else $(CYGPATH_W) '$(srcdir)/iceauth.c'; fi`
 iceauth-process.o: process.c
@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iceauth_CFLAGS) $(CFLAGS) -MT iceauth-process.o -MD -MP -MF "$(DEPDIR)/iceauth-process.Tpo" -c -o iceauth-process.o `test -f 'process.c' || echo '$(srcdir)/'`process.c; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/iceauth-process.Tpo" "$(DEPDIR)/iceauth-process.Po"; else rm -f "$(DEPDIR)/iceauth-process.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='process.c' object='iceauth-process.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) $(iceauth_CFLAGS) $(CFLAGS) -c -o iceauth-process.o `test -f 'process.c' || echo '$(srcdir)/'`process.c
 iceauth-process.obj: process.c
@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iceauth_CFLAGS) $(CFLAGS) -MT iceauth-process.obj -MD -MP -MF "$(DEPDIR)/iceauth-process.Tpo" -c -o iceauth-process.obj `if test -f 'process.c'; then $(CYGPATH_W) 'process.c'; else $(CYGPATH_W) '$(srcdir)/process.c'; fi`; \
@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/iceauth-process.Tpo" "$(DEPDIR)/iceauth-process.Po"; else rm -f "$(DEPDIR)/iceauth-process.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='process.c' object='iceauth-process.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) $(iceauth_CFLAGS) $(CFLAGS) -c -o iceauth-process.obj `if test -f 'process.c'; then $(CYGPATH_W) 'process.c'; else $(CYGPATH_W) '$(srcdir)/process.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) \
@ -447,23 +422,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; \
@ -474,10 +448,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
@ -552,7 +529,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 \
@ -576,7 +553,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
@ -603,6 +580,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
@ -626,12 +604,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
@ -653,27 +639,38 @@ 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) < $< > $@
@LINT_TRUE@lint:
@LINT_TRUE@	$(LINT) $(ALL_LINT_FLAGS) $(iceauth_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/iceauth/aclocal.m4
+++ b/iceauth/aclocal.m4
--- a/iceauth/autogen.sh
+++ b/iceauth/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/iceauth/compile
+++ b/iceauth/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/iceauth/config.guess
+++ b/iceauth/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
+	echo i586-pc-interix${UNAME_RELEASE}
-	    x86) 
+	exit ;;
-		echo i586-pc-interix${UNAME_RELEASE}
+    EM64T:Interix*:[3456]*)
-		exit ;;
+	echo x86_64-unknown-interix${UNAME_RELEASE}
-	    EM64T | authenticamd)
+	exit ;;
 		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/iceauth/config.sub
+++ b/iceauth/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/iceauth/configure
+++ b/iceauth/configure
@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for iceauth 1.0.1.
+# Generated by GNU Autoconf 2.61 for iceauth 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='iceauth'
 PACKAGE_TARNAME='iceauth'
-PACKAGE_VERSION='1.0.1'
+PACKAGE_VERSION='1.0.2'
-PACKAGE_STRING='iceauth 1.0.1'
+PACKAGE_STRING='iceauth 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
@ -658,6 +659,10 @@ am__fastdepCC_FALSE
 PKG_CONFIG
 ICEAUTH_CFLAGS
 ICEAUTH_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 iceauth 1.0.1 to adapt to many kinds of systems.
+\`configure' configures iceauth 1.0.2 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 iceauth 1.0.1:";;
+     short | recursive ) echo "Configuration of iceauth 1.0.2:";;
   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
@ -1360,7 +1367,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-iceauth configure 1.0.1
+iceauth configure 1.0.2
 generated by GNU Autoconf 2.61
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1374,7 +1381,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 iceauth $as_me 1.0.1, which was
+It was created by iceauth $as_me 1.0.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
  $ $0 $@
@ -1727,7 +1734,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
@ -1910,38 +1918,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
@ -2024,12 +2047,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
@ -2044,7 +2071,7 @@ fi
 # Define the identity of the package.
 PACKAGE='iceauth'
- VERSION='1.0.1'
+ VERSION='1.0.2'
 cat >>confdefs.h <<_ACEOF
@ -2072,7 +2099,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
@ -2176,7 +2203,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.
@ -2201,9 +2228,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
@ -2218,6 +2243,31 @@ fi
 ac_config_headers="$ac_config_headers config.h"
 # Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
 	XORG_MACROS_needed_version=1.1
 	XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
 	XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`
 	{ echo "$as_me:$LINENO: checking if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}" >&5
 echo $ECHO_N "checking if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}... $ECHO_C" >&6; }
 	XORG_MACROS_version=1.1.5
 	XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
 	XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`
 	if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
 		{ { echo "$as_me:$LINENO: error: configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x" >&5
 echo "$as_me: error: configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x" >&2;}
   { (exit 1); exit 1; }; }
 	fi
 	if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
 		{ { echo "$as_me:$LINENO: error: configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer" >&5
 echo "$as_me: error: configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer" >&2;}
   { (exit 1); exit 1; }; }
 	fi
 	{ echo "$as_me:$LINENO: result: yes, $XORG_MACROS_version" >&5
 echo "${ECHO_T}yes, $XORG_MACROS_version" >&6; }
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@ -3189,9 +3239,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
@ -3201,7 +3249,6 @@ fi
 depcc="$CC"   am_compiler_list=
 { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
@ -3269,6 +3316,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
@ -3298,9 +3346,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=
@ -3578,9 +3624,6 @@ pkg_failed=no
 echo $ECHO_N "checking for ICEAUTH... $ECHO_C" >&6; }
 if test -n "$PKG_CONFIG"; then
    if test -n "$ICEAUTH_CFLAGS"; then
        pkg_cv_ICEAUTH_CFLAGS="$ICEAUTH_CFLAGS"
    else
        if test -n "$PKG_CONFIG" && \
    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto ice\"") >&5
  ($PKG_CONFIG --exists --print-errors "xproto ice") 2>&5
@ -3591,14 +3634,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 "$ICEAUTH_LIBS"; then
        pkg_cv_ICEAUTH_LIBS="$ICEAUTH_LIBS"
    else
        if test -n "$PKG_CONFIG" && \
    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto ice\"") >&5
  ($PKG_CONFIG --exists --print-errors "xproto ice") 2>&5
@ -3609,59 +3648,38 @@ if test -n "$PKG_CONFIG"; then
 else
  pkg_failed=yes
 fi
    fi
 else
 	pkg_failed=untried
 fi
 if test $pkg_failed = yes; then
-
+	ICEAUTH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto ice"`
 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
 	        ICEAUTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xproto ice"`
        else
 	        ICEAUTH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto ice"`
        fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$ICEAUTH_PKG_ERRORS" >&5
+	echo "$ICEAUTH_PKG_ERRORS" 1>&5
 	{ { echo "$as_me:$LINENO: error: Package requirements (xproto ice) were not met:
 $ICEAUTH_PKG_ERRORS
 	{ { echo "$as_me:$LINENO: error: Package requirements (xproto ice) 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 ICEAUTH_CFLAGS
+Alternatively you may set the ICEAUTH_CFLAGS and ICEAUTH_LIBS environment variables
-and ICEAUTH_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 (xproto ice) were not met.
 echo "$as_me: error: Package requirements (xproto ice) were not met:
 $ICEAUTH_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 ICEAUTH_CFLAGS
+Alternatively you may set the ICEAUTH_CFLAGS and ICEAUTH_LIBS environment variables
-and ICEAUTH_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 ICEAUTH_CFLAGS
+Alternatively you may set the ICEAUTH_CFLAGS and ICEAUTH_LIBS environment variables
-and ICEAUTH_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
@ -3669,9 +3687,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 ICEAUTH_CFLAGS
+Alternatively you may set the ICEAUTH_CFLAGS and ICEAUTH_LIBS environment variables
-and ICEAUTH_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;}
@ -3686,6 +3704,46 @@ 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
@ -3999,6 +4057,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
@ -4299,7 +4364,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 iceauth $as_me 1.0.1, which was
+This file was extended by iceauth $as_me 1.0.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
  CONFIG_FILES    = $CONFIG_FILES
@ -4352,7 +4417,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-iceauth config.status 1.0.1
+iceauth config.status 1.0.2
 configured by $0, generated by GNU Autoconf 2.61,
  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@ -4363,6 +4428,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
@ -4570,6 +4636,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
@ -4610,6 +4677,10 @@ am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
 PKG_CONFIG!$PKG_CONFIG$ac_delim
 ICEAUTH_CFLAGS!$ICEAUTH_CFLAGS$ac_delim
 ICEAUTH_LIBS!$ICEAUTH_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
@ -4622,11 +4693,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
@ -4668,6 +4734,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
@ -4675,7 +4746,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
@ -4902,6 +4973,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
@ -4955,6 +5031,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
@ -5119,8 +5196,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/iceauth/configure.ac
+++ b/iceauth/configure.ac
@ -22,12 +22,16 @@ dnl
 dnl Process this file with autoconf to create configure.
 AC_PREREQ([2.57])
-AC_INIT(iceauth,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],iceauth)
+AC_INIT(iceauth,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],iceauth)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 AM_CONFIG_HEADER(config.h)
 # Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
 m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
 XORG_MACROS_VERSION(1.1)
 AC_PROG_CC
 AC_PROG_INSTALL
@ -38,6 +42,7 @@ PKG_CHECK_MODULES(ICEAUTH, xproto ice)
 AC_SUBST(ICEAUTH_CFLAGS)
 AC_SUBST(ICEAUTH_LIBS)
 XORG_WITH_LINT
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
--- a/iceauth/depcomp
+++ b/iceauth/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/iceauth/iceauth.c
+++ b/iceauth/iceauth.c
@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group.
 /*
 * global data
 */
-char *ProgramName;			/* argv[0], set at top of main() */
+const char *ProgramName;		/* argv[0], set at top of main() */
 int verbose = -1;			/* print certain messages */
 Bool ignore_locks = False;		/* for error recovery */
 Bool break_locks = False;		/* for error recovery */
@ -49,7 +49,7 @@ Bool break_locks = False;		/* for error recovery */
 static char *authfilename = NULL;	/* filename of cookie file */
 static char *defcmds[] = { "source", "-", NULL };  /* default command */
 static int ndefcmds = 2;
-static char *defsource = "(stdin)";
+static const char *defsource = "(stdin)";
 /*
@ -57,35 +57,25 @@ static char *defsource = "(stdin)";
 */
 static void usage (void)
 {
-    static char *prefixmsg[] = {
+    static const char prefixmsg[] = 
-"",
+"\n"
-"where options include:",
+"where options include:\n"
-"    -f authfilename                name of authority file to use",
+"    -f authfilename                name of authority file to use\n"
-"    -v                             turn on extra messages",
+"    -v                             turn on extra messages\n"
-"    -q                             turn off extra messages",
+"    -q                             turn off extra messages\n"
-"    -i                             ignore locks on authority file",
+"    -i                             ignore locks on authority file\n"
-"    -b                             break locks on authority file",
+"    -b                             break locks on authority file\n"
-"",
+"\n"
-"and commands have the following syntax:",
+"and commands have the following syntax:\n";
-"",
+    static const char suffixmsg[] = 
-NULL };
+"A dash may be used with the \"merge\" and \"source\" to read from the\n"
-    static char *suffixmsg[] = {
+"standard input.  Commands beginning with \"n\" use numeric format.\n";
 "A dash may be used with the \"merge\" and \"source\" to read from the",
 "standard input.  Commands beginning with \"n\" use numeric format.",
 "",
 NULL };
    char **msg;
    fprintf (stderr, "usage:  %s [-options ...] [command arg ...]\n",
 	     ProgramName);
-    for (msg = prefixmsg; *msg; msg++) {
+    fprintf (stderr, "%s\n", prefixmsg);
 	fprintf (stderr, "%s\n", *msg);
    }
    print_help (stderr, "    ");	/* match prefix indentation */
-    fprintf (stderr, "\n");
+    fprintf (stderr, "\n%s\n", suffixmsg);
    for (msg = suffixmsg; *msg; msg++) {
 	fprintf (stderr, "%s\n", *msg);
    }
    exit (1);
 }
@ -97,7 +87,7 @@ int
 main (int argc, char *argv[])
 {
    int i;
-    char *sourcename = defsource;
+    const char *sourcename = defsource;
    char **arglist = defcmds;
    int nargs = ndefcmds;
    int status;
--- a/iceauth/iceauth.h
+++ b/iceauth/iceauth.h
@ -45,14 +45,14 @@ typedef int Bool;
 #define True 1
 #endif
-extern char *ProgramName;
+extern const char *ProgramName;
 #include <stdlib.h>
 extern int auth_initialize ( char *authfilename );
 extern int auth_finalize ( void );
-extern int process_command ( char *inputfilename, int lineno, int argc, char **argv );
+extern int process_command ( const char *inputfilename, int lineno, int argc, char **argv );
-extern int print_help ( FILE *fp, char *cmd );
+extern int print_help ( FILE *fp, const char *cmd );
 extern int verbose;
 extern Bool ignore_locks;
--- a/iceauth/iceauth.man
+++ b/iceauth/iceauth.man
@ -1,5 +1,4 @@
 .\" $Xorg: iceauth.man,v 1.4 2001/02/09 02:05:31 xorgcvs Exp $
 .\" Copyright 1994, 1998  The Open Group
 .\" 
 .\" Permission to use, copy, modify, distribute, and sell this software and its
--- a/iceauth/install-sh
+++ b/iceauth/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/iceauth/missing
+++ b/iceauth/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/iceauth/mkinstalldirs
+++ b/iceauth/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/iceauth/process.c
+++ b/iceauth/process.c
@ -51,8 +51,8 @@ typedef struct _AuthList {		/* linked list of entries */
 #define add_to_list(h,t,e) {if (t) (t)->next = (e); else (h) = (e); (t) = (e);}
-typedef int (*ProcessFunc)(char *, int, int, char **);
+typedef int (*ProcessFunc)(const char *, int, int, char **);
-typedef int (*DoFunc)(char *, int, IceAuthFileEntry *, char *);
+typedef int (*DoFunc)(const char *, int, IceAuthFileEntry *, char *);
 typedef struct _CommandTable {		/* commands that are understood */
    char *name;				/* full name */
@ -80,44 +80,43 @@ struct _list_data {			/* for iterating */
 */
 static char *stdin_filename = "(stdin)";  /* for messages */
 static char *stdout_filename = "(stdout)";  /* for messages */
-static char *Yes = "yes";		/* for messages */
+static const char *Yes = "yes";		/* for messages */
-static char *No = "no";			/* for messages */
+static const char *No = "no";			/* for messages */
-static char *copystring ( char *src );
+static int binaryEqual ( const char *a, const char *b, unsigned len );
-static int binaryEqual ( char *a, char *b, unsigned len );
+static void prefix ( const char *fn, int n );
-static void prefix ( char *fn, int n );
+static void badcommandline ( const char *cmd );
 static void badcommandline ( char *cmd );
 static char *skip_space ( char *s );
 static char *skip_nonspace ( char *s );
 static char **split_into_words ( char *src, int *argcp );
-static FILE *open_file ( char **filenamep, char *mode, Bool *usedstdp, char *srcfn, int srcln, char *cmd );
+static FILE *open_file ( char **filenamep, const char *mode, Bool *usedstdp, const char *srcfn, int srcln, const char *cmd );
 static int read_auth_entries ( FILE *fp, AuthList **headp, AuthList **tailp );
 static int cvthexkey ( char *hexstr, char **ptrp );
-static int dispatch_command ( char *inputfilename, int lineno, int argc, char **argv, CommandTable *tab, int *statusp );
+static int dispatch_command ( const char *inputfilename, int lineno, int argc, char **argv, const CommandTable *tab, int *statusp );
 static void die ( int sig );
 static void catchsig ( int sig );
 static void register_signals ( void );
-static int write_auth_file ( char *tmp_nam );
+static int write_auth_file ( char *tmp_nam, size_t tmp_nam_len );
-static void fprintfhex ( FILE *fp, unsigned int len, char *cp );
+static void fprintfhex ( FILE *fp, unsigned int len, const char *cp );
-static int dump_entry ( char *inputfilename, int lineno, IceAuthFileEntry *auth, char *data );
+static int dump_entry ( const char *inputfilename, int lineno, IceAuthFileEntry *auth, char *data );
-static int extract_entry ( char *inputfilename, int lineno, IceAuthFileEntry *auth, char *data );
+static int extract_entry ( const char *inputfilename, int lineno, IceAuthFileEntry *auth, char *data );
 static int match_auth ( IceAuthFileEntry *a, IceAuthFileEntry *b, int *authDataSame );
 static int merge_entries ( AuthList **firstp, AuthList *second, int *nnewp, int *nreplp, int *ndupp );
-static int search_and_do ( char *inputfilename, int lineno, int start, int argc, char *argv[], DoFunc do_func, char *data );
+static int search_and_do ( const char *inputfilename, int lineno, int start, int argc, char *argv[], DoFunc do_func, char *data );
-static int remove_entry ( char *inputfilename, int lineno, IceAuthFileEntry *auth, char *data );
+static int remove_entry ( const char *inputfilename, int lineno, IceAuthFileEntry *auth, char *data );
-static int do_help ( char *inputfilename, int lineno, int argc, char **argv );
+static int do_help ( const char *inputfilename, int lineno, int argc, char **argv );
-static int do_questionmark ( char *inputfilename, int lineno, int argc, char **argv );
+static int do_questionmark ( const char *inputfilename, int lineno, int argc, char **argv );
-static int do_list ( char *inputfilename, int lineno, int argc, char **argv );
+static int do_list ( const char *inputfilename, int lineno, int argc, char **argv );
-static int do_merge ( char *inputfilename, int lineno, int argc, char **argv );
+static int do_merge ( const char *inputfilename, int lineno, int argc, char **argv );
-static int do_extract ( char *inputfilename, int lineno, int argc, char **argv );
+static int do_extract ( const char *inputfilename, int lineno, int argc, char **argv );
-static int do_add ( char *inputfilename, int lineno, int argc, char **argv );
+static int do_add ( const char *inputfilename, int lineno, int argc, char **argv );
-static int do_remove ( char *inputfilename, int lineno, int argc, char **argv );
+static int do_remove ( const char *inputfilename, int lineno, int argc, char **argv );
-static int do_info ( char *inputfilename, int lineno, int argc, char **argv );
+static int do_info ( const char *inputfilename, int lineno, int argc, char **argv );
-static int do_exit ( char *inputfilename, int lineno, int argc, char **argv );
+static int do_exit ( const char *inputfilename, int lineno, int argc, char **argv );
-static int do_quit ( char *inputfilename, int lineno, int argc, char **argv );
+static int do_quit ( const char *inputfilename, int lineno, int argc, char **argv );
-static int do_source ( char *inputfilename, int lineno, int argc, char **argv );
+static int do_source ( const char *inputfilename, int lineno, int argc, char **argv );
-static CommandTable command_table[] = {	/* table of known commands */
+static const CommandTable command_table[] = {	/* table of known commands */
 { "add", 2, 3, do_add,
 "\
 add       add an entry\n\
@ -186,7 +185,7 @@ source    read commands from file\n\
 static Bool okay_to_use_stdin = True;	/* set to false after using */
-static char *hex_table[] = {		/* for printing hex digits */
+static const char * const hex_table[] = {	/* for printing hex digits */
    "00", "01", "02", "03", "04", "05", "06", "07", 
    "08", "09", "0a", "0b", "0c", "0d", "0e", "0f", 
    "10", "11", "12", "13", "14", "15", "16", "17", 
@ -223,31 +222,20 @@ static char *hex_table[] = {		/* for printing hex digits */
 static unsigned int hexvalues[256];	/* for parsing hex input */
-static int original_umask = 0;		/* for restoring */
+static mode_t original_umask = 0;	/* for restoring */
 /*
 * private utility procedures
 */
-static char *copystring (src)
+#define copystring(s)	( s != NULL ? strdup(s) : NULL )
    char *src;
 {
    int len = strlen (src);
    char *cp;
    if (!src) return NULL;
    cp = malloc (len + 1);
    if (cp)
 	strcpy (cp, src);
    return cp;
 }
 static int
-binaryEqual (a, b, len)
+binaryEqual (
-
+    register const char	*a,
-register char		*a, *b;
+    register const char	*b,
-register unsigned	len;
+    register unsigned	len)
 {
    while (len--)
@ -256,21 +244,17 @@ register unsigned	len;
    return 1;
 }
-static void prefix (fn, n)
+static void prefix (const char *fn, int n)
    char *fn;
    int n;
 {
    fprintf (stderr, "%s: %s:%d:  ", ProgramName, fn, n);
 }
-static void badcommandline (cmd)
+static void badcommandline (const char *cmd)
    char *cmd;
 {
    fprintf (stderr, "bad \"%s\" command line\n", cmd);
 }
-static char *skip_space (s)
+static char *skip_space (register char *s)
    register char *s;
 {
    if (!s) return NULL;
@ -280,8 +264,7 @@ static char *skip_space (s)
 }
-static char *skip_nonspace (s)
+static char *skip_nonspace (register char *s)
    register char *s;
 {
    if (!s) return NULL;
@ -291,9 +274,9 @@ static char *skip_nonspace (s)
    return s;
 }
-static char **split_into_words (src, argcp)  /* argvify string */
+static char **split_into_words (  /* argvify string */
-    char *src;
+    char *src,
-    int *argcp;
+    int *argcp)
 {
    char *jword;
    char savec;
@ -333,13 +316,13 @@ static char **split_into_words (src, argcp)  /* argvify string */
 }
-static FILE *open_file (filenamep, mode, usedstdp, srcfn, srcln, cmd)
+static FILE *open_file (
-    char **filenamep;
+    char **filenamep,
-    char *mode;
+    const char *mode,
-    Bool *usedstdp;
+    Bool *usedstdp,
-    char *srcfn;
+    const char *srcfn,
-    int srcln;
+    int srcln,
-    char *cmd;
+    const char *cmd)
 {
    FILE *fp;
@ -371,9 +354,7 @@ static FILE *open_file (filenamep, mode, usedstdp, srcfn, srcln, cmd)
 }
-static int read_auth_entries (fp, headp, tailp)
+static int read_auth_entries (FILE *fp, AuthList **headp, AuthList **tailp)
    FILE *fp;
    AuthList **headp, **tailp;
 {
    IceAuthFileEntry *auth;
    AuthList *head, *tail;
@ -405,9 +386,9 @@ static int read_auth_entries (fp, headp, tailp)
 }
-static int cvthexkey (hexstr, ptrp)	/* turn hex key string into octets */
+static int cvthexkey (	/* turn hex key string into octets */
-    char *hexstr;
+    char *hexstr,
-    char **ptrp;
+    char **ptrp)
 {
    int i;
    int len = 0;
@ -457,15 +438,15 @@ static int cvthexkey (hexstr, ptrp)	/* turn hex key string into octets */
    return len;
 }
-static int dispatch_command (inputfilename, lineno, argc, argv, tab, statusp)
+static int dispatch_command (
-    char *inputfilename;
+    const char *inputfilename,
-    int lineno;
+    int lineno,
-    int argc;
+    int argc,
-    char **argv;
+    char **argv,
-    CommandTable *tab;
+    const CommandTable *tab,
-    int *statusp;
+    int *statusp)
 {
-    CommandTable *ct;
+    const CommandTable *ct;
    char *cmd;
    int n;
 					/* scan table for command */
@ -506,8 +487,7 @@ static volatile Bool dieing = False;
 #define WRITES(fd, S) (void)write((fd), (S), strlen((S)))
 /* ARGSUSED */
-static _signal_t die (sig)
+static _signal_t die (int sig)
    int sig;
 {
    dieing = True;
    _exit (auth_finalize ());
@ -517,8 +497,7 @@ static _signal_t die (sig)
 #endif
 }
-static _signal_t catchsig (sig)
+static _signal_t catchsig (int sig)
    int sig;
 {
 #ifdef SYSV
    if (sig > 0) signal (sig, die);	/* re-establish signal handler */
@ -539,7 +518,7 @@ static _signal_t catchsig (sig)
 #endif
 }
-static void register_signals ()
+static void register_signals (void)
 {
    signal (SIGINT, catchsig);
    signal (SIGTERM, catchsig);
@ -554,8 +533,7 @@ static void register_signals ()
 * public procedures for parsing lines of input
 */
-int auth_initialize (authfilename)
+int auth_initialize ( char *authfilename )
    char *authfilename;
 {
    int n;
    AuthList *head, *tail;
@ -587,6 +565,8 @@ int auth_initialize (authfilename)
 		authfilename);
    }
    iceauth_filename = strdup(authfilename);
    if (ignore_locks) {
 	if (break_locks) IceUnlockAuthFile (authfilename);
    } else {
@ -645,9 +625,6 @@ int auth_initialize (authfilename)
 	iceauth_head = head;
    }
    n = strlen (authfilename);
    iceauth_filename = malloc (n + 1);
    if (iceauth_filename) strcpy (iceauth_filename, authfilename);
    iceauth_modified = False;
    if (verbose) {
@ -657,12 +634,17 @@ int auth_initialize (authfilename)
    return 0;
 }
-static int write_auth_file (tmp_nam)
+static int write_auth_file (char *tmp_nam, size_t tmp_nam_len)
    char *tmp_nam;
 {
    FILE *fp;
    AuthList *list;
    if ((strlen(iceauth_filename) + 3) > tmp_nam_len) {
 	strncpy(tmp_nam, "filename too long", tmp_nam_len);
 	tmp_nam[tmp_nam_len - 1] = '\0';
 	return -1;
    }
    strcpy (tmp_nam, iceauth_filename);
    strcat (tmp_nam, "-n");		/* for new */
    (void) unlink (tmp_nam);
@ -680,7 +662,7 @@ static int write_auth_file (tmp_nam)
    return 0;
 }
-int auth_finalize ()
+int auth_finalize (void)
 {
    char temp_name[1024];			/* large filename size */
@ -713,7 +695,7 @@ int auth_finalize ()
 			"Writing", iceauth_filename);
 	    }
 	    temp_name[0] = '\0';
-	    if (write_auth_file (temp_name) == -1) {
+	    if (write_auth_file (temp_name, sizeof(temp_name)) == -1) {
 		fprintf (stderr,
 			 "%s:  unable to write authority file %s\n",
 			 ProgramName, temp_name);
@ -735,18 +717,18 @@ int auth_finalize ()
 	}
    }
-    if (!ignore_locks) {
+    if (!ignore_locks && (iceauth_filename != NULL)) {
 	IceUnlockAuthFile (iceauth_filename);
    }
    (void) umask (original_umask);
    return 0;
 }
-int process_command (inputfilename, lineno, argc, argv)
+int process_command (
-    char *inputfilename;
+    const char *inputfilename,
-    int lineno;
+    int lineno,
-    int argc;
+    int argc,
-    char **argv;
+    char **argv)
 {
    int status;
@ -766,15 +748,15 @@ int process_command (inputfilename, lineno, argc, argv)
 * utility routines
 */
-static void fprintfhex (fp, len, cp)
+static void fprintfhex (
-    register FILE *fp;
+    register FILE *fp,
-    unsigned int len;
+    unsigned int len,
-    char *cp;
+    const char *cp)
 {
-    unsigned char *ucp = (unsigned char *) cp;
+    const unsigned char *ucp = (const unsigned char *) cp;
    for (; len > 0; len--, ucp++) {
-	register char *s = hex_table[*ucp];
+	register const char *s = hex_table[*ucp];
 	putc (s[0], fp);
 	putc (s[1], fp);
    }
@ -782,11 +764,11 @@ static void fprintfhex (fp, len, cp)
 }
 /* ARGSUSED */
-static int dump_entry (inputfilename, lineno, auth, data)
+static int dump_entry (
-    char *inputfilename;
+    const char *inputfilename,
-    int lineno;
+    int lineno,
-    IceAuthFileEntry *auth;
+    IceAuthFileEntry *auth,
-    char *data;
+    char *data)
 {
    struct _list_data *ld = (struct _list_data *) data;
    FILE *fp = ld->fp;
@ -815,11 +797,11 @@ static int dump_entry (inputfilename, lineno, auth, data)
    return 0;
 }
-static int extract_entry (inputfilename, lineno, auth, data)
+static int extract_entry (
-    char *inputfilename;
+    const char *inputfilename,
-    int lineno;
+    int lineno,
-    IceAuthFileEntry *auth;
+    IceAuthFileEntry *auth,
-    char *data;
+    char *data)
 {
    struct _extract_data *ed = (struct _extract_data *) data;
@ -842,9 +824,10 @@ static int extract_entry (inputfilename, lineno, auth, data)
 }
-static int match_auth (a, b, authDataSame)
+static int match_auth (
-    register IceAuthFileEntry *a, *b;
+    register IceAuthFileEntry *a,
-    int *authDataSame;
+    register IceAuthFileEntry *b,
    int *authDataSame)
 {
    int match = strcmp (a->protocol_name, b->protocol_name) == 0 &&
 	    strcmp (a->network_id, b->network_id) == 0 &&
@ -862,9 +845,9 @@ static int match_auth (a, b, authDataSame)
 }
-static int merge_entries (firstp, second, nnewp, nreplp, ndupp)
+static int merge_entries (
-    AuthList **firstp, *second;
+    AuthList **firstp, AuthList *second,
-    int *nnewp, *nreplp, *ndupp;
+    int *nnewp, int *nreplp, int *ndupp)
 {
    AuthList *a, *b, *first, *tail;
    int n = 0, nnew = 0, nrepl = 0, ndup = 0;
@ -950,15 +933,14 @@ static int merge_entries (firstp, second, nnewp, nreplp, ndupp)
 }
-static int search_and_do (inputfilename, lineno, start,
+static int search_and_do (
-		    argc, argv, do_func, data)
+    const char *inputfilename,
-    char *inputfilename;
+    int lineno,
-    int lineno;
+    int start,
-    int start;
+    int argc,
-    int argc;
+    char *argv[],
-    char *argv[];
+    DoFunc do_func,
-    DoFunc do_func;
+    char *data)
    char *data;
 {
    int i;
    int status = 0;
@ -1016,11 +998,11 @@ static int search_and_do (inputfilename, lineno, start,
 /* ARGSUSED */
-static int remove_entry (inputfilename, lineno, auth, data)
+static int remove_entry (
-    char *inputfilename;
+    const char *inputfilename,
-    int lineno;
+    int lineno,
-    IceAuthFileEntry *auth;
+    IceAuthFileEntry *auth,
-    char *data;
+    char *data)
 {
    int *nremovedp = (int *) data;
    AuthList **listp = &iceauth_head;
@ -1046,11 +1028,11 @@ static int remove_entry (inputfilename, lineno, auth, data)
 /*
 * help
 */
-int print_help (fp, cmd)
+int print_help (
-    FILE *fp;
+    FILE *fp,
-    char *cmd;
+    const char *cmd)
 {
-    CommandTable *ct;
+    const CommandTable *ct;
    int n = 0;
    fprintf (fp, "\n");
@ -1072,11 +1054,11 @@ int print_help (fp, cmd)
    return n;
 }
-static int do_help (inputfilename, lineno, argc, argv)
+static int do_help (
-    char *inputfilename;
+    const char *inputfilename,
-    int lineno;
+    int lineno,
-    int argc;
+    int argc,
-    char **argv;
+    char **argv)
 {
    char *cmd = (argc > 1 ? argv[1] : NULL);
    int n;
@ -1106,13 +1088,13 @@ static int do_help (inputfilename, lineno, argc, argv)
 * questionmark
 */
 /* ARGSUSED */
-static int do_questionmark (inputfilename, lineno, argc, argv)
+static int do_questionmark (
-    char *inputfilename;
+    const char *inputfilename,
-    int lineno;
+    int lineno,
-    int argc;
+    int argc,
-    char **argv;
+    char **argv)
 {
-    CommandTable *ct;
+    const CommandTable *ct;
    int i;
 #define WIDEST_COLUMN 72
    int col = WIDEST_COLUMN;
@ -1144,11 +1126,11 @@ static int do_questionmark (inputfilename, lineno, argc, argv)
 /*
 * list [displayname ...]
 */
-static int do_list (inputfilename, lineno, argc, argv)
+static int do_list (
-    char *inputfilename;
+    const char *inputfilename,
-    int lineno;
+    int lineno,
-    int argc;
+    int argc,
-    char **argv;
+    char **argv)
 {
    struct _list_data ld;
@ -1174,11 +1156,11 @@ static int do_list (inputfilename, lineno, argc, argv)
 /*
 * merge filename [filename ...]
 */
-static int do_merge (inputfilename, lineno, argc, argv)
+static int do_merge (
-    char *inputfilename;
+    const char *inputfilename,
-    int lineno;
+    int lineno,
-    int argc;
+    int argc,
-    char **argv;
+    char **argv)
 {
    int i;
    int errors = 0;
@ -1238,11 +1220,11 @@ static int do_merge (inputfilename, lineno, argc, argv)
 /*
 * extract filename displayname [displayname ...]
 */
-static int do_extract (inputfilename, lineno, argc, argv)
+static int do_extract (
-    char *inputfilename;
+    const char *inputfilename,
-    int lineno;
+    int lineno,
-    int argc;
+    int argc,
-    char **argv;
+    char **argv)
 {
    int errors;
    struct _extract_data ed;
@ -1282,11 +1264,11 @@ static int do_extract (inputfilename, lineno, argc, argv)
 /*
 * add protoname protodata netid authname authdata
 */
-static int do_add (inputfilename, lineno, argc, argv)
+static int do_add (
-    char *inputfilename;
+    const char *inputfilename,
-    int lineno;
+    int lineno,
-    int argc;
+    int argc,
-    char **argv;
+    char **argv)
 { 
    int n, nnew, nrepl, ndup;
    char *protoname;
@ -1295,7 +1277,7 @@ static int do_add (inputfilename, lineno, argc, argv)
    char *netid;
    char *authname;
    char *authdata_hex;
-    char *authdata;
+    char *authdata = NULL;
    int protodata_len, authdata_len;
    IceAuthFileEntry *auth = NULL;
    AuthList *list;
@ -1447,14 +1429,14 @@ cant_add:
    {
 	if (auth->protocol_name)
 	    free (auth->protocol_name);
-	if (auth->protocol_data)
+	/* auth->protocol_data already freed,
-	    free (auth->protocol_data);
+	   since it's the same as protodata */
 	if (auth->network_id)
 	    free (auth->network_id);
 	if (auth->auth_name)
 	    free (auth->auth_name);
-	if (auth->auth_data)
+	/* auth->auth_data already freed,
-	    free (auth->auth_data);
+	   since it's the same as authdata */
 	free ((char *) auth);
    }
@ -1464,11 +1446,11 @@ cant_add:
 /*
 * remove displayname
 */
-static int do_remove (inputfilename, lineno, argc, argv)
+static int do_remove (
-    char *inputfilename;
+    const char *inputfilename,
-    int lineno;
+    int lineno,
-    int argc;
+    int argc,
-    char **argv;
+    char **argv)
 {
    int nremoved = 0;
    int errors;
@ -1488,11 +1470,11 @@ static int do_remove (inputfilename, lineno, argc, argv)
 /*
 * info
 */
-static int do_info (inputfilename, lineno, argc, argv)
+static int do_info (
-    char *inputfilename;
+    const char *inputfilename,
-    int lineno;
+    int lineno,
-    int argc;
+    int argc,
-    char **argv;
+    char **argv)
 {
    int n;
    AuthList *l;
@ -1523,11 +1505,11 @@ static int do_info (inputfilename, lineno, argc, argv)
 static Bool alldone = False;
 /* ARGSUSED */
-static int do_exit (inputfilename, lineno, argc, argv)
+static int do_exit (
-    char *inputfilename;
+    const char *inputfilename,
-    int lineno;
+    int lineno,
-    int argc;
+    int argc,
-    char **argv;
+    char **argv)
 {
    /* allow bogus stuff */
    alldone = True;
@ -1538,11 +1520,11 @@ static int do_exit (inputfilename, lineno, argc, argv)
 * quit
 */
 /* ARGSUSED */
-static int do_quit (inputfilename, lineno, argc, argv)
+static int do_quit (
-    char *inputfilename;
+    const char *inputfilename,
-    int lineno;
+    int lineno,
-    int argc;
+    int argc,
-    char **argv;
+    char **argv)
 {
    /* allow bogus stuff */
    die (0);
@ -1554,11 +1536,11 @@ static int do_quit (inputfilename, lineno, argc, argv)
 /*
 * source filename
 */
-static int do_source (inputfilename, lineno, argc, argv)
+static int do_source (
-    char *inputfilename;
+    const char *inputfilename,
-    int lineno;
+    int lineno,
-    int argc;
+    int argc,
-    char **argv;
+    char **argv)
 {
    char *script;
    char buf[BUFSIZ];