Update to xsm 1.0.2

author: Matthieu Herrb <matthieu@cvs.openbsd.org> 2010-10-31 20:17:59 +0000
committer: Matthieu Herrb <matthieu@cvs.openbsd.org> 2010-10-31 20:17:59 +0000
commit: 1eaf7ae9d7ff2adf3249176c155ae66dea08ecc3 (patch)
tree: d020778c6956a535dd35a4626b7857b36b775c20 /app/xsm
parent: 0aea447cde00cd16718571f752213425ba2b2d23 (diff)
33 files changed, 2701 insertions, 1804 deletions
diff --git a/app/xsm/ChangeLog b/app/xsm/ChangeLog
index 71bfbe600..a136b2035 100644
--- a/app/xsm/ChangeLog
+++ b/app/xsm/ChangeLog
@@ -1,36 +1,450 @@
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit cf08b277a983a97a3db1ee39eeeb6bf953d084db
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Sep 26 17:00:05 2010 -0700
 
-	* configure.ac:
-	Update package version for X11R7 release.
+    xsm 1.0.2
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 88ae324056c2a6be1efd5aa96c4bbd3e0ad4274b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Sep 26 16:54:04 2010 -0700
 
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    config: Remove unnecessary calls from configure.ac
+    
+    AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now
+    PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 
-2005-12-07  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 7089b5ad09474f51bbb04db0f12667605f16b8ed
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Sep 26 16:51:35 2010 -0700
 
-	* Makefile.am:
-	* configure.ac:
-	Change to use the app-defaults default dir configured in libXt.
+    config: upgrade to util-macros 1.8 for additional man page support
+    
+    Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+    The value of MAN_SUBST is the same for all X.Org packages.
+    
+    Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+    The existing statement can now be removed from the configuration file.
+    
+    Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
+    Enables silent rule and use platform appropriate version of sed.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 
-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 8a89975a139dd6b5ecd5f82f2c3a872dc64cf4df
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Tue Jul 20 18:45:18 2010 -0400
 
-	* Makefile.am:
-	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+    config: update AC_PREREQ statement to 2.60
+    
+    Unrelated to the previous patches, the new value simply reflects
+    the reality that the minimum level for autoconf to configure
+    all x.org modules is 2.60 dated June 2006.
+    
+    ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
 
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 4f56a25154eb876f33a46d29eed4be46bba814f2
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Feb 11 10:08:07 2010 -0500
 
-	* configure.ac:
-	Update package version number for X11R7 RC3 release.
+    config: move CWARNFLAGS from configure.ac to Makefile.am
+    
+    Compiler warning flags should be explicitly set in the makefile
+    rather than being merged with other packages compiler flags.
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
 
-2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 547b489f70df72524f210cca990d1373cf80eb34
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sat Dec 19 20:48:48 2009 -0500
 
-	* configure.ac:
-	Update package version number for X11R7 RC2 release.
+    configure.ac: use backticks rather than $() for cmd subs
+    
+    Use "$PKG_CONFIG" rather than hard coded "pkg-config"
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
 
-2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 47a6e14ea0f65a1fceedb3f8611e05255f7333d3
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Nov 26 09:19:55 2009 -0500
 
-	* configure.ac:
-	Update package version number for RC1 release.
+    Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+    
+    Now that the INSTALL file is generated.
+    Allows running make maintainer-clean.
 
+commit 5b1760932cfba4d1e921b4e9e0adfb584e1e365c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Wed Oct 28 14:09:09 2009 -0400
+
+    INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+    
+    Add missing INSTALL file. Use standard GNU file on building tarball
+    README may have been updated
+    Remove AUTHORS file as it is empty and no content available yet.
+    Remove NEWS file as it is empty and no content available yet.
+
+commit feda4dcbfcf7102297109101ba310a5c50ed6483
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Tue Oct 27 15:07:25 2009 -0400
+
+    Deploy the new XORG_DEFAULT_OPTIONS #24242
+    
+    This macro aggregate a number of existing macros that sets commmon
+    X.Org components configuration options. It shields the configuration file from
+    future changes.
+
+commit 24dd7a8ef6d9edc1145855eba880b7c3b5bb2284
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Mon Oct 26 22:08:39 2009 -0400
+
+    Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+    
+    ChangeLog filename is known to Automake and requires no further
+    coding in the makefile.
+
+commit 12b82f86995178b572a91c377938311acb1e03df
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Thu Oct 22 12:34:16 2009 -0400
+
+    .gitignore: use common defaults with custom section # 24239
+    
+    Using common defaults will reduce errors and maintenance.
+    Only the very small or inexistent custom section need periodic maintenance
+    when the structure of the component changes. Do not edit defaults.
+
+commit 396f6dbb94447d2314a064f3384bae4c9f3dca01
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Mon Jan 26 19:12:30 2009 -0200
+
+    Correct make distcheck and gcc/sparse warnings.
+
+commit e06eddafd5f72f6f0782e37e9617c2e874021038
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Sun Mar 16 16:25:42 2008 -0300
+
+    Compile warning fixes.
+    
+      Include header with prototypes for signals.c, and change prototypes and
+    definitions to match. This should not have any side effects as function
+    arguments are ignored.
+      Ansify some functions with K&R definitions.
+      printhex.c:fprintfhex() could be changed to a "sane" implementation, but
+    only change was "ansification".
+
+commit f1a527497c9621428cdb78dd9d37cb846ec10544
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Fri Nov 28 03:38:37 2008 -0200
+
+    enable VPATH build, reorganize app default files
+    
+    Minor changes to http://bugs.freedesktop.org/attachment.cgi?id=20212.
+
+commit 463bc71d330d357babb4981c933e6b615621c262
+Author: Matthieu Herrb <matthieu@deville.herrb.net>
+Date:   Sat Nov 22 15:11:29 2008 +0100
+
+    Fix build in separate directory.
+
+commit 9959f4e34227dc40f43326ed1a2240d4932f99d9
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Sun Nov 16 21:53:59 2008 +0100
+
+    Don't override the RSH variable before checking if it's set
+    
+    This allows setting RSH on the configure command line or environment,
+    and lifts the build dependency on an rsh client.
+
+commit 7dee380747bbd0a07c64d8cdb2a229485403847a
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Oct 22 09:28:56 2008 -0700
+
+    Use realloc to resize buffer, not malloc+strcpy+free
+
+commit 01ac0b14bea486a626d8565dec8c8e546bb3d82f
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Oct 22 08:37:59 2008 -0700
+
+    Constify lock.c
+
+commit 6f1ebee7cba16f31c6201d6654d0c4ff9502ec12
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Wed Aug 20 10:32:53 2008 -0400
+
+    xaw8 is gone, use xaw7
+
+commit 814b1bd0952299d1864c586f005904101206219b
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Mar 27 20:07:55 2008 -0700
+
+    Build fix for file systems that are not case sensitive
+
+commit cfb89d84fa8ea3f42b130d676125a530bd0e1e94
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Feb 21 08:51:42 2008 -0800
+
+    Add PKG_CHECK_MODULES entries for the libraries xsm calls directly
+
+commit 281158a840b5669dcea426fee4bdf4439f4e41c5
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Feb 21 08:38:17 2008 -0800
+
+    Change xsm_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+    
+    Makefile.am:32: compiling `auth.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
+
+commit 1dee63fcbe0e3915a4b74578d71dab673c6e313d
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Dec 6 16:37:30 2007 -0500
+
+    Replace static ChangeLog with dist-hook to generate from git log
+
+commit adf6777c5c34ca156d77f31af3ab3dec744c109f
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Nov 26 13:48:44 2007 -0800
+
+    Remove instructions on monolithic build system from README
+
+commit 6f4560e2ad81736127d2d3544415a05d41e8a2a7
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Nov 26 13:21:18 2007 -0800
+
+    Use snprintf, strdup & remove instead of sprintf, malloc/strcpy & unlink
+
+commit fab9dcb15024996ac3a4f94d65ba73f484820534
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Sep 3 05:51:49 2007 -0400
+
+    Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 43612da3a7dfc4cf301c414e5c4c4a2c526eff0c
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Aug 23 19:25:13 2007 -0400
+
+    Rename .cvsignore to .gitignore
+
+commit 6d14861388ba520387e9f3690985c8c15823e60c
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Dec 21 02:29:54 2005 +0000
+
+    Update package version for X11R7 release.
+
+commit 37399858c165d769777b5ad912cca6a28c1e9174
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Dec 19 16:22:47 2005 +0000
+
+    Stub COPYING files
+
+commit 8af442aee53b6519402edc31f7aaec9cff15d24a
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:11 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit 436bf72ac6491cd999eef34686a105cc3009aa03
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Dec 7 16:18:01 2005 +0000
+
+    Change to use the app-defaults default dir configured in libXt.
+
+commit 5c26c0c24b419e91e2d0ee33659f24bcde8f5fe0
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Dec 6 22:48:26 2005 +0000
+
+    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit b1d7496da8b7ece105553626f2041eb37a4545de
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 05:49:28 2005 +0000
+
+    Update package version number for X11R7 RC3 release.
+
+commit 01337278c805f4dcb5472cea320271ff98043e00
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Nov 28 22:01:47 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 6761550f844f7dcc9120aeb47f1e6200541132f4
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Mon Nov 21 10:35:08 2005 +0000
+
+    Another pass at .cvsignores for apps.
+
+commit 6eae89f042d8d6a9481f2cb04c5d0be0a8a86ea2
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Sun Nov 20 22:08:56 2005 +0000
+
+    Add/improve .cvsignore files for apps.
+
+commit bf766423665374deae5ba0ec1691c22d2edc6474
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Nov 9 21:09:22 2005 +0000
+
+    Update package version number for X11R7 RC2 release.
+
+commit ea22303c5ede79f9b0f70f6e9119a45b0f08ed92
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Sun Oct 23 16:58:38 2005 +0000
+
+    Fix typo. (Tobias Stoeckmann)
+
+commit 032612fecc97aebc57db04f76f7ea4ce69fe3c4c
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:47:58 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit b64cb46692739f59bb648753a6c16d80c032b46b
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Tue Oct 18 00:32:54 2005 +0000
+
+    Change default install dir for app-default files from
+        $(sysconfdir)/X11/app-defaults to $(libdir)/X11/app-defaults to match
+        the monolith & allow localization
+
+commit c7d2af3102968f14f5d4a5db2c968beca4c701c9
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Oct 17 23:56:25 2005 +0000
+
+    Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+        work better with BSD make
+
+commit 98e21bcf2e08115841d53c67a3c1fe66eac04105
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Fri Oct 14 00:25:48 2005 +0000
+
+    Use sed to fill in variables in man page
+
+commit 0e8270f8cb2ff73eda71589a1e23ce434f03bcf3
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Aug 1 20:25:32 2005 +0000
+
+    Install man pages to section 1 instead of section m (Patch from Donnie
+        Berkholz)
+
+commit 71fc4c55831ec988b0a902eaa4408d66c7fd1ea0
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Sat Jul 30 21:07:26 2005 +0000
+
+    Add prototypes of Xalloc/free functions.
+    Export ImUtil.h to match modular tree install.
+    Define SVR4 to 1 to avoid warning about redefining to different values.
+    Include missing headers to clear more compiler warnings.
+
+commit a0d7e5f72a1a6b4222ec05b368935d2d84c76e2c
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Sat Jul 30 20:33:15 2005 +0000
+
+    Add check for putenv() for xsm's misc.c
+
+commit 660867c1e6639382a389db391db468e214fce235
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:38 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 d52d32f6fb738c87759e84ed65095675a4445270
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Tue Jul 26 15:44:03 2005 +0000
+
+    Replace more GNU make-ism's with more portable macros
+
+commit ae806b5d11971407cc06f22ff1ce81c86fbae672
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Wed Jul 20 19:32:04 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 2357729733356dde5bf4fad434cfc6a3c9bd7f44
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Sat Jul 16 22:07:13 2005 +0000
+
+    Add #ifdef HAVE_CONFIG_H/#include "config.h" to files that need it to get
+        HAS_MKSTEMP defined in modular builds.
+
+commit 6fc73059455d756c2bc5c2780b0fc8a444dd9039
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Sat Jul 16 22:00:11 2005 +0000
+
+    Convert more app-defaults rules to work with non-GNU make
+
+commit e2191eda39bb8021d36d86750b9eb6b33702fa95
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Sat Jul 16 21:59:14 2005 +0000
+
+    Define HAS_MKSTEMP if mkstemp() is present (needed for improved protection
+        against tempfile race conditions in many places)
+
+commit 2f07c342e877fde5d3f64041ca6ff365a643ddc8
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Fri Jul 1 20:09:07 2005 +0000
+
+    xtrap.pc.in: s/Xfixes/XTrap/ xi.pc.in: s/Xt/Xi/ Xv/src/Makefile.am: remove
+        whitespace after backslash modularizeapp.sh: s/destkop/desktop/
+        modular/symlink.sh: Add bitmaps for xeyes, system.xsm for xsm, and
+        Xvidtune.cpp for xvidtune. Also comment out non-existing mga_bios.h
+    Check in buildsystems for xsetroot, xsm, xstdcmap, xtrap, and xvinfo
+
+commit b2fec4bfd950c450c774543b3336e1beb0bd9aa1
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 19:55:06 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit 1233b543cac3b9c1a6155042c4ff73a4b0b73293
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:35:46 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit ba8059df1be266090f17a4877a2fe28818ee511a
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed Mar 3 12:13:18 2004 +0000
+
+    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 034f5e9e912b8315e2cdb5ca8c3dfed078733a03
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:36:27 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit b24c3eb3e0f657d599c8a4edbd2abdfc8c4130ec
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:24:17 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit d0721af92ab08fc526c7c432ecc6273717cecae0
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Tue Nov 25 19:29:18 2003 +0000
+
+    XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit ac8c3cf394fb9d0eb57332ea7b2d12fb3c4a396d
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:49:23 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit c8ddd5d82a72167de6e0a544b55f9b03ab93053e
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 15:54:55 2003 +0000
+
+    R6.6 is the Xorg base-line
diff --git a/app/xsm/INSTALL b/app/xsm/INSTALL
index 23e5f25d0..c9711092e 100644
--- a/app/xsm/INSTALL
+++ b/app/xsm/INSTALL
@@ -1,6 +1,297 @@
 Installation Instructions
 *************************
 
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+   This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+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 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.
+
+     Running `configure' might take a while.  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.
+
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
+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=c99 CFLAGS=-g 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 can use 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 `..'.
+
+   With a non-GNU `make', it is safer 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.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+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.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+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).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
+
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--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.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *Note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
+Installation Instructions
+*************************
+
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
 Software Foundation, Inc.
 
diff --git a/app/xsm/Makefile.am b/app/xsm/Makefile.am
index 027230a3a..333398011 100644
--- a/app/xsm/Makefile.am
+++ b/app/xsm/Makefile.am
@@ -24,7 +24,7 @@ bin_PROGRAMS = xsm
 SYSTEM_INIT_DIR = $(datadir)/X11/xsm
 
 
-xsm_CFLAGS = $(XSM_CFLAGS) -DRSHCMD=\"@RSH@\" \
+AM_CFLAGS = $(XSM_CFLAGS) $(CWARNFLAGS) -DRSHCMD=\"@RSH@\" \
 	-DSYSTEM_INIT_FILE=\"$(SYSTEM_INIT_DIR)/system.xsm\"
 
 xsm_LDADD = $(XSM_LIBS)
@@ -66,20 +66,13 @@ xsm_SOURCES =	\
 appman_PRE = \
         xsm.man
 
-# App default files  (*.ad)
+# App default files
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
 
 appdefaultdir = @appdefaultdir@
 
-
-APPDEFAULTFILES = \
-        XSm
-
-SUFFIXES = .ad
-
-.ad:
-	cp $< $@
-
-appdefault_DATA = $(APPDEFAULTFILES)
+dist_appdefault_DATA = \
+        app-defaults/XSm
 
 # system init file
 
@@ -89,9 +82,7 @@ systeminit_DATA = system.xsm
 
 #
 
-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) globals.c system.xsm
-
-CLEANFILES = $(APPDEFAULTFILES)
+EXTRA_DIST = system.xsm
 
 
 appmandir = $(APP_MAN_DIR)
@@ -99,28 +90,22 @@ appmandir = $(APP_MAN_DIR)
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
 
 EXTRA_DIST += $(appman_PRE)
-CLEANFILES += $(appman_DATA)
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+CLEANFILES = $(appman_DATA)
 
-SED = sed
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
 
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+.man.$(APP_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
 
-MAN_SUBSTS = \
-	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__xservername__|Xorg|g' \
-	-e 's|__xconfigfile__|xorg.conf|g' \
-	-e 's|__projectroot__|$(prefix)|g' \
-	-e 's|__apploaddir__|$(appdefaultdir)|' \
-	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-	-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
-	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
 
-SUFFIXES += .$(APP_MAN_SUFFIX) .man
+.PHONY: ChangeLog INSTALL
 
-.man.$(APP_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+INSTALL:
+	$(INSTALL_CMD)
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
diff --git a/app/xsm/Makefile.in b/app/xsm/Makefile.in
index a2422c93c..ede3025cc 100644
--- a/app/xsm/Makefile.in
+++ b/app/xsm/Makefile.in
@@ -59,11 +59,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = xsm$(EXEEXT)
-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 \
-	mkinstalldirs
+DIST_COMMON = README $(am__configure_deps) $(dist_appdefault_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
+	ChangeLog INSTALL NEWS config.guess config.sub depcomp \
+	install-sh missing
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -71,20 +71,19 @@ 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
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(SHELL) $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)" \
-	"$(DESTDIR)$(appmandir)" "$(DESTDIR)$(systeminitdir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" \
+	"$(DESTDIR)$(appdefaultdir)" "$(DESTDIR)$(systeminitdir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am_xsm_OBJECTS = xsm-auth.$(OBJEXT) xsm-choose.$(OBJEXT) \
-	xsm-info.$(OBJEXT) xsm-list.$(OBJEXT) xsm-lock.$(OBJEXT) \
-	xsm-log.$(OBJEXT) xsm-mainwin.$(OBJEXT) xsm-misc.$(OBJEXT) \
-	xsm-popup.$(OBJEXT) xsm-printhex.$(OBJEXT) xsm-prop.$(OBJEXT) \
-	xsm-remote.$(OBJEXT) xsm-restart.$(OBJEXT) xsm-save.$(OBJEXT) \
-	xsm-saveutil.$(OBJEXT) xsm-signals.$(OBJEXT) xsm-xsm.$(OBJEXT) \
-	xsm-xtwatch.$(OBJEXT)
+am_xsm_OBJECTS = auth.$(OBJEXT) choose.$(OBJEXT) info.$(OBJEXT) \
+	list.$(OBJEXT) lock.$(OBJEXT) log.$(OBJEXT) mainwin.$(OBJEXT) \
+	misc.$(OBJEXT) popup.$(OBJEXT) printhex.$(OBJEXT) \
+	prop.$(OBJEXT) remote.$(OBJEXT) restart.$(OBJEXT) \
+	save.$(OBJEXT) saveutil.$(OBJEXT) signals.$(OBJEXT) \
+	xsm.$(OBJEXT) xtwatch.$(OBJEXT)
 xsm_OBJECTS = $(am_xsm_OBJECTS)
 am__DEPENDENCIES_1 =
 xsm_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -103,10 +102,10 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-appdefaultDATA_INSTALL = $(INSTALL_DATA)
 appmanDATA_INSTALL = $(INSTALL_DATA)
+dist_appdefaultDATA_INSTALL = $(INSTALL_DATA)
 systeminitDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(appdefault_DATA) $(appman_DATA) $(systeminit_DATA)
+DATA = $(appman_DATA) $(dist_appdefault_DATA) $(systeminit_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -126,8 +125,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
-APPDEFS_CFLAGS = @APPDEFS_CFLAGS@
-APPDEFS_LIBS = @APPDEFS_LIBS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
 AUTOCONF = @AUTOCONF@
@@ -137,7 +135,10 @@ AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
+CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -146,9 +147,12 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -163,19 +167,7 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MAN_SUBSTS = \
-	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-	-e 's|__xservername__|Xorg|g' \
-	-e 's|__xconfigfile__|xorg.conf|g' \
-	-e 's|__projectroot__|$(prefix)|g' \
-	-e 's|__apploaddir__|$(appdefaultdir)|' \
-	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
-	-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
-	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
-	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
+MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 OBJEXT = @OBJEXT@
@@ -188,7 +180,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RSH = @RSH@
-SED = sed
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -204,8 +196,6 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-
-# App default files  (*.ad)
 appdefaultdir = @appdefaultdir@
 bindir = @bindir@
 build = @build@
@@ -243,7 +233,7 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 SYSTEM_INIT_DIR = $(datadir)/X11/xsm
-xsm_CFLAGS = $(XSM_CFLAGS) -DRSHCMD=\"@RSH@\" \
+AM_CFLAGS = $(XSM_CFLAGS) $(CWARNFLAGS) -DRSHCMD=\"@RSH@\" \
 	-DSYSTEM_INIT_FILE=\"$(SYSTEM_INIT_DIR)/system.xsm\"
 
 xsm_LDADD = $(XSM_LIBS)
@@ -284,46 +274,44 @@ xsm_SOURCES = \
 appman_PRE = \
         xsm.man
 
-APPDEFAULTFILES = \
-        XSm
 
-SUFFIXES = .ad .$(APP_MAN_SUFFIX) .man
-appdefault_DATA = $(APPDEFAULTFILES)
+# App default files
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
+dist_appdefault_DATA = \
+        app-defaults/XSm
+
 
 # system init file
 systeminitdir = $(SYSTEM_INIT_DIR)
 systeminit_DATA = system.xsm
 
 #
-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) globals.c system.xsm \
-	$(appman_PRE)
-CLEANFILES = $(APPDEFAULTFILES) $(appman_DATA)
+EXTRA_DIST = system.xsm $(appman_PRE)
 appmandir = $(APP_MAN_DIR)
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-XORGMANNAME = X Version 11
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+CLEANFILES = $(appman_DATA)
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .ad .$(APP_MAN_SUFFIX) .man .c .o .obj
+.SUFFIXES: .$(APP_MAN_SUFFIX) .man .c .o .obj
 am--refresh:
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
+	  $(AUTOMAKE) --foreign  Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -392,24 +380,24 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm-auth.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm-choose.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm-info.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm-list.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm-lock.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm-log.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm-mainwin.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm-misc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm-popup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm-printhex.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm-prop.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm-remote.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm-restart.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm-save.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm-saveutil.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm-signals.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm-xsm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm-xtwatch.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/choose.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lock.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mainwin.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/popup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printhex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prop.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/restart.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/saveutil.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signals.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xtwatch.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -424,276 +412,7 @@ distclean-compile:
 @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) '$<'`
-
-xsm-auth.o: auth.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-auth.o -MD -MP -MF "$(DEPDIR)/xsm-auth.Tpo" -c -o xsm-auth.o `test -f 'auth.c' || echo '$(srcdir)/'`auth.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-auth.Tpo" "$(DEPDIR)/xsm-auth.Po"; else rm -f "$(DEPDIR)/xsm-auth.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='auth.c' object='xsm-auth.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-auth.o `test -f 'auth.c' || echo '$(srcdir)/'`auth.c
-
-xsm-auth.obj: auth.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-auth.obj -MD -MP -MF "$(DEPDIR)/xsm-auth.Tpo" -c -o xsm-auth.obj `if test -f 'auth.c'; then $(CYGPATH_W) 'auth.c'; else $(CYGPATH_W) '$(srcdir)/auth.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-auth.Tpo" "$(DEPDIR)/xsm-auth.Po"; else rm -f "$(DEPDIR)/xsm-auth.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='auth.c' object='xsm-auth.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-auth.obj `if test -f 'auth.c'; then $(CYGPATH_W) 'auth.c'; else $(CYGPATH_W) '$(srcdir)/auth.c'; fi`
-
-xsm-choose.o: choose.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-choose.o -MD -MP -MF "$(DEPDIR)/xsm-choose.Tpo" -c -o xsm-choose.o `test -f 'choose.c' || echo '$(srcdir)/'`choose.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-choose.Tpo" "$(DEPDIR)/xsm-choose.Po"; else rm -f "$(DEPDIR)/xsm-choose.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='choose.c' object='xsm-choose.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-choose.o `test -f 'choose.c' || echo '$(srcdir)/'`choose.c
-
-xsm-choose.obj: choose.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-choose.obj -MD -MP -MF "$(DEPDIR)/xsm-choose.Tpo" -c -o xsm-choose.obj `if test -f 'choose.c'; then $(CYGPATH_W) 'choose.c'; else $(CYGPATH_W) '$(srcdir)/choose.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-choose.Tpo" "$(DEPDIR)/xsm-choose.Po"; else rm -f "$(DEPDIR)/xsm-choose.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='choose.c' object='xsm-choose.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-choose.obj `if test -f 'choose.c'; then $(CYGPATH_W) 'choose.c'; else $(CYGPATH_W) '$(srcdir)/choose.c'; fi`
-
-xsm-info.o: info.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-info.o -MD -MP -MF "$(DEPDIR)/xsm-info.Tpo" -c -o xsm-info.o `test -f 'info.c' || echo '$(srcdir)/'`info.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-info.Tpo" "$(DEPDIR)/xsm-info.Po"; else rm -f "$(DEPDIR)/xsm-info.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='info.c' object='xsm-info.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-info.o `test -f 'info.c' || echo '$(srcdir)/'`info.c
-
-xsm-info.obj: info.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-info.obj -MD -MP -MF "$(DEPDIR)/xsm-info.Tpo" -c -o xsm-info.obj `if test -f 'info.c'; then $(CYGPATH_W) 'info.c'; else $(CYGPATH_W) '$(srcdir)/info.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-info.Tpo" "$(DEPDIR)/xsm-info.Po"; else rm -f "$(DEPDIR)/xsm-info.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='info.c' object='xsm-info.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-info.obj `if test -f 'info.c'; then $(CYGPATH_W) 'info.c'; else $(CYGPATH_W) '$(srcdir)/info.c'; fi`
-
-xsm-list.o: list.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-list.o -MD -MP -MF "$(DEPDIR)/xsm-list.Tpo" -c -o xsm-list.o `test -f 'list.c' || echo '$(srcdir)/'`list.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-list.Tpo" "$(DEPDIR)/xsm-list.Po"; else rm -f "$(DEPDIR)/xsm-list.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='list.c' object='xsm-list.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-list.o `test -f 'list.c' || echo '$(srcdir)/'`list.c
-
-xsm-list.obj: list.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-list.obj -MD -MP -MF "$(DEPDIR)/xsm-list.Tpo" -c -o xsm-list.obj `if test -f 'list.c'; then $(CYGPATH_W) 'list.c'; else $(CYGPATH_W) '$(srcdir)/list.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-list.Tpo" "$(DEPDIR)/xsm-list.Po"; else rm -f "$(DEPDIR)/xsm-list.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='list.c' object='xsm-list.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-list.obj `if test -f 'list.c'; then $(CYGPATH_W) 'list.c'; else $(CYGPATH_W) '$(srcdir)/list.c'; fi`
-
-xsm-lock.o: lock.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-lock.o -MD -MP -MF "$(DEPDIR)/xsm-lock.Tpo" -c -o xsm-lock.o `test -f 'lock.c' || echo '$(srcdir)/'`lock.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-lock.Tpo" "$(DEPDIR)/xsm-lock.Po"; else rm -f "$(DEPDIR)/xsm-lock.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lock.c' object='xsm-lock.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-lock.o `test -f 'lock.c' || echo '$(srcdir)/'`lock.c
-
-xsm-lock.obj: lock.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-lock.obj -MD -MP -MF "$(DEPDIR)/xsm-lock.Tpo" -c -o xsm-lock.obj `if test -f 'lock.c'; then $(CYGPATH_W) 'lock.c'; else $(CYGPATH_W) '$(srcdir)/lock.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-lock.Tpo" "$(DEPDIR)/xsm-lock.Po"; else rm -f "$(DEPDIR)/xsm-lock.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lock.c' object='xsm-lock.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-lock.obj `if test -f 'lock.c'; then $(CYGPATH_W) 'lock.c'; else $(CYGPATH_W) '$(srcdir)/lock.c'; fi`
-
-xsm-log.o: log.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-log.o -MD -MP -MF "$(DEPDIR)/xsm-log.Tpo" -c -o xsm-log.o `test -f 'log.c' || echo '$(srcdir)/'`log.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-log.Tpo" "$(DEPDIR)/xsm-log.Po"; else rm -f "$(DEPDIR)/xsm-log.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='log.c' object='xsm-log.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-log.o `test -f 'log.c' || echo '$(srcdir)/'`log.c
-
-xsm-log.obj: log.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-log.obj -MD -MP -MF "$(DEPDIR)/xsm-log.Tpo" -c -o xsm-log.obj `if test -f 'log.c'; then $(CYGPATH_W) 'log.c'; else $(CYGPATH_W) '$(srcdir)/log.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-log.Tpo" "$(DEPDIR)/xsm-log.Po"; else rm -f "$(DEPDIR)/xsm-log.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='log.c' object='xsm-log.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-log.obj `if test -f 'log.c'; then $(CYGPATH_W) 'log.c'; else $(CYGPATH_W) '$(srcdir)/log.c'; fi`
-
-xsm-mainwin.o: mainwin.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-mainwin.o -MD -MP -MF "$(DEPDIR)/xsm-mainwin.Tpo" -c -o xsm-mainwin.o `test -f 'mainwin.c' || echo '$(srcdir)/'`mainwin.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-mainwin.Tpo" "$(DEPDIR)/xsm-mainwin.Po"; else rm -f "$(DEPDIR)/xsm-mainwin.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mainwin.c' object='xsm-mainwin.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-mainwin.o `test -f 'mainwin.c' || echo '$(srcdir)/'`mainwin.c
-
-xsm-mainwin.obj: mainwin.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-mainwin.obj -MD -MP -MF "$(DEPDIR)/xsm-mainwin.Tpo" -c -o xsm-mainwin.obj `if test -f 'mainwin.c'; then $(CYGPATH_W) 'mainwin.c'; else $(CYGPATH_W) '$(srcdir)/mainwin.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-mainwin.Tpo" "$(DEPDIR)/xsm-mainwin.Po"; else rm -f "$(DEPDIR)/xsm-mainwin.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mainwin.c' object='xsm-mainwin.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-mainwin.obj `if test -f 'mainwin.c'; then $(CYGPATH_W) 'mainwin.c'; else $(CYGPATH_W) '$(srcdir)/mainwin.c'; fi`
-
-xsm-misc.o: misc.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-misc.o -MD -MP -MF "$(DEPDIR)/xsm-misc.Tpo" -c -o xsm-misc.o `test -f 'misc.c' || echo '$(srcdir)/'`misc.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-misc.Tpo" "$(DEPDIR)/xsm-misc.Po"; else rm -f "$(DEPDIR)/xsm-misc.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='misc.c' object='xsm-misc.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-misc.o `test -f 'misc.c' || echo '$(srcdir)/'`misc.c
-
-xsm-misc.obj: misc.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-misc.obj -MD -MP -MF "$(DEPDIR)/xsm-misc.Tpo" -c -o xsm-misc.obj `if test -f 'misc.c'; then $(CYGPATH_W) 'misc.c'; else $(CYGPATH_W) '$(srcdir)/misc.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-misc.Tpo" "$(DEPDIR)/xsm-misc.Po"; else rm -f "$(DEPDIR)/xsm-misc.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='misc.c' object='xsm-misc.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-misc.obj `if test -f 'misc.c'; then $(CYGPATH_W) 'misc.c'; else $(CYGPATH_W) '$(srcdir)/misc.c'; fi`
-
-xsm-popup.o: popup.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-popup.o -MD -MP -MF "$(DEPDIR)/xsm-popup.Tpo" -c -o xsm-popup.o `test -f 'popup.c' || echo '$(srcdir)/'`popup.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-popup.Tpo" "$(DEPDIR)/xsm-popup.Po"; else rm -f "$(DEPDIR)/xsm-popup.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='popup.c' object='xsm-popup.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-popup.o `test -f 'popup.c' || echo '$(srcdir)/'`popup.c
-
-xsm-popup.obj: popup.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-popup.obj -MD -MP -MF "$(DEPDIR)/xsm-popup.Tpo" -c -o xsm-popup.obj `if test -f 'popup.c'; then $(CYGPATH_W) 'popup.c'; else $(CYGPATH_W) '$(srcdir)/popup.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-popup.Tpo" "$(DEPDIR)/xsm-popup.Po"; else rm -f "$(DEPDIR)/xsm-popup.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='popup.c' object='xsm-popup.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-popup.obj `if test -f 'popup.c'; then $(CYGPATH_W) 'popup.c'; else $(CYGPATH_W) '$(srcdir)/popup.c'; fi`
-
-xsm-printhex.o: printhex.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-printhex.o -MD -MP -MF "$(DEPDIR)/xsm-printhex.Tpo" -c -o xsm-printhex.o `test -f 'printhex.c' || echo '$(srcdir)/'`printhex.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-printhex.Tpo" "$(DEPDIR)/xsm-printhex.Po"; else rm -f "$(DEPDIR)/xsm-printhex.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='printhex.c' object='xsm-printhex.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-printhex.o `test -f 'printhex.c' || echo '$(srcdir)/'`printhex.c
-
-xsm-printhex.obj: printhex.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-printhex.obj -MD -MP -MF "$(DEPDIR)/xsm-printhex.Tpo" -c -o xsm-printhex.obj `if test -f 'printhex.c'; then $(CYGPATH_W) 'printhex.c'; else $(CYGPATH_W) '$(srcdir)/printhex.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-printhex.Tpo" "$(DEPDIR)/xsm-printhex.Po"; else rm -f "$(DEPDIR)/xsm-printhex.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='printhex.c' object='xsm-printhex.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-printhex.obj `if test -f 'printhex.c'; then $(CYGPATH_W) 'printhex.c'; else $(CYGPATH_W) '$(srcdir)/printhex.c'; fi`
-
-xsm-prop.o: prop.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-prop.o -MD -MP -MF "$(DEPDIR)/xsm-prop.Tpo" -c -o xsm-prop.o `test -f 'prop.c' || echo '$(srcdir)/'`prop.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-prop.Tpo" "$(DEPDIR)/xsm-prop.Po"; else rm -f "$(DEPDIR)/xsm-prop.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='prop.c' object='xsm-prop.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-prop.o `test -f 'prop.c' || echo '$(srcdir)/'`prop.c
-
-xsm-prop.obj: prop.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-prop.obj -MD -MP -MF "$(DEPDIR)/xsm-prop.Tpo" -c -o xsm-prop.obj `if test -f 'prop.c'; then $(CYGPATH_W) 'prop.c'; else $(CYGPATH_W) '$(srcdir)/prop.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-prop.Tpo" "$(DEPDIR)/xsm-prop.Po"; else rm -f "$(DEPDIR)/xsm-prop.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='prop.c' object='xsm-prop.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-prop.obj `if test -f 'prop.c'; then $(CYGPATH_W) 'prop.c'; else $(CYGPATH_W) '$(srcdir)/prop.c'; fi`
-
-xsm-remote.o: remote.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-remote.o -MD -MP -MF "$(DEPDIR)/xsm-remote.Tpo" -c -o xsm-remote.o `test -f 'remote.c' || echo '$(srcdir)/'`remote.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-remote.Tpo" "$(DEPDIR)/xsm-remote.Po"; else rm -f "$(DEPDIR)/xsm-remote.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='remote.c' object='xsm-remote.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-remote.o `test -f 'remote.c' || echo '$(srcdir)/'`remote.c
-
-xsm-remote.obj: remote.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-remote.obj -MD -MP -MF "$(DEPDIR)/xsm-remote.Tpo" -c -o xsm-remote.obj `if test -f 'remote.c'; then $(CYGPATH_W) 'remote.c'; else $(CYGPATH_W) '$(srcdir)/remote.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-remote.Tpo" "$(DEPDIR)/xsm-remote.Po"; else rm -f "$(DEPDIR)/xsm-remote.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='remote.c' object='xsm-remote.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-remote.obj `if test -f 'remote.c'; then $(CYGPATH_W) 'remote.c'; else $(CYGPATH_W) '$(srcdir)/remote.c'; fi`
-
-xsm-restart.o: restart.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-restart.o -MD -MP -MF "$(DEPDIR)/xsm-restart.Tpo" -c -o xsm-restart.o `test -f 'restart.c' || echo '$(srcdir)/'`restart.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-restart.Tpo" "$(DEPDIR)/xsm-restart.Po"; else rm -f "$(DEPDIR)/xsm-restart.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='restart.c' object='xsm-restart.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-restart.o `test -f 'restart.c' || echo '$(srcdir)/'`restart.c
-
-xsm-restart.obj: restart.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-restart.obj -MD -MP -MF "$(DEPDIR)/xsm-restart.Tpo" -c -o xsm-restart.obj `if test -f 'restart.c'; then $(CYGPATH_W) 'restart.c'; else $(CYGPATH_W) '$(srcdir)/restart.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-restart.Tpo" "$(DEPDIR)/xsm-restart.Po"; else rm -f "$(DEPDIR)/xsm-restart.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='restart.c' object='xsm-restart.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-restart.obj `if test -f 'restart.c'; then $(CYGPATH_W) 'restart.c'; else $(CYGPATH_W) '$(srcdir)/restart.c'; fi`
-
-xsm-save.o: save.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-save.o -MD -MP -MF "$(DEPDIR)/xsm-save.Tpo" -c -o xsm-save.o `test -f 'save.c' || echo '$(srcdir)/'`save.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-save.Tpo" "$(DEPDIR)/xsm-save.Po"; else rm -f "$(DEPDIR)/xsm-save.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='save.c' object='xsm-save.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-save.o `test -f 'save.c' || echo '$(srcdir)/'`save.c
-
-xsm-save.obj: save.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-save.obj -MD -MP -MF "$(DEPDIR)/xsm-save.Tpo" -c -o xsm-save.obj `if test -f 'save.c'; then $(CYGPATH_W) 'save.c'; else $(CYGPATH_W) '$(srcdir)/save.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-save.Tpo" "$(DEPDIR)/xsm-save.Po"; else rm -f "$(DEPDIR)/xsm-save.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='save.c' object='xsm-save.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-save.obj `if test -f 'save.c'; then $(CYGPATH_W) 'save.c'; else $(CYGPATH_W) '$(srcdir)/save.c'; fi`
-
-xsm-saveutil.o: saveutil.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-saveutil.o -MD -MP -MF "$(DEPDIR)/xsm-saveutil.Tpo" -c -o xsm-saveutil.o `test -f 'saveutil.c' || echo '$(srcdir)/'`saveutil.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-saveutil.Tpo" "$(DEPDIR)/xsm-saveutil.Po"; else rm -f "$(DEPDIR)/xsm-saveutil.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='saveutil.c' object='xsm-saveutil.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-saveutil.o `test -f 'saveutil.c' || echo '$(srcdir)/'`saveutil.c
-
-xsm-saveutil.obj: saveutil.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-saveutil.obj -MD -MP -MF "$(DEPDIR)/xsm-saveutil.Tpo" -c -o xsm-saveutil.obj `if test -f 'saveutil.c'; then $(CYGPATH_W) 'saveutil.c'; else $(CYGPATH_W) '$(srcdir)/saveutil.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-saveutil.Tpo" "$(DEPDIR)/xsm-saveutil.Po"; else rm -f "$(DEPDIR)/xsm-saveutil.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='saveutil.c' object='xsm-saveutil.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-saveutil.obj `if test -f 'saveutil.c'; then $(CYGPATH_W) 'saveutil.c'; else $(CYGPATH_W) '$(srcdir)/saveutil.c'; fi`
-
-xsm-signals.o: signals.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-signals.o -MD -MP -MF "$(DEPDIR)/xsm-signals.Tpo" -c -o xsm-signals.o `test -f 'signals.c' || echo '$(srcdir)/'`signals.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-signals.Tpo" "$(DEPDIR)/xsm-signals.Po"; else rm -f "$(DEPDIR)/xsm-signals.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='signals.c' object='xsm-signals.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-signals.o `test -f 'signals.c' || echo '$(srcdir)/'`signals.c
-
-xsm-signals.obj: signals.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-signals.obj -MD -MP -MF "$(DEPDIR)/xsm-signals.Tpo" -c -o xsm-signals.obj `if test -f 'signals.c'; then $(CYGPATH_W) 'signals.c'; else $(CYGPATH_W) '$(srcdir)/signals.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-signals.Tpo" "$(DEPDIR)/xsm-signals.Po"; else rm -f "$(DEPDIR)/xsm-signals.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='signals.c' object='xsm-signals.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-signals.obj `if test -f 'signals.c'; then $(CYGPATH_W) 'signals.c'; else $(CYGPATH_W) '$(srcdir)/signals.c'; fi`
-
-xsm-xsm.o: xsm.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-xsm.o -MD -MP -MF "$(DEPDIR)/xsm-xsm.Tpo" -c -o xsm-xsm.o `test -f 'xsm.c' || echo '$(srcdir)/'`xsm.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-xsm.Tpo" "$(DEPDIR)/xsm-xsm.Po"; else rm -f "$(DEPDIR)/xsm-xsm.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xsm.c' object='xsm-xsm.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-xsm.o `test -f 'xsm.c' || echo '$(srcdir)/'`xsm.c
-
-xsm-xsm.obj: xsm.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-xsm.obj -MD -MP -MF "$(DEPDIR)/xsm-xsm.Tpo" -c -o xsm-xsm.obj `if test -f 'xsm.c'; then $(CYGPATH_W) 'xsm.c'; else $(CYGPATH_W) '$(srcdir)/xsm.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-xsm.Tpo" "$(DEPDIR)/xsm-xsm.Po"; else rm -f "$(DEPDIR)/xsm-xsm.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xsm.c' object='xsm-xsm.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-xsm.obj `if test -f 'xsm.c'; then $(CYGPATH_W) 'xsm.c'; else $(CYGPATH_W) '$(srcdir)/xsm.c'; fi`
-
-xsm-xtwatch.o: xtwatch.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-xtwatch.o -MD -MP -MF "$(DEPDIR)/xsm-xtwatch.Tpo" -c -o xsm-xtwatch.o `test -f 'xtwatch.c' || echo '$(srcdir)/'`xtwatch.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-xtwatch.Tpo" "$(DEPDIR)/xsm-xtwatch.Po"; else rm -f "$(DEPDIR)/xsm-xtwatch.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xtwatch.c' object='xsm-xtwatch.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-xtwatch.o `test -f 'xtwatch.c' || echo '$(srcdir)/'`xtwatch.c
-
-xsm-xtwatch.obj: xtwatch.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsm_CFLAGS) $(CFLAGS) -MT xsm-xtwatch.obj -MD -MP -MF "$(DEPDIR)/xsm-xtwatch.Tpo" -c -o xsm-xtwatch.obj `if test -f 'xtwatch.c'; then $(CYGPATH_W) 'xtwatch.c'; else $(CYGPATH_W) '$(srcdir)/xtwatch.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/xsm-xtwatch.Tpo" "$(DEPDIR)/xsm-xtwatch.Po"; else rm -f "$(DEPDIR)/xsm-xtwatch.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xtwatch.c' object='xsm-xtwatch.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) $(xsm_CFLAGS) $(CFLAGS) -c -o xsm-xtwatch.obj `if test -f 'xtwatch.c'; then $(CYGPATH_W) 'xtwatch.c'; else $(CYGPATH_W) '$(srcdir)/xtwatch.c'; fi`
 uninstall-info-am:
-install-appdefaultDATA: $(appdefault_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(appdefaultdir)" || $(mkdir_p) "$(DESTDIR)$(appdefaultdir)"
-	@list='$(appdefault_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(appdefaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdefaultdir)/$$f'"; \
-	  $(appdefaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdefaultdir)/$$f"; \
-	done
-
-uninstall-appdefaultDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(appdefault_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(appdefaultdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(appdefaultdir)/$$f"; \
-	done
 install-appmanDATA: $(appman_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)"
@@ -711,6 +430,23 @@ uninstall-appmanDATA:
 	  echo " rm -f '$(DESTDIR)$(appmandir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(appmandir)/$$f"; \
 	done
+install-dist_appdefaultDATA: $(dist_appdefault_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(appdefaultdir)" || $(mkdir_p) "$(DESTDIR)$(appdefaultdir)"
+	@list='$(dist_appdefault_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_appdefaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdefaultdir)/$$f'"; \
+	  $(dist_appdefaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdefaultdir)/$$f"; \
+	done
+
+uninstall-dist_appdefaultDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_appdefault_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(appdefaultdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(appdefaultdir)/$$f"; \
+	done
 install-systeminitDATA: $(systeminit_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(systeminitdir)" || $(mkdir_p) "$(DESTDIR)$(systeminitdir)"
@@ -780,6 +516,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
+	$(mkdir_p) $(distdir)/app-defaults
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -806,6 +543,9 @@ 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 \
@@ -907,7 +647,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(DATA) config.h
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(systeminitdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(appdefaultdir)" "$(DESTDIR)$(systeminitdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -935,6 +675,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
@@ -956,7 +697,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-appdefaultDATA install-appmanDATA \
+install-data-am: install-appmanDATA install-dist_appdefaultDATA \
 	install-systeminitDATA
 
 install-exec-am: install-binPROGRAMS
@@ -986,32 +727,41 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-appdefaultDATA uninstall-appmanDATA \
-	uninstall-binPROGRAMS uninstall-info-am \
+uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
+	uninstall-dist_appdefaultDATA uninstall-info-am \
 	uninstall-systeminitDATA
 
 .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 \
-	distclean-compile distclean-generic distclean-hdr \
+	dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
+	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-appdefaultDATA install-appmanDATA install-binPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	install-systeminitDATA 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-appdefaultDATA \
-	uninstall-appmanDATA uninstall-binPROGRAMS uninstall-info-am \
+	install-appmanDATA install-binPROGRAMS install-data \
+	install-data-am install-dist_appdefaultDATA install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip install-systeminitDATA 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-dist_appdefaultDATA uninstall-info-am \
 	uninstall-systeminitDATA
 
 
-.ad:
-	cp $< $@
-
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
 .man.$(APP_MAN_SUFFIX):
-	sed $(MAN_SUBSTS) < $< > $@
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
 # 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:
diff --git a/app/xsm/README b/app/xsm/README
index 2118c91e0..4644343aa 100644
--- a/app/xsm/README
+++ b/app/xsm/README
@@ -1,5 +1,3 @@
-$Xorg: README,v 1.3 2000/08/17 19:55:04 cpqbld Exp $
-
 README file for the X Session Manager (xsm)
 -------------------------------------------
 
@@ -24,35 +22,17 @@ This README file discusses the necessary steps you must take to run xsm.  To
 learn more about the details of xsm's functionality, read the xsm man page.
 
 Before building xsm, you should make sure you have the following libraries
-built on your system with all fix-trackers patches applied:
+built on your system:
 
 libICE - the Inter Client Exchange Library
 libSM  - the Session Management Library
 libXt  - the X Toolkit with support for session management
 
-To build these libraries, you would change your current directory to
-lib/ICE, lib/SM, or lib/Xt and do the following:
-
-make Makefile
-make includes
-make depend
-make
-
-
 Once you are sure all of the required libraries are built, you are ready
 to build xsm.
 
-Change your current directory to workInProgress
-
-make Makefiles SUBDIRS=xsm
-cd xsm
-make includes
-make depend
-make install
-
-
 Before you can run xsm, you must make sure that the following programs are
-built and installed on your system with all fix-trackers patches applied:
+built and installed on your system:
 
 smproxy - the session manager proxy for applications that don't support
           R6 style session management
@@ -61,16 +41,6 @@ rstart  - allows xsm to start applications on remote machines
 twm     - window manager that support R6 style session management - takes
           care of saving window configurations in a session
 
-To build and install these programs, you would change your current directory
-to programs/smproxy, programs/iceauth, programs/rstart, or programs/twm and
-do the following:
-
-make Makefile
-make includes
-make depend
-make install
-
-
 Note that to install rstart, you will need to have root privileges because
 the program must be installed in a system wide default path.
 
diff --git a/app/xsm/aclocal.m4 b/app/xsm/aclocal.m4
index 553960ece..3f71a4321 100644
--- a/app/xsm/aclocal.m4
+++ b/app/xsm/aclocal.m4
@@ -997,7 +997,7 @@ AC_SUBST([am__untar])
 
 dnl xorg-macros.m4.  Generated from xorg-macros.m4.in xorgversion.m4 by configure.
 dnl
-dnl Copyright 2005-2006 Sun Microsystems, Inc.  All rights reserved.
+dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
 dnl 
 dnl Permission is hereby granted, free of charge, to any person obtaining a
 dnl copy of this software and associated documentation files (the "Software"),
@@ -1034,7 +1034,7 @@ dnl DEALINGS IN THE SOFTWARE.
 # See the "minimum version" comment for each macro you use to see what 
 # version you require.
 m4_defun([XORG_MACROS_VERSION],[
-m4_define([vers_have], [1.10.0])
+m4_define([vers_have], [1.11.0])
 m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
 m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
 m4_if(m4_cmp(maj_have, maj_needed), 0,,
@@ -1185,6 +1185,7 @@ MAN_SUBSTS="\
 	-e 's|__xservername__|Xorg|g' \
 	-e 's|__xconfigfile__|xorg.conf|g' \
 	-e 's|__projectroot__|\$(prefix)|g' \
+	-e 's|__apploaddir__|\$(appdefaultdir)|g' \
 	-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
 	-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
 	-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
@@ -1342,15 +1343,17 @@ AC_SUBST(MAKE_PDF)
 AC_SUBST(MAKE_HTML)
 ]) # XORG_CHECK_DOCBOOK
 
-# XORG_WITH_XMLTO([MIN-VERSION])
+# XORG_WITH_XMLTO([MIN-VERSION], [DEFAULT])
 # ----------------
 # Minimum version: 1.5.0
+# Minimum version for optional DEFAULT argument: 1.11.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
 # presence of the tool and obtain it's path in separate variables. Coupled with
 # the --with-xmlto option, it allows maximum flexibilty in making decisions
-# as whether or not to use the xmlto package.
+# as whether or not to use the xmlto package. When DEFAULT is not specified,
+# --with-xmlto assumes 'auto'.
 #
 # Interface to module:
 # HAVE_XMLTO: 	used in makefiles to conditionally generate documentation
@@ -1367,10 +1370,12 @@ AC_SUBST(MAKE_HTML)
 #
 AC_DEFUN([XORG_WITH_XMLTO],[
 AC_ARG_VAR([XMLTO], [Path to xmlto command])
+m4_define([_defopt], m4_default([$2], [auto]))
 AC_ARG_WITH(xmlto,
 	AS_HELP_STRING([--with-xmlto],
-	   [Use xmlto to regenerate documentation (default: yes, if installed)]),
-	   [use_xmlto=$withval], [use_xmlto=auto])
+	   [Use xmlto to regenerate documentation (default: ]_defopt[)]),
+	   [use_xmlto=$withval], [use_xmlto=]_defopt)
+m4_undefine([_defopt])
 
 if test "x$use_xmlto" = x"auto"; then
    AC_PATH_PROG([XMLTO], [xmlto])
@@ -1424,15 +1429,17 @@ AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
 AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
 ]) # XORG_WITH_XMLTO
 
-# XORG_WITH_ASCIIDOC([MIN-VERSION])
+# XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT])
 # ----------------
 # Minimum version: 1.5.0
+# Minimum version for optional DEFAULT argument: 1.11.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
 # presence of the tool and obtain it's path in separate variables. Coupled with
 # the --with-asciidoc option, it allows maximum flexibilty in making decisions
-# as whether or not to use the asciidoc package.
+# as whether or not to use the asciidoc package. When DEFAULT is not specified,
+# --with-asciidoc assumes 'auto'.
 #
 # Interface to module:
 # HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation
@@ -1445,10 +1452,12 @@ AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
 #
 AC_DEFUN([XORG_WITH_ASCIIDOC],[
 AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command])
+m4_define([_defopt], m4_default([$2], [auto]))
 AC_ARG_WITH(asciidoc,
 	AS_HELP_STRING([--with-asciidoc],
-	   [Use asciidoc to regenerate documentation (default: yes, if installed)]),
-	   [use_asciidoc=$withval], [use_asciidoc=auto])
+	   [Use asciidoc to regenerate documentation (default: ]_defopt[)]),
+	   [use_asciidoc=$withval], [use_asciidoc=]_defopt)
+m4_undefine([_defopt])
 
 if test "x$use_asciidoc" = x"auto"; then
    AC_PATH_PROG([ASCIIDOC], [asciidoc])
@@ -1489,15 +1498,17 @@ fi])
 AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
 ]) # XORG_WITH_ASCIIDOC
 
-# XORG_WITH_DOXYGEN([MIN-VERSION])
+# XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT])
 # --------------------------------
 # Minimum version: 1.5.0
+# Minimum version for optional DEFAULT argument: 1.11.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
 # presence of the tool and obtain it's path in separate variables. Coupled with
 # the --with-doxygen option, it allows maximum flexibilty in making decisions
-# as whether or not to use the doxygen package.
+# as whether or not to use the doxygen package. When DEFAULT is not specified,
+# --with-doxygen assumes 'auto'.
 #
 # Interface to module:
 # HAVE_DOXYGEN: used in makefiles to conditionally generate documentation
@@ -1510,10 +1521,12 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
 #
 AC_DEFUN([XORG_WITH_DOXYGEN],[
 AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
+m4_define([_defopt], m4_default([$2], [auto]))
 AC_ARG_WITH(doxygen,
 	AS_HELP_STRING([--with-doxygen],
-	   [Use doxygen to regenerate documentation (default: yes, if installed)]),
-	   [use_doxygen=$withval], [use_doxygen=auto])
+	   [Use doxygen to regenerate documentation (default: ]_defopt[)]),
+	   [use_doxygen=$withval], [use_doxygen=]_defopt)
+m4_undefine([_defopt])
 
 if test "x$use_doxygen" = x"auto"; then
    AC_PATH_PROG([DOXYGEN], [doxygen])
@@ -1554,15 +1567,17 @@ fi])
 AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
 ]) # XORG_WITH_DOXYGEN
 
-# XORG_WITH_GROFF
+# XORG_WITH_GROFF([DEFAULT])
 # ----------------
 # Minimum version: 1.6.0
+# Minimum version for optional DEFAULT argument: 1.11.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
 # presence of the tool and obtain it's path in separate variables. Coupled with
 # the --with-groff option, it allows maximum flexibilty in making decisions
-# as whether or not to use the groff package.
+# as whether or not to use the groff package. When DEFAULT is not specified,
+# --with-groff assumes 'auto'.
 #
 # Interface to module:
 # HAVE_GROFF:	 used in makefiles to conditionally generate documentation
@@ -1591,10 +1606,12 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
 #
 AC_DEFUN([XORG_WITH_GROFF],[
 AC_ARG_VAR([GROFF], [Path to groff command])
+m4_define([_defopt], m4_default([$1], [auto]))
 AC_ARG_WITH(groff,
 	AS_HELP_STRING([--with-groff],
-	   [Use groff to regenerate documentation (default: yes, if installed)]),
-	   [use_groff=$withval], [use_groff=auto])
+	   [Use groff to regenerate documentation (default: ]_defopt[)]),
+	   [use_groff=$withval], [use_groff=]_defopt)
+m4_undefine([_defopt])
 
 if test "x$use_groff" = x"auto"; then
    AC_PATH_PROG([GROFF], [groff])
@@ -1657,15 +1674,17 @@ AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes])
 AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes])
 ]) # XORG_WITH_GROFF
 
-# XORG_WITH_FOP
+# XORG_WITH_FOP([DEFAULT])
 # ----------------
 # Minimum version: 1.6.0
+# Minimum version for optional DEFAULT argument: 1.11.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
 # presence of the tool and obtain it's path in separate variables. Coupled with
 # the --with-fop option, it allows maximum flexibilty in making decisions
-# as whether or not to use the fop package.
+# as whether or not to use the fop package. When DEFAULT is not specified,
+# --with-fop assumes 'auto'.
 #
 # Interface to module:
 # HAVE_FOP: 	used in makefiles to conditionally generate documentation
@@ -1678,10 +1697,12 @@ AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes])
 #
 AC_DEFUN([XORG_WITH_FOP],[
 AC_ARG_VAR([FOP], [Path to fop command])
+m4_define([_defopt], m4_default([$1], [auto]))
 AC_ARG_WITH(fop,
 	AS_HELP_STRING([--with-fop],
-	   [Use fop to regenerate documentation (default: yes, if installed)]),
-	   [use_fop=$withval], [use_fop=auto])
+	   [Use fop to regenerate documentation (default: ]_defopt[)]),
+	   [use_fop=$withval], [use_fop=]_defopt)
+m4_undefine([_defopt])
 
 if test "x$use_fop" = x"auto"; then
    AC_PATH_PROG([FOP], [fop])
@@ -1708,15 +1729,17 @@ fi
 AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
 ]) # XORG_WITH_FOP
 
-# XORG_WITH_PS2PDF
+# XORG_WITH_PS2PDF([DEFAULT])
 # ----------------
 # Minimum version: 1.6.0
+# Minimum version for optional DEFAULT argument: 1.11.0
 #
 # Documentation tools are not always available on all platforms and sometimes
 # not at the appropriate level. This macro enables a module to test for the
 # presence of the tool and obtain it's path in separate variables. Coupled with
 # the --with-ps2pdf option, it allows maximum flexibilty in making decisions
-# as whether or not to use the ps2pdf package.
+# as whether or not to use the ps2pdf package. When DEFAULT is not specified,
+# --with-ps2pdf assumes 'auto'.
 #
 # Interface to module:
 # HAVE_PS2PDF: 	used in makefiles to conditionally generate documentation
@@ -1729,10 +1752,12 @@ AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
 #
 AC_DEFUN([XORG_WITH_PS2PDF],[
 AC_ARG_VAR([PS2PDF], [Path to ps2pdf command])
+m4_define([_defopt], m4_default([$1], [auto]))
 AC_ARG_WITH(ps2pdf,
 	AS_HELP_STRING([--with-ps2pdf],
-	   [Use ps2pdf to regenerate documentation (default: yes, if installed)]),
-	   [use_ps2pdf=$withval], [use_ps2pdf=auto])
+	   [Use ps2pdf to regenerate documentation (default: ]_defopt[)]),
+	   [use_ps2pdf=$withval], [use_ps2pdf=]_defopt)
+m4_undefine([_defopt])
 
 if test "x$use_ps2pdf" = x"auto"; then
    AC_PATH_PROG([PS2PDF], [ps2pdf])
@@ -1783,14 +1808,12 @@ AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes])
 # parm1:	specify the default value, yes or no.
 #
 AC_DEFUN([XORG_ENABLE_DOCS],[
-default=$1
-if test "x$default" = x ; then
-  default="yes"
-fi
+m4_define([default], m4_default([$1], [yes]))
 AC_ARG_ENABLE(docs,
 	AS_HELP_STRING([--enable-docs],
-	   [Enable building the documentation (default: yes)]),
-	   [build_docs=$enableval], [build_docs=$default])
+	   [Enable building the documentation (default: ]default[)]),
+	   [build_docs=$enableval], [build_docs=]default)
+m4_undefine([default])
 AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes])
 AC_MSG_CHECKING([whether to build documentation])
 AC_MSG_RESULT([$build_docs])
@@ -1818,14 +1841,12 @@ AC_MSG_RESULT([$build_docs])
 # parm1:		specify the default value, yes or no.
 #
 AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[
-devel_default=$1
-if test "x$devel_default" = x ; then
-  devel_default="yes"
-fi
+m4_define([devel_default], m4_default([$1], [yes]))
 AC_ARG_ENABLE(devel-docs,
 	AS_HELP_STRING([--enable-devel-docs],
-	   [Enable building the developer documentation (default: yes)]),
-	   [build_devel_docs=$enableval], [build_devel_docs=$devel_default])
+	   [Enable building the developer documentation (default: ]devel_default[)]),
+	   [build_devel_docs=$enableval], [build_devel_docs=]devel_default)
+m4_undefine([devel_default])
 AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes])
 AC_MSG_CHECKING([whether to build developer documentation])
 AC_MSG_RESULT([$build_devel_docs])
@@ -1853,14 +1874,12 @@ AC_MSG_RESULT([$build_devel_docs])
 # parm1:		specify the default value, yes or no.
 #
 AC_DEFUN([XORG_ENABLE_SPECS],[
-spec_default=$1
-if test "x$spec_default" = x ; then
-  spec_default="yes"
-fi
+m4_define([spec_default], m4_default([$1], [yes]))
 AC_ARG_ENABLE(specs,
 	AS_HELP_STRING([--enable-specs],
-	   [Enable building the specs (default: yes)]),
-	   [build_specs=$enableval], [build_specs=$spec_default])
+	   [Enable building the specs (default: ]spec_default[)]),
+	   [build_specs=$enableval], [build_specs=]spec_default)
+m4_undefine([spec_default])
 AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes])
 AC_MSG_CHECKING([whether to build functional specifications])
 AC_MSG_RESULT([$build_specs])
diff --git a/app/xsm/XSm.ad b/app/xsm/app-defaults/XSm
index 512972273..512972273 100644
--- a/app/xsm/XSm.ad
+++ b/app/xsm/app-defaults/XSm
diff --git a/app/xsm/auth.c b/app/xsm/auth.c
index 67f0eca33..da2cbb615 100644
--- a/app/xsm/auth.c
+++ b/app/xsm/auth.c
@@ -95,13 +95,11 @@ unique_filename(char *path, char *prefix, int *pFd)
     char tempFile[PATH_MAX];
     char *tmp;
 
-    sprintf (tempFile, "%s/%sXXXXXX", path, prefix);
+    snprintf (tempFile, sizeof(tempFile), "%s/%sXXXXXX", path, prefix);
     tmp = (char *) mktemp (tempFile);
     if (tmp)
     {
-	char *ptr = (char *) malloc (strlen (tmp) + 1);
-	strcpy (ptr, tmp);
-	return (ptr);
+	return strdup(tmp);
     }
     else
 	return (NULL);
@@ -110,11 +108,10 @@ unique_filename(char *path, char *prefix, int *pFd)
     char tempFile[PATH_MAX];
     char *ptr;
 
-    sprintf (tempFile, "%s/%sXXXXXX", path, prefix);
-    ptr = (char *)malloc(strlen(tempFile) + 1);
+    snprintf (tempFile, sizeof(tempFile), "%s/%sXXXXXX", path, prefix);
+    ptr = strdup(tempFile);
     if (ptr != NULL) 
     {
-	strcpy(ptr, tempFile);
 	*pFd =  mkstemp(ptr);
     }
     return ptr;
@@ -216,10 +213,10 @@ SetAuthentication(int count, IceListenObj *listenObjs,
 
     umask (original_umask);
 
-    sprintf (command, "iceauth source %s", addAuthFile);
+    snprintf (command, sizeof(command), "iceauth source %s", addAuthFile);
     execute_system_command (command);
 
-    unlink (addAuthFile);
+    remove (addAuthFile);
 
     return (1);
 
@@ -233,12 +230,12 @@ SetAuthentication(int count, IceListenObj *listenObjs,
 
     if (addAuthFile)
     {
-	unlink (addAuthFile);
+	remove (addAuthFile);
 	free (addAuthFile);
     }
     if (remAuthFile)
     {
-	unlink (remAuthFile);
+	remove (remAuthFile);
 	free (remAuthFile);
     }
 
@@ -267,10 +264,10 @@ FreeAuthenticationData(int count, IceAuthDataEntry *authDataEntries)
 
     XtFree ((char *) authDataEntries);
 
-    sprintf (command, "iceauth source %s", remAuthFile);
+    snprintf (command, sizeof(command), "iceauth source %s", remAuthFile);
     execute_system_command (command);
 
-    unlink (remAuthFile);
+    remove (remAuthFile);
 
     free (addAuthFile);
     free (remAuthFile);
diff --git a/app/xsm/choose.c b/app/xsm/choose.c
index e1711f9e6..c2a0c346e 100644
--- a/app/xsm/choose.c
+++ b/app/xsm/choose.c
@@ -59,16 +59,16 @@ static Pixel save_message_background;
 static int delete_session_phase = 0;
 static int break_lock_phase = 0;
 
-Widget chooseSessionPopup;
-Widget chooseSessionForm;
-Widget chooseSessionLabel;
-Widget chooseSessionListWidget;
-Widget chooseSessionMessageLabel;
-Widget chooseSessionLoadButton;
-Widget chooseSessionDeleteButton;
-Widget chooseSessionBreakLockButton;
-Widget chooseSessionFailSafeButton;
-Widget chooseSessionCancelButton;
+static Widget chooseSessionPopup;
+static Widget chooseSessionForm;
+static Widget chooseSessionLabel;
+static Widget chooseSessionListWidget;
+static Widget chooseSessionMessageLabel;
+static Widget chooseSessionLoadButton;
+static Widget chooseSessionDeleteButton;
+static Widget chooseSessionBreakLockButton;
+static Widget chooseSessionFailSafeButton;
+static Widget chooseSessionCancelButton;
 
 
 
@@ -736,7 +736,7 @@ create_choose_session_popup(void)
         NULL);
 
     XtAddCallback (chooseSessionLoadButton, XtNcallback,
-	ChooseSessionLoadXtProc, 0);
+	ChooseSessionLoadXtProc, NULL);
 
     chooseSessionDeleteButton = XtVaCreateManagedWidget (
 	"chooseSessionDeleteButton", commandWidgetClass, chooseSessionForm,
@@ -745,7 +745,7 @@ create_choose_session_popup(void)
         NULL);
 
     XtAddCallback (chooseSessionDeleteButton, XtNcallback,
-	ChooseSessionDeleteXtProc, 0);
+	ChooseSessionDeleteXtProc, NULL);
 
     chooseSessionBreakLockButton = XtVaCreateManagedWidget (
 	"chooseSessionBreakLockButton",
@@ -755,7 +755,7 @@ create_choose_session_popup(void)
         NULL);
 
     XtAddCallback (chooseSessionBreakLockButton, XtNcallback,
-	ChooseSessionBreakLockXtProc, 0);
+	ChooseSessionBreakLockXtProc, NULL);
 
     chooseSessionFailSafeButton = XtVaCreateManagedWidget (
 	"chooseSessionFailSafeButton", commandWidgetClass, chooseSessionForm,
@@ -764,7 +764,7 @@ create_choose_session_popup(void)
         NULL);
 
     XtAddCallback (chooseSessionFailSafeButton, XtNcallback,
-	ChooseSessionFailSafeXtProc, 0);
+	ChooseSessionFailSafeXtProc, NULL);
 
 
     chooseSessionCancelButton = XtVaCreateManagedWidget (
@@ -774,7 +774,7 @@ create_choose_session_popup(void)
         NULL);
 
     XtAddCallback (chooseSessionCancelButton, XtNcallback,
-	ChooseSessionCancelXtProc, 0);
+	ChooseSessionCancelXtProc, NULL);
 
     XtAppAddActions (appContext, choose_actions, XtNumber (choose_actions));
 
diff --git a/app/xsm/compile b/app/xsm/compile
deleted file mode 100644
index 1b1d23216..000000000
--- a/app/xsm/compile
+++ /dev/null
@@ -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:
diff --git a/app/xsm/config.h.in b/app/xsm/config.h.in
index 39d94af3e..7f709a1b4 100644
--- a/app/xsm/config.h.in
+++ b/app/xsm/config.h.in
@@ -1,9 +1,36 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define to 1 if you have the `mkstemp' function. */
+/* Define to 1 if you have the 'mkstemp' function. */
 #undef HAS_MKSTEMP
 
-/* Define to 1 if you DO NOT have the `putenv' function. */
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you DO NOT have the 'putenv' function. */
 #undef NOPUTENV
 
 /* Name of package */
@@ -33,5 +60,8 @@
 /* Patch version of this package */
 #undef PACKAGE_VERSION_PATCHLEVEL
 
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
 /* Version number of package */
 #undef VERSION
diff --git a/app/xsm/configure b/app/xsm/configure
index 6aca24c48..20cd3cf1e 100644
--- a/app/xsm/configure
+++ b/app/xsm/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for xsm 1.0.1.
+# Generated by GNU Autoconf 2.62 for xsm 1.0.2.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -596,10 +596,46 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xsm'
 PACKAGE_TARNAME='xsm'
-PACKAGE_VERSION='1.0.1'
-PACKAGE_STRING='xsm 1.0.1'
+PACKAGE_VERSION='1.0.2'
+PACKAGE_STRING='xsm 1.0.2'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
 ac_subst_vars='SHELL
 PATH_SEPARATOR
 PACKAGE_NAME
@@ -677,13 +713,13 @@ AMDEPBACKSLASH
 CCDEPMODE
 am__fastdepCC_TRUE
 am__fastdepCC_FALSE
-RSH
+CPP
+GREP
+EGREP
+CWARNFLAGS
+CHANGELOG_CMD
 PKG_CONFIG
-XSM_CFLAGS
-XSM_LIBS
-APPDEFS_CFLAGS
-APPDEFS_LIBS
-appdefaultdir
+INSTALL_CMD
 build
 build_cpu
 build_vendor
@@ -707,6 +743,11 @@ DRIVER_MAN_DIR
 ADMIN_MAN_DIR
 XORG_MAN_PAGE
 MAN_SUBSTS
+AM_DEFAULT_VERBOSITY
+RSH
+XSM_CFLAGS
+XSM_LIBS
+appdefaultdir
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
@@ -714,6 +755,9 @@ ac_user_opts='
 enable_option_checking
 enable_maintainer_mode
 enable_dependency_tracking
+enable_strict_compilation
+with_rsh
+with_appdefaultdir
 '
       ac_precious_vars='build_alias
 host_alias
@@ -723,11 +767,10 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
+CPP
 PKG_CONFIG
 XSM_CFLAGS
-XSM_LIBS
-APPDEFS_CFLAGS
-APPDEFS_LIBS'
+XSM_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1280,7 +1323,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 xsm 1.0.1 to adapt to many kinds of systems.
+\`configure' configures xsm 1.0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1350,7 +1393,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xsm 1.0.1:";;
+     short | recursive ) echo "Configuration of xsm 1.0.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1362,6 +1405,17 @@ Optional Features:
 			  (and sometimes confusing) to the casual installer
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-strict-compilation
+                          Enable all warnings from compiler and make them
+                          errors (default: disabled)
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-rsh=PATH         Rsh command to use (default: $bindir/ssh)
+  --with-appdefaultdir=<pathname>
+                          specify directory for app-defaults files (default is
+                          autodetected)
 
 Some influential environment variables:
   CC          C compiler command
@@ -1371,13 +1425,10 @@ Some influential environment variables:
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
   XSM_CFLAGS  C compiler flags for XSM, overriding pkg-config
   XSM_LIBS    linker flags for XSM, overriding pkg-config
-  APPDEFS_CFLAGS
-              C compiler flags for APPDEFS, overriding pkg-config
-  APPDEFS_LIBS
-              linker flags for APPDEFS, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1445,7 +1496,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xsm configure 1.0.1
+xsm configure 1.0.2
 generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1459,7 +1510,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 xsm $as_me 1.0.1, which was
+It was created by xsm $as_me 1.0.2, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -2108,7 +2159,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xsm'
- VERSION='1.0.1'
+ VERSION='1.0.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2282,6 +2333,83 @@ fi
 ac_config_headers="$ac_config_headers config.h"
 
 
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+
+
+
+
+
+
+
+
+
+
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+
+
+{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+
+
+if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3212,71 +3340,6 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
 
 depcc="$CC"   am_compiler_list=
 
@@ -3387,249 +3450,581 @@ else
 fi
 
 
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
+   { $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C99" >&5
+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+if test "${ac_cv_prog_cc_c99+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+#define debug(...) fprintf (stderr, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  your preprocessor is broken;
+#endif
+#if BIG_OK
+#else
+  your preprocessor is broken;
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static void
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case 's': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case 'd': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case 'f': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+}
+
+int
+main ()
+{
+
+  // Check bool.
+  _Bool success = false;
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs ("s, d' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
+	  || dynamic_array[ni.number - 1] != 543);
+
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_prog_cc_c99=$ac_arg
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
 
 fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL 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.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
 
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+  x)
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c99"
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c99" >&5
+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
+esac
 
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-RSH=
-if [ -z $RSH ] ; then
-   # Extract the first word of "rsh", so it can be a program name with args.
-set dummy rsh; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_RSH+set}" = set; then
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  case $RSH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_RSH="$RSH" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
 do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_RSH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
 done
-IFS=$as_save_IFS
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
 
-  ;;
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
 esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
 fi
-RSH=$ac_cv_path_RSH
-if test -n "$RSH"; then
-  { $as_echo "$as_me:$LINENO: result: $RSH" >&5
-$as_echo "$RSH" >&6; }
+
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  # Broken: success on invalid input.
+continue
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
 
+rm -f conftest.err conftest.$ac_ext
 
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-if [ -z $RSH ] ; then
-   # Extract the first word of "rcmd", so it can be a program name with args.
-set dummy rcmd; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_RSH+set}" = set; then
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  case $RSH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_RSH="$RSH" # Let the user override the test with a path.
-  ;;
-  *)
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_RSH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
+  for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
 done
 IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-RSH=$ac_cv_path_RSH
-if test -n "$RSH"; then
-  { $as_echo "$as_me:$LINENO: result: $RSH" >&5
-$as_echo "$RSH" >&6; }
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-if [ -z $RSH ] ; then
-   # Extract the first word of "remsh", so it can be a program name with args.
-set dummy remsh; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_RSH+set}" = set; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
-  case $RSH in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_RSH="$RSH" # Let the user override the test with a path.
-  ;;
-  *)
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_RSH="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
+  for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    ac_count=`expr $ac_count + 1`
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
 done
 IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-RSH=$ac_cv_path_RSH
-if test -n "$RSH"; then
-  { $as_echo "$as_me:$LINENO: result: $RSH" >&5
-$as_echo "$RSH" >&6; }
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
+  ac_cv_path_EGREP=$EGREP
 fi
 
-
-fi
-if [ -z $RSH ] ; then
-   { { $as_echo "$as_me:$LINENO: error: No rsh like program found" >&5
-$as_echo "$as_me: error: No rsh like program found" >&2;}
-   { (exit 1); exit 1; }; }
+   fi
 fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
 
-#if !defined(RshCmd)
-#if SystemV
-#ifdef HPArchitecture
-#define RshCmd remsh
-#else
-#define RshCmd rcmd
-#endif
-#else
-#define RshCmd rsh
-#endif
-#endif
 
-
-{ $as_echo "$as_me:$LINENO: checking for mkstemp" >&5
-$as_echo_n "checking for mkstemp... " >&6; }
-if test "${ac_cv_func_mkstemp+set}" = set; then
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -3638,54 +4033,28 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define mkstemp to an innocuous variant, in case <limits.h> declares mkstemp.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define mkstemp innocuous_mkstemp
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char mkstemp (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef mkstemp
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char mkstemp ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_mkstemp || defined __stub___mkstemp
-choke me
-#endif
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
 
 int
 main ()
 {
-return mkstemp ();
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -3694,83 +4063,96 @@ $as_echo "$ac_try_echo") >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_mkstemp=yes
+       } && test -s conftest.$ac_objext; then
+  ac_cv_header_stdc=yes
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_func_mkstemp=no
+	ac_cv_header_stdc=no
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mkstemp" >&5
-$as_echo "$ac_cv_func_mkstemp" >&6; }
-if test $ac_cv_func_mkstemp = yes; then
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-cat >>confdefs.h <<\_ACEOF
-#define HAS_MKSTEMP 1
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
 
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
 fi
+rm -f conftest*
 
-{ $as_echo "$as_me:$LINENO: checking for putenv" >&5
-$as_echo_n "checking for putenv... " >&6; }
-if test "${ac_cv_func_putenv+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define putenv to an innocuous variant, in case <limits.h> declares putenv.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define putenv innocuous_putenv
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char putenv (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+#include <stdlib.h>
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
 
-#undef putenv
+fi
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char putenv ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_putenv || defined __stub___putenv
-choke me
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then
+  :
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 #endif
 
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
 int
 main ()
 {
-return putenv ();
-  ;
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
+rm -f conftest$ac_exeext
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -3778,7 +4160,84 @@ case "(($ac_try" in
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -rf conftest.dSYM
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+
+
+fi
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -3787,36 +4246,32 @@ $as_echo "$ac_try_echo") >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_putenv=yes
+       } && test -s conftest.$ac_objext; then
+  eval "$as_ac_Header=yes"
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_func_putenv=no
+	eval "$as_ac_Header=no"
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_putenv" >&5
-$as_echo "$ac_cv_func_putenv" >&6; }
-if test $ac_cv_func_putenv = yes; then
-  :
-else
-
-cat >>confdefs.h <<\_ACEOF
-#define NOPUTENV 1
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
+done
+
 
-# Checks for pkg-config packages
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -3937,232 +4392,6 @@ $as_echo "no" >&6; }
 	fi
 
 fi
-
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XSM" >&5
-$as_echo_n "checking for XSM... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XSM_CFLAGS"; then
-        pkg_cv_XSM_CFLAGS="$XSM_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xt ice sm xaw7\"") >&5
-  ($PKG_CONFIG --exists --print-errors "x11 xt ice sm xaw7") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_XSM_CFLAGS=`$PKG_CONFIG --cflags "x11 xt ice sm xaw7" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$XSM_LIBS"; then
-        pkg_cv_XSM_LIBS="$XSM_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xt ice sm xaw7\"") >&5
-  ($PKG_CONFIG --exists --print-errors "x11 xt ice sm xaw7") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_XSM_LIBS=`$PKG_CONFIG --libs "x11 xt ice sm xaw7" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        XSM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xt ice sm xaw7"`
-        else
-	        XSM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xt ice sm xaw7"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XSM_PKG_ERRORS" >&5
-
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xt ice sm xaw7) were not met:
-
-$XSM_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 XSM_CFLAGS
-and XSM_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (x11 xt ice sm xaw7) were not met:
-
-$XSM_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 XSM_CFLAGS
-and XSM_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	{ { $as_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 XSM_CFLAGS
-and XSM_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables XSM_CFLAGS
-and XSM_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-	XSM_CFLAGS=$pkg_cv_XSM_CFLAGS
-	XSM_LIBS=$pkg_cv_XSM_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	:
-fi
-
-
-pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for APPDEFS" >&5
-$as_echo_n "checking for APPDEFS... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
-    if test -n "$APPDEFS_CFLAGS"; then
-        pkg_cv_APPDEFS_CFLAGS="$APPDEFS_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xt") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_APPDEFS_CFLAGS=`$PKG_CONFIG --cflags "xt" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$APPDEFS_LIBS"; then
-        pkg_cv_APPDEFS_LIBS="$APPDEFS_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xt\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xt") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_APPDEFS_LIBS=`$PKG_CONFIG --libs "xt" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-    fi
-else
-	pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        APPDEFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xt"`
-        else
-	        APPDEFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xt"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$APPDEFS_PKG_ERRORS" >&5
-
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (xt) were not met:
-
-$APPDEFS_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 APPDEFS_CFLAGS
-and APPDEFS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (xt) were not met:
-
-$APPDEFS_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 APPDEFS_CFLAGS
-and APPDEFS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	{ { $as_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 APPDEFS_CFLAGS
-and APPDEFS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables APPDEFS_CFLAGS
-and APPDEFS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-	APPDEFS_CFLAGS=$pkg_cv_APPDEFS_CFLAGS
-	APPDEFS_LIBS=$pkg_cv_APPDEFS_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-	:
-fi
-appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
-
-
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
   { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
@@ -4321,6 +4550,268 @@ $as_echo "$ac_cv_path_SED" >&6; }
 
 
 
+if  test "x$GCC" = xyes ; then
+    CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
+-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
+-Wbad-function-cast -Wformat=2"
+    case `$CC -dumpversion` in
+    3.4.* | 4.*)
+	CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
+	;;
+    esac
+else
+    { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5
+$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; }
+if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+#ifndef __SUNPRO_C
+  (void) __SUNPRO_C;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl___SUNPRO_C=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl___SUNPRO_C=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5
+$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; }
+if test $ac_cv_have_decl___SUNPRO_C = yes; then
+  SUNCC="yes"
+else
+  SUNCC="no"
+fi
+
+    if test "x$SUNCC" = "xyes"; then
+	CWARNFLAGS="-v"
+    fi
+fi
+
+
+
+# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89
+
+
+
+# Check whether --enable-strict-compilation was given.
+if test "${enable_strict_compilation+set}" = set; then
+  enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval
+else
+  STRICT_COMPILE=no
+fi
+
+if test "x$STRICT_COMPILE" = "xyes"; then
+	{ $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5
+$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; }
+if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+#ifndef __SUNPRO_C
+  (void) __SUNPRO_C;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl___SUNPRO_C=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl___SUNPRO_C=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5
+$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; }
+if test $ac_cv_have_decl___SUNPRO_C = yes; then
+  SUNCC="yes"
+else
+  SUNCC="no"
+fi
+
+	{ $as_echo "$as_me:$LINENO: checking whether __INTEL_COMPILER is declared" >&5
+$as_echo_n "checking whether __INTEL_COMPILER is declared... " >&6; }
+if test "${ac_cv_have_decl___INTEL_COMPILER+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+#ifndef __INTEL_COMPILER
+  (void) __INTEL_COMPILER;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_have_decl___INTEL_COMPILER=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_have_decl___INTEL_COMPILER=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___INTEL_COMPILER" >&5
+$as_echo "$ac_cv_have_decl___INTEL_COMPILER" >&6; }
+if test $ac_cv_have_decl___INTEL_COMPILER = yes; then
+  INTELCC="yes"
+else
+  INTELCC="no"
+fi
+
+	if test "x$GCC" = xyes ; then
+		STRICT_CFLAGS="-pedantic -Werror"
+	elif test "x$SUNCC" = "xyes"; then
+		STRICT_CFLAGS="-errwarn"
+    elif test "x$INTELCC" = "xyes"; then
+		STRICT_CFLAGS="-Werror"
+	fi
+fi
+CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
+_ACEOF
+
+	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
+	if test "x$PVM" = "x"; then
+		PVM="0"
+	fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MINOR $PVM
+_ACEOF
+
+	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
+	if test "x$PVP" = "x"; then
+		PVP="0"
+	fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_PATCHLEVEL $PVP
+_ACEOF
+
+
+
+CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
+mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
+|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
+echo 'git directory not found: installing possibly empty changelog.' >&2)"
+
+
+
+
+macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
+INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
+mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
+|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
+echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
+
+
+
+
+
+
 if test x$APP_MAN_SUFFIX = x    ; then
     APP_MAN_SUFFIX=1
 fi
@@ -4397,6 +4888,7 @@ MAN_SUBSTS="\
 	-e 's|__xservername__|Xorg|g' \
 	-e 's|__xconfigfile__|xorg.conf|g' \
 	-e 's|__projectroot__|\$(prefix)|g' \
+	-e 's|__apploaddir__|\$(appdefaultdir)|g' \
 	-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
 	-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
 	-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
@@ -4406,29 +4898,332 @@ MAN_SUBSTS="\
 
 
 
+AM_DEFAULT_VERBOSITY=1
 
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
+
+
+# Check whether --with-rsh was given.
+if test "${with_rsh+set}" = set; then
+  withval=$with_rsh;  rsh="$withval"
+else
+   rsh=${bindir}/ssh
+fi
+
+RSH=$rsh
+
+
+{ $as_echo "$as_me:$LINENO: checking for mkstemp" >&5
+$as_echo_n "checking for mkstemp... " >&6; }
+if test "${ac_cv_func_mkstemp+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define mkstemp to an innocuous variant, in case <limits.h> declares mkstemp.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define mkstemp innocuous_mkstemp
 
-	PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
-	if test "x$PVM" = "x"; then
-		PVM="0"
-	fi
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char mkstemp (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_MINOR $PVM
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef mkstemp
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char mkstemp ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_mkstemp || defined __stub___mkstemp
+choke me
+#endif
+
+int
+main ()
+{
+return mkstemp ();
+  ;
+  return 0;
+}
 _ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_mkstemp=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
-	PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
-	if test "x$PVP" = "x"; then
-		PVP="0"
-	fi
+	ac_cv_func_mkstemp=no
+fi
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION_PATCHLEVEL $PVP
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_mkstemp" >&5
+$as_echo "$ac_cv_func_mkstemp" >&6; }
+if test $ac_cv_func_mkstemp = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAS_MKSTEMP 1
+_ACEOF
+
+fi
+
+{ $as_echo "$as_me:$LINENO: checking for putenv" >&5
+$as_echo_n "checking for putenv... " >&6; }
+if test "${ac_cv_func_putenv+set}" = set; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define putenv to an innocuous variant, in case <limits.h> declares putenv.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define putenv innocuous_putenv
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char putenv (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef putenv
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char putenv ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_putenv || defined __stub___putenv
+choke me
+#endif
+
+int
+main ()
+{
+return putenv ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  ac_cv_func_putenv=yes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_func_putenv=no
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_putenv" >&5
+$as_echo "$ac_cv_func_putenv" >&6; }
+if test $ac_cv_func_putenv = yes; then
+  :
+else
+
+cat >>confdefs.h <<\_ACEOF
+#define NOPUTENV 1
+_ACEOF
+
+fi
+
+
+# Checks for pkg-config packages
+
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for XSM" >&5
+$as_echo_n "checking for XSM... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XSM_CFLAGS"; then
+        pkg_cv_XSM_CFLAGS="$XSM_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xt ice sm xaw7\"") >&5
+  ($PKG_CONFIG --exists --print-errors "x11 xt ice sm xaw7") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_XSM_CFLAGS=`$PKG_CONFIG --cflags "x11 xt ice sm xaw7" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XSM_LIBS"; then
+        pkg_cv_XSM_LIBS="$XSM_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xt ice sm xaw7\"") >&5
+  ($PKG_CONFIG --exists --print-errors "x11 xt ice sm xaw7") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_XSM_LIBS=`$PKG_CONFIG --libs "x11 xt ice sm xaw7" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        XSM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 xt ice sm xaw7"`
+        else
+	        XSM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 xt ice sm xaw7"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$XSM_PKG_ERRORS" >&5
+
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xt ice sm xaw7) were not met:
+
+$XSM_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 XSM_CFLAGS
+and XSM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+$as_echo "$as_me: error: Package requirements (x11 xt ice sm xaw7) were not met:
+
+$XSM_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 XSM_CFLAGS
+and XSM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+	{ { $as_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 XSM_CFLAGS
+and XSM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables XSM_CFLAGS
+and XSM_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+	XSM_CFLAGS=$pkg_cv_XSM_CFLAGS
+	XSM_LIBS=$pkg_cv_XSM_LIBS
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+	:
+fi
+
+xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
+
+# Check whether --with-appdefaultdir was given.
+if test "${with_appdefaultdir+set}" = set; then
+  withval=$with_appdefaultdir; appdefaultdir="$withval"
+else
+  appdefaultdir="${xt_appdefaultdir}"
+fi
+
 
 
 
@@ -4874,7 +5669,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 xsm $as_me 1.0.1, which was
+This file was extended by xsm $as_me 1.0.2, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4927,7 +5722,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-xsm config.status 1.0.1
+xsm config.status 1.0.2
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/app/xsm/configure.ac b/app/xsm/configure.ac
index e20f47811..fdc8cf194 100644
--- a/app/xsm/configure.ac
+++ b/app/xsm/configure.ac
@@ -21,55 +21,41 @@ dnl  PERFORMANCE OF THIS SOFTWARE.
 dnl
 dnl Process this file with autoconf to create configure.
 
-AC_PREREQ([2.57])
-AC_INIT(xsm,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xsm)
-AM_INIT_AUTOMAKE([dist-bzip2])
+AC_PREREQ([2.60])
+AC_INIT([xsm], [1.0.2],
+	[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xsm])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
 AM_CONFIG_HEADER(config.h)
 
-AC_PROG_CC
-AC_PROG_INSTALL
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
 
-RSH=
-if [[ -z $RSH ]] ; then
-   AC_PATH_PROG(RSH,rsh)
-fi
-if [[ -z $RSH ]] ; then
-   AC_PATH_PROG(RSH,rcmd)
-fi
-if [[ -z $RSH ]] ; then
-   AC_PATH_PROG(RSH,remsh)
-fi
-if [[ -z $RSH ]] ; then
-   AC_MSG_ERROR(No rsh like program found)
-fi
-
-#if !defined(RshCmd)
-#if SystemV
-#ifdef HPArchitecture
-#define RshCmd remsh
-#else
-#define RshCmd rcmd
-#endif
-#else
-#define RshCmd rsh
-#endif
-#endif
+AC_ARG_WITH(rsh, AS_HELP_STRING([--with-rsh=PATH],
+	    [Rsh command to use (default: $bindir/ssh)]),
+	    [ rsh="$withval"],
+	    [ rsh=${bindir}/ssh ])
+RSH=$rsh
+AC_SUBST(RSH)
 
 AC_CHECK_FUNC([mkstemp], 
-   AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the `mkstemp' function.]))
+   AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the 'mkstemp' function.]))
 AC_CHECK_FUNC([putenv], [],
-   AC_DEFINE(NOPUTENV,1,[Define to 1 if you DO NOT have the `putenv' function.]))
+   AC_DEFINE(NOPUTENV,1,[Define to 1 if you DO NOT have the 'putenv' function.]))
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XSM, x11 xt ice sm xaw7)
 
-PKG_CHECK_MODULES(APPDEFS, xt)
-appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
+AC_ARG_WITH(appdefaultdir,
+	AC_HELP_STRING([--with-appdefaultdir=<pathname>],
+	  [specify directory for app-defaults files (default is autodetected)]),
+	[appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
 AC_SUBST(appdefaultdir)
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
 
 AC_OUTPUT([Makefile])
diff --git a/app/xsm/globals.c b/app/xsm/globals.c
deleted file mode 100644
index 2d917d908..000000000
--- a/app/xsm/globals.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* $Xorg: globals.c,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $ */
-/******************************************************************************
-
-Copyright 1993, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-******************************************************************************/
-/* $XFree86: xc/programs/xsm/globals.c,v 1.5 2001/12/08 18:33:45 herrb Exp $ */
-
-#include <X11/ICE/ICEutil.h>
-
-int		Argc;
-char		**Argv;
-
-List		*RunningList;
-List		*PendingList;
-List		*RestartAnywayList;
-List		*RestartImmedList;
-
-List		*WaitForSaveDoneList;
-List		*InitialSaveList;
-List		*FailedSaveList;
-List		*WaitForInteractList;
-List		*WaitForPhase2List;
-
-Bool		wantShutdown = False;
-Bool		shutdownInProgress = False;
-Bool		phase2InProgress = False;
-Bool		saveInProgress = False;
-Bool		shutdownCancelled = False;
-
-Bool		verbose = False;
-
-char		*sm_id = NULL;
-
-char		*networkIds = NULL;
-char		*session_name = NULL;
-
-IceAuthDataEntry *authDataEntries = NULL;
-int		numTransports = 0;
-
-Bool		client_info_visible = False;
-Bool		client_prop_visible = False;
-Bool		client_log_visible = False;
-
-String 		*clientListNames = NULL;
-ClientRec	**clientListRecs = NULL;
-int		numClientListNames = 0;
-
-int		current_client_selected;
-
-int		sessionNameCount = 0;
-String		*sessionNamesShort = NULL;
-String		*sessionNamesLong = NULL;
-Bool		*sessionsLocked = NULL;
-
-int		num_clients_in_last_session = -1;
-
-char		**non_session_aware_clients = NULL;
-int		non_session_aware_count = 0;
-
-char		*display_env = NULL, *non_local_display_env = NULL;
-char		*session_env = NULL, *non_local_session_env = NULL;
-char		*audio_env = NULL;
-
-Bool		need_to_name_session = False;
-
-Bool		remote_allowed;
-
-XtAppContext	appContext;
-Widget		topLevel;
-
-XtSignalId	sig_term_id, sig_usr1_id;
diff --git a/app/xsm/info.c b/app/xsm/info.c
index f6e0b7434..728bbb3e9 100644
--- a/app/xsm/info.c
+++ b/app/xsm/info.c
@@ -43,26 +43,26 @@ in this Software without prior written authorization from The Open Group.
 static Pixmap checkBitmap;
 
 Widget clientInfoPopup;
-Widget   clientInfoForm;
-Widget     viewPropButton;
-Widget	   cloneButton;
-Widget	   killClientButton;
-Widget	   clientInfoDoneButton;
-Widget	   restartHintButton;
-Widget	     restartHintMenu;
-Widget		restartIfRunning;
-Widget		restartAnyway;
-Widget		restartImmediately;
-Widget		restartNever;
-Widget     clientListWidget;
-Widget	   noClientsLabel;
-Widget	   manualRestartLabel;
-Widget	   manualRestartCommands;
+static Widget   clientInfoForm;
+static Widget     viewPropButton;
+static Widget	   cloneButton;
+static Widget	   killClientButton;
+static Widget	   clientInfoDoneButton;
+static Widget	   restartHintButton;
+static Widget	     restartHintMenu;
+static Widget		restartIfRunning;
+static Widget		restartAnyway;
+static Widget		restartImmediately;
+static Widget		restartNever;
+Widget clientListWidget;
+static Widget noClientsLabel;
+Widget manualRestartLabel;
+Widget manualRestartCommands;
 
 Widget clientPropPopup;
-Widget   clientPropForm;
-Widget     clientPropDoneButton;
-Widget     clientPropTextWidget;
+static Widget clientPropForm;
+static Widget clientPropDoneButton;
+static Widget clientPropTextWidget;
 
 
 
@@ -108,15 +108,18 @@ AppendStr(Buffer *buffer, char *str)
     if ((buffer->bytesLeft - 1) < len)
     {
 	int newBufSize = buffer->bufSize + len + BUF_GROW_SIZE;
-	char *newbuf = (char *) malloc (newBufSize);
 	int bytesUsed = buffer->bufPtr - buffer->bufStart;
-	memcpy (newbuf, buffer->bufStart, bytesUsed);
-	newbuf[bytesUsed] = '\0';
-	free (buffer->bufStart);
-	buffer->bufStart = newbuf;
-	buffer->bufPtr = newbuf + bytesUsed;
-	buffer->bufSize = newBufSize;
-	buffer->bytesLeft = newBufSize - bytesUsed;
+	char *newbuf = realloc (buffer->bufStart, newBufSize);
+	if (newbuf != NULL) {
+	    newbuf[bytesUsed] = '\0';
+	    buffer->bufStart = newbuf;
+	    buffer->bufPtr = newbuf + bytesUsed;
+	    buffer->bufSize = newBufSize;
+	    buffer->bytesLeft = newBufSize - bytesUsed;
+	} else {
+	    perror("realloc failed, aborting");
+	    exit(1);
+	}
     }
 
     strcat (buffer->bufPtr, str);
@@ -165,7 +168,7 @@ DisplayProps(ClientRec *client)
 	    AppendStr (&buffer, pprop->type);
 	    AppendStr (&buffer, "\n");
 	    AppendStr (&buffer, "Num values:	");
-	    sprintf (number, "%d", ListCount (pprop->values));
+	    snprintf (number, sizeof(number), "%d", ListCount (pprop->values));
 	    AppendStr (&buffer, number);
 	    AppendStr (&buffer, "\n");
 
@@ -181,7 +184,7 @@ DisplayProps(ClientRec *client)
 		value = *card8;
 
 		AppendStr (&buffer, "Value 1:	");
-		sprintf (number, "%d", value);
+		snprintf (number, sizeof(number), "%d", value);
 		AppendStr (&buffer, number);
 
 		if (strcmp (pprop->name, SmRestartStyleHint) == 0)
@@ -208,7 +211,7 @@ DisplayProps(ClientRec *client)
 
 		    pval = (PropValue *) pj->thing;
 		    AppendStr (&buffer, "Value ");
-		    sprintf (number, "%d", propnum);
+		    snprintf (number, sizeof(number), "%d", propnum);
 		    AppendStr (&buffer, number);
 		    AppendStr (&buffer, ":	");
 		    AppendStr (&buffer, (char *) pval->value);
@@ -812,8 +815,8 @@ create_client_info_popup(void)
 	XtNleft, XawChainLeft,
 	XtNright, XawChainLeft,
         NULL);
-    
-    XtAddCallback (viewPropButton, XtNcallback, ViewPropXtProc, 0);
+
+    XtAddCallback (viewPropButton, XtNcallback, ViewPropXtProc, NULL);
 
 
     cloneButton = XtVaCreateManagedWidget (
@@ -825,8 +828,8 @@ create_client_info_popup(void)
 	XtNleft, XawChainLeft,
 	XtNright, XawChainLeft,
         NULL);
-    
-    XtAddCallback (cloneButton, XtNcallback, CloneXtProc, 0);
+
+    XtAddCallback (cloneButton, XtNcallback, CloneXtProc, NULL);
 
 
     killClientButton = XtVaCreateManagedWidget (
@@ -838,8 +841,8 @@ create_client_info_popup(void)
 	XtNleft, XawChainLeft,
 	XtNright, XawChainLeft,
         NULL);
-    
-    XtAddCallback (killClientButton, XtNcallback, KillClientXtProc, 0);
+
+    XtAddCallback (killClientButton, XtNcallback, KillClientXtProc, NULL);
 
 
     restartHintButton = XtVaCreateManagedWidget (
@@ -877,10 +880,10 @@ create_client_info_popup(void)
 	XtNleftMargin, 18,
 	NULL);
 
-    XtAddCallback (restartIfRunning, XtNcallback, RestartHintXtProc, 0);
-    XtAddCallback (restartAnyway, XtNcallback, RestartHintXtProc, 0);
-    XtAddCallback (restartImmediately, XtNcallback, RestartHintXtProc, 0);
-    XtAddCallback (restartNever, XtNcallback, RestartHintXtProc, 0);
+    XtAddCallback (restartIfRunning, XtNcallback, RestartHintXtProc, NULL);
+    XtAddCallback (restartAnyway, XtNcallback, RestartHintXtProc, NULL);
+    XtAddCallback (restartImmediately, XtNcallback, RestartHintXtProc, NULL);
+    XtAddCallback (restartNever, XtNcallback, RestartHintXtProc, NULL);
 
 
     clientInfoDoneButton = XtVaCreateManagedWidget (
@@ -893,7 +896,7 @@ create_client_info_popup(void)
 	XtNright, XawChainLeft,
         NULL);
 
-    XtAddCallback (clientInfoDoneButton, XtNcallback, listDoneXtProc, 0);
+    XtAddCallback (clientInfoDoneButton, XtNcallback, listDoneXtProc, NULL);
 
 
     clientListWidget = XtVaCreateManagedWidget (
@@ -907,7 +910,7 @@ create_client_info_popup(void)
 	XtNbottom, XawChainTop,
 	NULL);
 
-    XtAddCallback (clientListWidget, XtNcallback, ClientListXtProc, 0);
+    XtAddCallback (clientListWidget, XtNcallback, ClientListXtProc, NULL);
 
     noClientsLabel = XtVaCreateWidget (
 	"noClientsLabel", labelWidgetClass, clientInfoForm,
@@ -968,7 +971,7 @@ create_client_info_popup(void)
 	XtNright, XawChainLeft,
         NULL);
 
-    XtAddCallback (clientPropDoneButton, XtNcallback, clientPropDoneXtProc, 0);
+    XtAddCallback (clientPropDoneButton, XtNcallback, clientPropDoneXtProc, NULL);
 
 
     clientPropTextWidget = XtVaCreateManagedWidget (
diff --git a/app/xsm/info.h b/app/xsm/info.h
index c07f40445..3fb709c51 100644
--- a/app/xsm/info.h
+++ b/app/xsm/info.h
@@ -41,4 +41,10 @@ extern void ClientInfoXtProc(Widget w, XtPointer client_data,
 			     XtPointer callData);
 extern void create_client_info_popup(void);
 
+extern Widget clientInfoPopup;
+extern Widget clientPropPopup;
+extern Widget clientListWidget;
+extern Widget manualRestartLabel;
+extern Widget manualRestartCommands;
+
 #endif
diff --git a/app/xsm/list.c b/app/xsm/list.c
index 25d2647ca..fa09edc6a 100644
--- a/app/xsm/list.c
+++ b/app/xsm/list.c
@@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group.
 #include "xsm.h"
 
 List *
-ListInit()
+ListInit(void)
 {
 	List *l;
 
@@ -40,24 +40,21 @@ ListInit()
 }
 
 List *
-ListFirst(l)
-List *l;
+ListFirst(List *l)
 {
 	if(l->next->thing) return l->next;
 	else return NULL;
 }
 
 List *
-ListNext(l)
-List *l;
+ListNext(List *l)
 {
 	if(l->next->thing) return l->next;
 	else return NULL;
 }
 
 void
-ListFreeAll(l)
-List *l;
+ListFreeAll(List *l)
 {
 	char *thing;
 	List *next;
@@ -72,8 +69,7 @@ List *l;
 }
 
 void
-ListFreeAllButHead(l)
-List *l;
+ListFreeAllButHead(List *l)
 {
 	List *p, *next;
 
@@ -91,9 +87,7 @@ List *l;
 }
 
 List *
-ListAddFirst(l, v)
-List *l;
-char *v;
+ListAddFirst(List *l, char *v)
 {
 	List *e;
 
@@ -110,9 +104,7 @@ char *v;
 }
 
 List *
-ListAddLast(l, v)
-List *l;
-char *v;
+ListAddLast(List *l, char *v)
 {
 	List *e;
 
@@ -129,8 +121,7 @@ char *v;
 }
 
 void
-ListFreeOne(e)
-List *e;
+ListFreeOne(List *e)
 {
 	e->next->prev = e->prev;
 	e->prev->next = e->next;
@@ -139,9 +130,7 @@ List *e;
 
 
 Status
-ListSearchAndFreeOne(l,thing)
-List *l;
-char *thing;
+ListSearchAndFreeOne(List *l, char *thing)
 {
     	List *p;
 
@@ -157,8 +146,7 @@ char *thing;
 
 
 int
-ListCount(l)
-List *l;
+ListCount(List *l)
 {
 	int i;
 	List *e;
diff --git a/app/xsm/lock.c b/app/xsm/lock.c
index f4d3848cf..9a4553abb 100644
--- a/app/xsm/lock.c
+++ b/app/xsm/lock.c
@@ -31,14 +31,14 @@ in this Software without prior written authorization from The Open Group.
 #include <sys/types.h>
 
 
-static char *
+static const char *
 GetPath(void)
 {
-    char *path = (char *) getenv ("SM_SAVE_DIR");
+    const char *path = getenv ("SM_SAVE_DIR");
 
     if (!path)
     {
-	path = (char *) getenv ("HOME");
+	path = getenv ("HOME");
 	if (!path)
 	    path = ".";
     }
@@ -48,9 +48,9 @@ GetPath(void)
 
 
 Status
-LockSession(char *session_name, Bool write_id)
+LockSession(const char *session_name, Bool write_id)
 {
-    char *path;
+    const char *path;
     char lock_file[PATH_MAX];
     char temp_lock_file[PATH_MAX];
     Status status;
@@ -59,10 +59,13 @@ LockSession(char *session_name, Bool write_id)
     path = GetPath ();
 
 #ifndef __UNIXOS2__
-    sprintf (lock_file, "%s/.XSMlock-%s", path, session_name);
-    sprintf (temp_lock_file, "%s/.XSMtlock-%s", path, session_name);
+    snprintf (lock_file, sizeof(lock_file), "%s/.XSMlock-%s",
+	      path, session_name);
+    snprintf (temp_lock_file, sizeof(temp_lock_file), "%s/.XSMtlock-%s",
+	      path, session_name);
 #else
-    sprintf (temp_lock_file, "%s/%s.slk", path, session_name);
+    snprintf (temp_lock_file, sizeof(temp_lock_file), "%s/%s.slk",
+	      path, session_name);
 #endif
 
     if ((fd = creat (temp_lock_file, 0444)) < 0)
@@ -84,7 +87,7 @@ LockSession(char *session_name, Bool write_id)
     if (link (temp_lock_file, lock_file) < 0)
 	status = 0;
 
-    if (unlink (temp_lock_file) < 0)
+    if (remove (temp_lock_file) < 0)
 	status = 0;
 #else
     status = 0;
@@ -95,23 +98,24 @@ LockSession(char *session_name, Bool write_id)
 
 
 void
-UnlockSession(char *session_name)
+UnlockSession(const char *session_name)
 {
-    char *path;
+    const char *path;
     char lock_file[PATH_MAX];
 
     path = GetPath ();
 
-    sprintf (lock_file, "%s/.XSMlock-%s", path, session_name);
+    snprintf (lock_file, sizeof(lock_file), "%s/.XSMlock-%s",
+	      path, session_name);
 
-    unlink (lock_file);
+    remove (lock_file);
 }
 
 
 char *
-GetLockId(char *session_name)
+GetLockId(const char *session_name)
 {
-    char *path;
+    const char *path;
     FILE *fp;
     char lock_file[PATH_MAX];
     char buf[256];
@@ -119,7 +123,8 @@ GetLockId(char *session_name)
 
     path = GetPath ();
 
-    sprintf (lock_file, "%s/.XSMlock-%s", path, session_name);
+    snprintf (lock_file, sizeof(lock_file), "%s/.XSMlock-%s",
+	      path, session_name);
 
     if ((fp = fopen (lock_file, "r")) == NULL)
     {
@@ -137,7 +142,7 @@ GetLockId(char *session_name)
 
 
 Bool
-CheckSessionLocked(char *session_name, Bool get_id, char **id_ret)
+CheckSessionLocked(const char *session_name, Bool get_id, char **id_ret)
 {
     if (get_id)
 	*id_ret = GetLockId (session_name);
@@ -151,7 +156,7 @@ CheckSessionLocked(char *session_name, Bool get_id, char **id_ret)
 
 
 void
-UnableToLockSession(char *session_name)
+UnableToLockSession(const char *session_name)
 {
     /*
      * We should popup a dialog here giving error.
diff --git a/app/xsm/lock.h b/app/xsm/lock.h
index 19805ef5f..ca4eccfae 100644
--- a/app/xsm/lock.h
+++ b/app/xsm/lock.h
@@ -30,10 +30,10 @@ in this Software without prior written authorization from The Open Group.
 
 #include <X11/Xdefs.h>
 
-extern Status LockSession(char *session_name, Bool write_id);
-extern void UnlockSession(char* session_name);
-extern char * GetLockId(char *session_name);
-extern Bool CheckSessionLocked(char *session_name, Bool get_id, char **id_ret);
-extern void UnableToLockSession(char *session_name);
+extern Status LockSession(const char *session_name, Bool write_id);
+extern void UnlockSession(const char* session_name);
+extern char * GetLockId(const char *session_name);
+extern Bool CheckSessionLocked(const char *session_name, Bool get_id, char **id_ret);
+extern void UnableToLockSession(const char *session_name);
 
 #endif
diff --git a/app/xsm/log.c b/app/xsm/log.c
index 179f55f91..930c3f557 100644
--- a/app/xsm/log.c
+++ b/app/xsm/log.c
@@ -35,10 +35,10 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xaw/Command.h>
 #include <X11/Xaw/AsciiText.h>
 
-Widget logPopup;
-Widget   logForm;
-Widget	   logText;
-Widget	   logOkButton;
+static Widget logPopup;
+static Widget   logForm;
+static Widget	   logText;
+static Widget	   logOkButton;
 
 
 
@@ -146,5 +146,5 @@ create_log_popup(void)
 	XtNright, XawChainLeft,
         NULL);
 
-    XtAddCallback (logOkButton, XtNcallback, logOkXtProc, 0);
+    XtAddCallback (logOkButton, XtNcallback, logOkXtProc, NULL);
 }
diff --git a/app/xsm/mainwin.c b/app/xsm/mainwin.c
index ef7a96d33..f14748d65 100644
--- a/app/xsm/mainwin.c
+++ b/app/xsm/mainwin.c
@@ -43,8 +43,8 @@ Widget   clientInfoButton;
 Widget   logButton;
 Widget   checkPointButton;
 Widget   shutdownButton;
-Widget     shutdownMenu;
-Widget       shutdownSave;
+static Widget     shutdownMenu;
+static Widget       shutdownSave;
 Widget       shutdownDontSave;
 
 
@@ -80,7 +80,7 @@ create_main_window (void)
 	XtNjustify, XtJustifyLeft,
 	NULL);
 
-    XtAddCallback (clientInfoButton, XtNcallback, ClientInfoXtProc, 0);
+    XtAddCallback (clientInfoButton, XtNcallback, ClientInfoXtProc, NULL);
 
     logButton = XtVaCreateManagedWidget (
 	"logButton", commandWidgetClass, mainWindow,
@@ -90,7 +90,7 @@ create_main_window (void)
 	XtNjustify, XtJustifyLeft,
 	NULL);
 
-    XtAddCallback (logButton, XtNcallback, DisplayLogXtProc, 0);
+    XtAddCallback (logButton, XtNcallback, DisplayLogXtProc, NULL);
 
     checkPointButton = XtVaCreateManagedWidget (
 	"checkPointButton", commandWidgetClass, mainWindow,
@@ -100,7 +100,7 @@ create_main_window (void)
 	XtNjustify, XtJustifyLeft,
 	NULL);
 
-    XtAddCallback (checkPointButton, XtNcallback, CheckPointXtProc, 0);
+    XtAddCallback (checkPointButton, XtNcallback, CheckPointXtProc, NULL);
 
     shutdownButton = XtVaCreateManagedWidget (
 	"shutdownButton", menuButtonWidgetClass, mainWindow,
@@ -123,8 +123,8 @@ create_main_window (void)
 	"shutdownDontSave", smeBSBObjectClass, shutdownMenu,
 	NULL);
 
-    XtAddCallback (shutdownSave, XtNcallback, ShutdownSaveXtProc, 0);
-    XtAddCallback (shutdownDontSave, XtNcallback, ShutdownDontSaveXtProc, 0);
+    XtAddCallback (shutdownSave, XtNcallback, ShutdownSaveXtProc, NULL);
+    XtAddCallback (shutdownDontSave, XtNcallback, ShutdownDontSaveXtProc, NULL);
 
     XtAppAddActions (appContext, actions, XtNumber (actions));
 }
diff --git a/app/xsm/misc.c b/app/xsm/misc.c
index 544b50c40..0efa8e425 100644
--- a/app/xsm/misc.c
+++ b/app/xsm/misc.c
@@ -42,7 +42,6 @@ putenv(char *s)
 {
     char *v;
     int varlen, idx;
-    extern char **environ;
     char **newenv;
     static int virgin = 1; /* true while "environ" is a virgin */
 
diff --git a/app/xsm/mkinstalldirs b/app/xsm/mkinstalldirs
deleted file mode 100644
index 259dbfcd3..000000000
--- a/app/xsm/mkinstalldirs
+++ /dev/null
@@ -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:
diff --git a/app/xsm/popup.c b/app/xsm/popup.c
index e03ac8804..5c0ef971a 100644
--- a/app/xsm/popup.c
+++ b/app/xsm/popup.c
@@ -88,7 +88,7 @@ PopupPopup(Widget parent, Widget popup, Bool transient, Bool first_time,
 	}
 	else
 	{
-	    sprintf (geom, "+%d+%d", popup_x, popup_y);
+	    snprintf (geom, sizeof(geom), "+%d+%d", popup_x, popup_y);
 
 	    XtVaSetValues (popup,
 	        XtNgeometry, geom,
@@ -160,7 +160,7 @@ PopupPopup(Widget parent, Widget popup, Bool transient, Bool first_time,
 
 		XtUnrealizeWidget (popup);
 
-		sprintf (geom, "+%d+%d", popup_x, popup_y);
+		snprintf (geom, sizeof(geom), "+%d+%d", popup_x, popup_y);
 
 		XtVaSetValues (popup,
 	            XtNgeometry, geom,
diff --git a/app/xsm/printhex.c b/app/xsm/printhex.c
index b411f9ead..f14ab8b66 100644
--- a/app/xsm/printhex.c
+++ b/app/xsm/printhex.c
@@ -24,7 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 ******************************************************************************/
 
-#include <stdio.h>
+#include "xsm.h"
 
 static char *hex_table[] = {		/* for printing hex digits */
     "00", "01", "02", "03", "04", "05", "06", "07", 
@@ -63,12 +63,7 @@ static char *hex_table[] = {		/* for printing hex digits */
 
 
 void
-fprintfhex (fp, len, cp)
-
-register FILE 	*fp;
-unsigned int 	len;
-char 		*cp;
-
+fprintfhex(register FILE *fp, unsigned int len, char *cp)
 {
     unsigned char *ucp = (unsigned char *) cp;
 
diff --git a/app/xsm/prop.c b/app/xsm/prop.c
index 2e0958d8c..b5ebac84b 100644
--- a/app/xsm/prop.c
+++ b/app/xsm/prop.c
@@ -30,8 +30,6 @@ in this Software without prior written authorization from The Open Group.
 #include "prop.h"
 #include <X11/Xaw/List.h>
 
-extern Widget clientListWidget;
-
 
 void
 FreePropValues(List *propValues)
diff --git a/app/xsm/remote.c b/app/xsm/remote.c
index f161f96f2..76cde303c 100644
--- a/app/xsm/remote.c
+++ b/app/xsm/remote.c
@@ -32,13 +32,8 @@ in this Software without prior written authorization from The Open Group.
 #include "xsm.h"
 #include "log.h"
 
-#include <X11/ICE/ICEutil.h>
-
 static char 		*format_rstart_env(char *str);
 
-extern IceAuthDataEntry	*authDataEntries;
-extern int		numTransports;
-
 
 void
 remote_start(char *restart_protocol, char *restart_machine, char *program, 
@@ -70,8 +65,9 @@ remote_start(char *restart_protocol, char *restart_machine, char *program,
 
     if (pipe (pipefd) < 0)
     {
-	sprintf (msg, "%s: pipe() error during remote start of %s",
-	    Argv[0], program);
+	snprintf (msg, sizeof(msg),
+		  "%s: pipe() error during remote start of %s",
+		  Argv[0], program);
 	add_log_text (msg);
 	perror (msg);
     }
@@ -81,8 +77,9 @@ remote_start(char *restart_protocol, char *restart_machine, char *program,
 	{
 	case -1:
 
-	    sprintf (msg, "%s: fork() error during remote start of %s",
-		Argv[0], program);
+	    snprintf (msg, sizeof(msg),
+		      "%s: fork() error during remote start of %s",
+		      Argv[0], program);
 	    add_log_text (msg);
 	    perror (msg);
 	    break;
@@ -96,9 +93,9 @@ remote_start(char *restart_protocol, char *restart_machine, char *program,
 
 	    execlp (RSHCMD, restart_machine, "rstartd", (char *) 0);
 
-	    sprintf (msg,
-	        "%s: execlp() of rstartd failed for remote start of %s",
-		Argv[0], program);
+	    snprintf (msg, sizeof(msg),
+		      "%s: execlp() of rstartd failed for remote start of %s",
+		      Argv[0], program);
 	    perror (msg);
 	    /*
 	     * TODO : We would like to send this log information to the
@@ -228,8 +225,8 @@ format_rstart_env(char *str)
 	{
 	    if (!isgraph (*temp) || *temp == '\\')
 	    {
-		char octal[3];
-		sprintf (octal, "%o", *temp);
+		char octal[4];
+		snprintf (octal, sizeof(octal), "%o", *temp);
 		*(ptr++) = '\\';
 		for (i = 0; i < (3 - (int) strlen (octal)); i++)
 		    *(ptr++) = '0';
diff --git a/app/xsm/restart.c b/app/xsm/restart.c
index 896d8d4ee..0cd771416 100644
--- a/app/xsm/restart.c
+++ b/app/xsm/restart.c
@@ -30,8 +30,6 @@ in this Software without prior written authorization from The Open Group.
 #include "restart.h"
 #include "saveutil.h"
 
-extern char **environ;
-
 
 /*
  * Until XSMP provides a better way to know which clients are "managers",
@@ -247,7 +245,7 @@ Restart(int flag)
 		 * The client is being restarted on the local machine.
 		 */
 
-		sprintf (logtext, "Restarting locally : ");
+		snprintf (logtext, sizeof(logtext), "Restarting locally : ");
 		for (pp = args; *pp; pp++)
 		{
 		    strcat (logtext, *pp);
@@ -259,8 +257,8 @@ Restart(int flag)
 
 		switch(fork()) {
 		case -1:
-		    sprintf (logtext,
-			"%s: Can't fork() %s", Argv[0], program);
+		    snprintf (logtext, sizeof(logtext),
+			      "%s: Can't fork() %s", Argv[0], program);
 		    add_log_text (logtext);
 		    perror (logtext);
 		    break;
@@ -268,8 +266,8 @@ Restart(int flag)
 		    chdir(cwd);
 		    if(env) environ = env;
 		    execvp(program, args);
-		    sprintf (logtext, "%s: Can't execvp() %s",
-			Argv[0], program);
+		    snprintf (logtext, sizeof(logtext),
+			      "%s: Can't execvp() %s", Argv[0], program);
 		    perror (logtext);
 		    /*
 		     * TODO : We would like to send this log information to the
@@ -296,8 +294,8 @@ Restart(int flag)
 		 * The client is being restarted on a remote machine.
 		 */
 
-		sprintf (logtext, "Restarting remotely on %s : ",
-		    restart_machine);
+		snprintf (logtext, sizeof(logtext),
+			  "Restarting remotely on %s : ", restart_machine);
 		for (pp = args; *pp; pp++)
 		{
 		    strcat (logtext, *pp);
@@ -447,7 +445,8 @@ Clone(ClientRec *client, Bool useSavedState)
 
 	    switch(fork()) {
 	    case -1:
-		sprintf (msg, "%s: Can't fork() %s", Argv[0], program);
+		snprintf (msg, sizeof(msg),
+			  "%s: Can't fork() %s", Argv[0], program);
 		add_log_text (msg);
 		perror (msg);
 		break;
@@ -455,7 +454,8 @@ Clone(ClientRec *client, Bool useSavedState)
 		chdir(cwd);
 		if(env) environ = env;
 		execvp(program, args);
-		sprintf (msg, "%s: Can't execvp() %s", Argv[0], program);
+		snprintf (msg, sizeof(msg),
+			  "%s: Can't execvp() %s", Argv[0], program);
 		perror (msg);
 		/*
 		 * TODO : We would like to send this log information to the
@@ -528,7 +528,7 @@ StartDefaultApps (void)
     home = (char *) getenv ("HOME");
     if (!home)
 	home = ".";
-    sprintf (filename, "%s/.xsmstartup", home);
+    snprintf (filename, sizeof(filename), "%s/.xsmstartup", home);
 
     f = fopen (filename, "r");
 
@@ -556,7 +556,7 @@ StartDefaultApps (void)
 	if ((p = strchr (buf, '\n')))
 	    *p = '\0';
 
-	sprintf (logtext, "Starting locally : %s\n", buf);
+	snprintf (logtext, sizeof(logtext), "Starting locally : %s\n", buf);
 	add_log_text (logtext);
 
 	len = strlen (buf);
@@ -589,7 +589,7 @@ StartNonSessionAwareApps(void)
 	 * byte for this.
 	 */
 
-	sprintf (logtext, "Restarting locally : %s\n",
+	snprintf (logtext, sizeof(logtext), "Restarting locally : %s\n",
 	    non_session_aware_clients[i]);
 	add_log_text (logtext);
 
diff --git a/app/xsm/save.c b/app/xsm/save.c
index 5d06877ad..1c40d72a6 100644
--- a/app/xsm/save.c
+++ b/app/xsm/save.c
@@ -41,42 +41,36 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xaw/AsciiText.h>
 
 
-Widget savePopup;
-Widget   saveForm;
-Widget	   saveMessageLabel;
-Widget	   saveName;
-Widget	   saveTypeLabel;
-Widget	   saveTypeGlobal;
-Widget	   saveTypeLocal;
-Widget	   saveTypeBoth;
-Widget	   interactStyleLabel;
-Widget	   interactStyleNone;
-Widget	   interactStyleErrors;
-Widget	   interactStyleAny;
-Widget	   saveOkButton;
-Widget     helpSaveButton;
-Widget	   saveCancelButton;
-Widget helpPopup;
-Widget   helpForm;
-Widget     helpSaveText;
-Widget     helpSaveOkButton;
-Widget nameInUsePopup;
-Widget   nameInUseForm;
-Widget	   nameInUseLabel;
-Widget     nameInUseOverwriteButton;
-Widget	   nameInUseCancelButton;
-Widget badSavePopup;
-Widget   badSaveForm;
-Widget	   badSaveLabel;
-Widget     badSaveOkButton;
-Widget	   badSaveCancelButton;
-Widget     badSaveListWidget;
-
-extern Widget clientInfoPopup;
-extern Widget clientPropPopup;
-extern Widget nameSessionPopup;
-
-extern int checkpoint_from_signal;
+static Widget savePopup;
+static Widget   saveForm;
+static Widget	   saveMessageLabel;
+static Widget	   saveName;
+static Widget	   saveTypeLabel;
+static Widget	   saveTypeGlobal;
+static Widget	   saveTypeLocal;
+static Widget	   saveTypeBoth;
+static Widget	   interactStyleLabel;
+static Widget	   interactStyleNone;
+static Widget	   interactStyleErrors;
+static Widget	   interactStyleAny;
+static Widget	   saveOkButton;
+static Widget     helpSaveButton;
+static Widget	   saveCancelButton;
+static Widget helpPopup;
+static Widget   helpForm;
+static Widget     helpSaveText;
+static Widget     helpSaveOkButton;
+static Widget nameInUsePopup;
+static Widget   nameInUseForm;
+static Widget	   nameInUseLabel;
+static Widget     nameInUseOverwriteButton;
+static Widget	   nameInUseCancelButton;
+static Widget badSavePopup;
+static Widget   badSaveForm;
+static Widget	   badSaveLabel;
+static Widget     badSaveOkButton;
+static Widget	   badSaveCancelButton;
+static Widget     badSaveListWidget;
 
 static int saveTypeData[] = {
 	SmSaveLocal,
@@ -147,7 +141,7 @@ MakeCurrentSession(String new_name, Bool name_changed)
 
     LockSession (session_name, True);
 
-    sprintf (title, "xsm: %s", session_name);
+    snprintf (title, sizeof(title), "xsm: %s", session_name);
 
     XtVaSetValues (topLevel,
 	XtNtitle, title,
@@ -413,7 +407,7 @@ SaveOkXtProc(Widget w, XtPointer client_data, XtPointer callData)
 	    {
 		name_locked = True;
 
-		sprintf (label, "Another session by the name '%s' is active.\nChoose another name for the session.", name);
+		snprintf (label, sizeof(label), "Another session by the name '%s' is active.\nChoose another name for the session.", name);
 
 		XtUnmanageChild (nameInUseOverwriteButton);
 
@@ -959,8 +953,8 @@ create_save_popup(void)
         XtNvertDistance, 20,
 	XtNresizable, True,
         NULL);
-    
-    XtAddCallback (saveOkButton, XtNcallback, SaveOkXtProc, 0);
+
+    XtAddCallback (saveOkButton, XtNcallback, SaveOkXtProc, NULL);
 
 
     helpSaveButton = XtVaCreateManagedWidget (
@@ -970,7 +964,7 @@ create_save_popup(void)
         XtNvertDistance, 20,
 	NULL);
 
-    XtAddCallback (helpSaveButton, XtNcallback, HelpSaveXtProc, 0);
+    XtAddCallback (helpSaveButton, XtNcallback, HelpSaveXtProc, NULL);
 
 
     saveCancelButton = XtVaCreateManagedWidget (
@@ -980,7 +974,7 @@ create_save_popup(void)
         XtNvertDistance, 20,
         NULL);
 
-    XtAddCallback (saveCancelButton, XtNcallback, SaveCancelXtProc, 0);
+    XtAddCallback (saveCancelButton, XtNcallback, SaveCancelXtProc, NULL);
 
     XtSetKeyboardFocus (saveForm, saveName);
 
@@ -1027,7 +1021,7 @@ create_save_popup(void)
         NULL);
     
     XtAddCallback (nameInUseOverwriteButton, XtNcallback,
-	NameInUseOverwriteXtProc, 0);
+	NameInUseOverwriteXtProc, NULL);
 
 
     nameInUseCancelButton = XtVaCreateManagedWidget (
@@ -1040,7 +1034,7 @@ create_save_popup(void)
         NULL);
     
     XtAddCallback (nameInUseCancelButton, XtNcallback,
-	NameInUseCancelXtProc, 0);
+	NameInUseCancelXtProc, NULL);
 
 
     /*
@@ -1074,7 +1068,7 @@ create_save_popup(void)
         NULL);
     
     XtAddCallback (helpSaveOkButton, XtNcallback,
-	HelpSaveOkXtProc, 0);
+	HelpSaveOkXtProc, NULL);
 
 
     /*
@@ -1111,7 +1105,7 @@ create_save_popup(void)
 	XtNbottom, XawChainBottom,
 	NULL);
 
-    XtAddCallback (badSaveListWidget, XtNcallback, BadSaveListXtProc, 0);
+    XtAddCallback (badSaveListWidget, XtNcallback, BadSaveListXtProc, NULL);
 
     badSaveOkButton = XtVaCreateManagedWidget (
 	"badSaveOkButton", commandWidgetClass, badSaveForm,
@@ -1120,8 +1114,8 @@ create_save_popup(void)
 	XtNtop, XawChainBottom,
 	XtNbottom, XawChainBottom,
         NULL);
-    
-    XtAddCallback (badSaveOkButton, XtNcallback, BadSaveOkXtProc, 0);
+
+    XtAddCallback (badSaveOkButton, XtNcallback, BadSaveOkXtProc, NULL);
 
 
     badSaveCancelButton = XtVaCreateManagedWidget (
@@ -1131,8 +1125,8 @@ create_save_popup(void)
 	XtNtop, XawChainBottom,
 	XtNbottom, XawChainBottom,
         NULL);
-    
-    XtAddCallback (badSaveCancelButton, XtNcallback, BadSaveCancelXtProc, 0);
+
+    XtAddCallback (badSaveCancelButton, XtNcallback, BadSaveCancelXtProc, NULL);
 
     XtInstallAllAccelerators (badSaveForm, badSaveForm);
 }
diff --git a/app/xsm/saveutil.c b/app/xsm/saveutil.c
index 0e8178577..19c051b3b 100644
--- a/app/xsm/saveutil.c
+++ b/app/xsm/saveutil.c
@@ -28,10 +28,9 @@ in this Software without prior written authorization from The Open Group.
 #include "xsm.h"
 #include "log.h"
 #include "saveutil.h"
+#include "info.h"
 
-char 		 session_save_file[PATH_MAX];
-
-extern Widget manualRestartCommands;
+static char 		 session_save_file[PATH_MAX];
 
 
 void
@@ -47,9 +46,8 @@ set_session_save_file_name(char *session_name)
 	    p = ".";
     }
 
-    strcpy (session_save_file, p);
-    strcat (session_save_file, "/.XSM-");
-    strcat (session_save_file, session_name);
+    snprintf (session_save_file, sizeof(session_save_file),
+	      "%s/.XSM-%s", p, session_name);
 }
 
 
@@ -314,8 +312,8 @@ WriteSave(char *sm_id)
     {
 	char msg[256];
 
-	sprintf (msg, "%s: Error creating session save file %s", 
-	    Argv[0], session_save_file);
+	snprintf (msg, sizeof(msg), "%s: Error creating session save file %s", 
+		  Argv[0], session_save_file);
 	add_log_text (msg);
 	perror (msg);
     }
@@ -426,7 +424,7 @@ DeleteSession(char *session_name)
 	    dir = ".";
     }
 
-    sprintf (filename, "%s/.XSM-%s", dir, session_name);
+    snprintf (filename, sizeof(filename), "%s/.XSM-%s", dir, session_name);
 
     f = fopen(filename, "r");
     if(!f) {
@@ -510,7 +508,7 @@ DeleteSession(char *session_name)
     if (buf)
 	free (buf);
 
-    return ((unlink (filename) == -1) ? 0 : 1);
+    return ((remove (filename) == -1) ? 0 : 1);
 }
 
 
diff --git a/app/xsm/signals.c b/app/xsm/signals.c
index 9be9babb1..5757e0ccc 100644
--- a/app/xsm/signals.c
+++ b/app/xsm/signals.c
@@ -98,15 +98,13 @@ in this Software without prior written authorization from The Open Group.
 
 #include <stddef.h>
 
-int checkpoint_from_signal = 0;
+#include "xsm.h"
 
-extern XtSignalId sig_term_id, sig_usr1_id;
-extern Bool wantShutdown;
+int checkpoint_from_signal = 0;
 
 
-SIGVAL (*Signal (sig, handler))()
-    int sig;
-    SIGVAL (*handler)();
+static SIGVAL
+Signal(int sig, SIGVAL (*handler)(int))
 {
 #ifndef X_NOT_POSIX
     struct sigaction sigact, osigact;
@@ -114,15 +112,20 @@ SIGVAL (*Signal (sig, handler))()
     sigemptyset(&sigact.sa_mask);
     sigact.sa_flags = 0;
     sigaction(sig, &sigact, &osigact);
+#  if defined(SIGNALRETURNSINT)
     return osigact.sa_handler;
+#  endif
 #else
-    return signal(sig, handler);
+#  if defined(SIGNALRETURNSINT)
+    return
+#  endif
+    signal(sig, handler);
 #endif
 }
 
 
 void
-sig_child_handler (XtPointer closure, XtSignalId id)
+sig_child_handler (int sig)
 
 {
     int pid, olderrno = errno;
@@ -231,10 +234,7 @@ register_signals (XtAppContext appContext)
 
 
 int
-execute_system_command (s)
-
-char *s;
-
+execute_system_command (char *s)
 {
     int stat;
 
diff --git a/app/xsm/xsm.c b/app/xsm/xsm.c
index 15304baf5..1d377bc2b 100644
--- a/app/xsm/xsm.c
+++ b/app/xsm/xsm.c
@@ -34,7 +34,6 @@ in this Software without prior written authorization from The Open Group.
  */
 
 #include "xsm.h"
-#include "globals.c"
 #include "xtwatch.h"
 #include "prop.h"
 #include "choose.h"
@@ -51,8 +50,71 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xatom.h>
 #include <X11/Xaw/List.h>
 
-Atom wmStateAtom;
-Atom wmDeleteAtom;
+int		Argc;
+char		**Argv;
+
+List		*RunningList;
+List		*PendingList;
+List		*RestartAnywayList;
+List		*RestartImmedList;
+
+List		*WaitForSaveDoneList;
+static List	*InitialSaveList;
+List		*FailedSaveList;
+List		*WaitForInteractList;
+List		*WaitForPhase2List;
+
+Bool		wantShutdown = False;
+Bool		shutdownInProgress = False;
+Bool		phase2InProgress = False;
+Bool		saveInProgress = False;
+Bool		shutdownCancelled = False;
+
+Bool		verbose = False;
+
+char		*sm_id = NULL;
+
+char		*networkIds = NULL;
+char		*session_name = NULL;
+
+IceAuthDataEntry *authDataEntries = NULL;
+int		numTransports = 0;
+
+Bool		client_info_visible = False;
+Bool		client_prop_visible = False;
+Bool		client_log_visible = False;
+
+String 		*clientListNames = NULL;
+ClientRec	**clientListRecs = NULL;
+int		numClientListNames = 0;
+
+int		current_client_selected;
+
+int		sessionNameCount = 0;
+String		*sessionNamesShort = NULL;
+String		*sessionNamesLong = NULL;
+Bool		*sessionsLocked = NULL;
+
+int		num_clients_in_last_session = -1;
+
+char		**non_session_aware_clients = NULL;
+int		non_session_aware_count = 0;
+
+char		*display_env = NULL, *non_local_display_env = NULL;
+char		*session_env = NULL, *non_local_session_env = NULL;
+char		*audio_env = NULL;
+
+Bool		need_to_name_session = False;
+
+Bool		remote_allowed;
+
+XtAppContext	appContext;
+Widget		topLevel;
+
+XtSignalId	sig_term_id, sig_usr1_id;
+
+static Atom wmStateAtom;
+static Atom wmDeleteAtom;
 static char *cmd_line_display = NULL;
 
 /*
@@ -88,20 +150,6 @@ static void MyIoErrorHandler(IceConn ice_conn);
 static void InstallIOErrorHandler(void);
 static void CloseListeners(void);
 
-/*
- * Extern declarations
- */
-
-extern Widget clientInfoPopup;
-extern Widget clientPropPopup;
-extern Widget clientInfoButton;
-extern Widget logButton;
-extern Widget checkPointButton;
-extern Widget shutdownButton;
-extern Widget clientListWidget;
-extern Widget savePopup;
-
-extern int checkpoint_from_signal;
 
 static IceListenObj *listenObjs;
 
@@ -358,7 +406,8 @@ SetWM_DELETE_WINDOW(Widget widget, String delAction)
 {
     char translation[64];
 
-    sprintf (translation, "<Message>WM_PROTOCOLS: %s", delAction);
+    snprintf (translation, sizeof(translation),
+	      "<Message>WM_PROTOCOLS: %s", delAction);
     XtOverrideTranslations (widget, XtParseTranslationTable (translation));
 
     XSetWMProtocols (XtDisplay(widget), XtWindow (widget),
@@ -388,7 +437,7 @@ GetEnvironment(void)
 	 * display environment we give it has the SM's hostname.
 	 */
 
-	if ((temp = strchr (p, '/')) == 0)
+	if ((temp = strchr (p, '/')) == NULL)
 	    temp = p;
 	else
 	    temp++;
@@ -495,7 +544,7 @@ StartSession(char *name, Bool use_default)
      * Set the main window's title to the session name.
      */
 
-    sprintf (title, "xsm: %s", name);
+    snprintf (title, sizeof(title), "xsm: %s", name);
 
     XtVaSetValues (topLevel,
 	XtNtitle, title,		/* session name */
diff --git a/app/xsm/xsm.h b/app/xsm/xsm.h
index cf48cb207..75e7479b0 100644
--- a/app/xsm/xsm.h
+++ b/app/xsm/xsm.h
@@ -70,6 +70,8 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/StringDefs.h>
 #include <X11/Intrinsic.h>
 
+#include <X11/ICE/ICEutil.h>
+
 #include <X11/SM/SMlib.h>
 
 #include "list.h"
@@ -122,6 +124,8 @@ typedef struct _PropValue {
 } PropValue;
 
 
+extern char		**environ;
+
 extern int		Argc;
 extern char		**Argv;
 
@@ -140,6 +144,9 @@ extern char		*sm_id;
 extern char		*networkIds;
 extern char		*session_name;
 
+extern IceAuthDataEntry *authDataEntries;
+extern int		numTransports;
+
 extern List		*RunningList;
 extern List		*PendingList;
 extern List		*RestartAnywayList;
@@ -177,6 +184,13 @@ extern int		non_session_aware_count;
 extern XtAppContext	appContext;
 extern Widget		topLevel;
 extern Widget		mainWindow;
+extern Widget		clientInfoButton;
+extern Widget		logButton;
+extern Widget		checkPointButton;
+extern Widget		shutdownButton;
+extern Widget		shutdownDontSave;
+
+extern XtSignalId	sig_term_id, sig_usr1_id;
 
 extern void fprintfhex(FILE *fp, unsigned int len, char *cp);
 extern Status StartSession(char *name, Bool use_default);
@@ -186,6 +200,7 @@ extern void SetAllSensitive(Bool on);
 extern void FreeClient(ClientRec *client, Bool freeProps);
 extern void CloseDownClient(ClientRec *client);
 
+
 /* misc.c */
 extern int strbw(char *a, char *b);
 extern void nomem(void);
@@ -210,12 +225,16 @@ extern void remote_start(char *restart_protocol, char *restart_machine,
 			 char *non_local_session_env );
 
 /* signals.c */
-extern void sig_child_handler(void);
-extern void sig_term_handler(void);
-extern void sig_usr1_handler(void);
+extern void sig_child_handler(int sig);
+extern void sig_term_handler(int sig);
+extern void sig_usr1_handler(int sig);
+extern void xt_sig_term_handler(XtPointer closure, XtSignalId *id);
+extern void xt_sig_usr1_handler(XtPointer closure, XtSignalId *id);
 extern void register_signals(XtAppContext);
 extern int execute_system_command(char *s);
 
+extern int checkpoint_from_signal;
+
 #ifdef XKB
 #include <X11/extensions/XKBbells.h>
 #endif
author	Matthieu Herrb <matthieu@cvs.openbsd.org>	2010-10-31 20:17:59 +0000
committer	Matthieu Herrb <matthieu@cvs.openbsd.org>	2010-10-31 20:17:59 +0000
commit	1eaf7ae9d7ff2adf3249176c155ae66dea08ecc3 (patch)
tree	d020778c6956a535dd35a4626b7857b36b775c20 /app/xsm
parent	0aea447cde00cd16718571f752213425ba2b2d23 (diff)