[Pkg-wmaker-commits] [wmfsm] 04/83: Imported Debian patch 0.34-6

Doug Torrance dtorrance-guest at moszumanska.debian.org
Sun Aug 23 14:05:39 UTC 2015


This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmfsm.

commit 1f01731ff45549510b1ff9b85d2cab460f251edb
Merge: d65d23f fe26104
Author: Arthur Korn <arthur at korn.ch>
Date:   Wed Aug 25 01:29:58 2004 +0200

    Imported Debian patch 0.34-6

 ChangeLog                  |  136 +-
 ChangeLog => ChangeLog.old |    0
 Makefile.am                |    1 +
 Makefile.in                |  420 +--
 aclocal.m4                 |  880 +++++-
 config.guess               | 1047 ++++---
 config.h.in                |  344 ++-
 config.sub                 |  529 +++-
 configure                  | 7292 +++++++++++++++++++++++++++++++++-----------
 configure.in               |    2 +-
 debian/changelog           |   52 +
 debian/compat              |    1 +
 debian/control             |    4 +-
 debian/copyright           |    4 +-
 debian/menu                |    4 +-
 debian/rules               |   24 +-
 debian/watch               |    5 -
 depcomp                    |  423 +++
 stamp-h.in                 |    1 -
 wmfsm/Makefile.in          |  375 ++-
 wmfsm/wmfsm.1              |  167 +-
 wmfsm/wmfsm.c              |  813 ++---
 wmfsm/wmfsmrc.sample       |   11 +-
 wmgeneral/Makefile.in      |  304 +-
 24 files changed, 9434 insertions(+), 3405 deletions(-)

diff --cc Makefile.in
index 5e37d6a,fe56b13..dcc9886
--- a/Makefile.in
+++ b/Makefile.in
@@@ -1,6 -1,8 +1,8 @@@
- # Makefile.in generated automatically by automake 1.4 from Makefile.am
 -# Makefile.in generated by automake 1.6.2 from Makefile.am.
++# Makefile.in generated by automake 1.6.3 from Makefile.am.
+ # @configure_input@
  
- # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+ # Free Software Foundation, Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
@@@ -70,61 -89,55 +89,56 @@@ subdir = 
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = 
- DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
- Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess \
- config.h.in config.sub configure configure.in install-sh missing \
- mkinstalldirs
- 
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ CONFIG_CLEAN_FILES =
+ DIST_SOURCES =
+ 
+ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+ 	uninstall-info-recursive all-recursive install-data-recursive \
+ 	install-exec-recursive installdirs-recursive install-recursive \
+ 	uninstall-recursive check-recursive installcheck-recursive
+ DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
+ 	Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess \
+ 	config.h.in config.sub configure configure.in depcomp \
+ 	install-sh missing mkinstalldirs
+ DIST_SUBDIRS = $(SUBDIRS)
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
- TAR = tar
- GZIP_ENV = --best
- all: all-redirect
  .SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
  
- Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log
++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
++ configure.lineno
+ $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+ 	  $(AUTOMAKE) --gnu  Makefile
+ Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
  
- $(ACLOCAL_M4):  configure.in 
- 	cd $(srcdir) && $(ACLOCAL)
- 
- config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
- $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+ $(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
  	cd $(srcdir) && $(AUTOCONF)
  
- config.h: stamp-h
- 	@if test ! -f $@; then \
- 		rm -f stamp-h; \
- 		$(MAKE) stamp-h; \
- 	else :; fi
- stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
- 	     $(SHELL) ./config.status
- 	@echo timestamp > stamp-h 2> /dev/null
- $(srcdir)/config.h.in: $(srcdir)/stamp-h.in
+ $(ACLOCAL_M4):  configure.in 
+ 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ 
+ config.h: stamp-h1
  	@if test ! -f $@; then \
- 		rm -f $(srcdir)/stamp-h.in; \
- 		$(MAKE) $(srcdir)/stamp-h.in; \
+ 	  rm -f stamp-h1; \
+ 	  $(MAKE) stamp-h1; \
  	else :; fi
- $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
- 	cd $(top_srcdir) && $(AUTOHEADER)
- 	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
  
- mostlyclean-hdr:
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ 	@rm -f stamp-h1
+ 	cd $(top_builddir) && $(SHELL) ./config.status config.h
  
- clean-hdr:
+ $(srcdir)/config.h.in:  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h
+ 	cd $(top_srcdir) && $(AUTOHEADER)
+ 	touch $(srcdir)/config.h.in
  
  distclean-hdr:
- 	-rm -f config.h
- 
- maintainer-clean-hdr:
+ 	-rm -f config.h stamp-h1
+ uninstall-info-am:
  
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
diff --cc aclocal.m4
index db10dbf,6b75f06..da8fd14
--- a/aclocal.m4
+++ b/aclocal.m4
@@@ -1,70 -1,266 +1,266 @@@
- dnl aclocal.m4 generated automatically by aclocal 1.4
- 
- dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
- dnl gives unlimited permission to copy and/or distribute it,
- dnl with or without modifications, as long as this notice is preserved.
- 
- dnl This program is distributed in the hope that it will be useful,
- dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
- dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- dnl PARTICULAR PURPOSE.
- 
- # Like AC_CONFIG_HEADER, but automatically create stamp file.
- 
- AC_DEFUN(AM_CONFIG_HEADER,
- [AC_PREREQ([2.12])
- AC_CONFIG_HEADER([$1])
- dnl When config.status generates a header, we must update the stamp-h file.
- dnl This file resides in the same directory as the config header
- dnl that is generated.  We must strip everything past the first ":",
- dnl and everything past the last "/".
- AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
- ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
- <<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
- <<am_indx=1
- for am_file in <<$1>>; do
-   case " <<$>>CONFIG_HEADERS " in
-   *" <<$>>am_file "*<<)>>
-     echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-     ;;
-   esac
-   am_indx=`expr "<<$>>am_indx" + 1`
- done<<>>dnl>>)
- changequote([,]))])
- 
- # Do all the work for Automake.  This macro actually does too much --
- # some checks are only needed if your package does certain things.
- # But this isn't really a big deal.
- 
- # serial 1
- 
- dnl Usage:
- dnl AM_INIT_AUTOMAKE(package,version, [no-define])
- 
- AC_DEFUN(AM_INIT_AUTOMAKE,
- [AC_REQUIRE([AC_PROG_INSTALL])
- PACKAGE=[$1]
- AC_SUBST(PACKAGE)
- VERSION=[$2]
- AC_SUBST(VERSION)
- dnl test to see if srcdir already configured
- if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
 -# aclocal.m4 generated automatically by aclocal 1.6.2 -*- Autoconf -*-
++# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+ 
+ # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+ # Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
+ # Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
+ 
+ # Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+ 
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # 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., 59 Temple Place - Suite 330, Boston, MA
+ # 02111-1307, USA.
+ 
+ AC_PREREQ([2.52])
+ 
+ # serial 6
+ 
+ # When config.status generates a header, we must update the stamp-h file.
+ # This file resides in the same directory as the config header
+ # that is generated.  We must strip everything past the first ":",
+ # and everything past the last "/".
+ 
+ # _AM_DIRNAME(PATH)
+ # -----------------
+ # Like AS_DIRNAME, only do it during macro expansion
+ AC_DEFUN([_AM_DIRNAME],
+        [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
+ 	      m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
+ 		    m4_if(regexp([$1], [^/.*]), -1,
+ 			  [.],
+ 			  patsubst([$1], [^\(/\).*], [\1])),
+ 		    patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
+ 	      patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
+ ])# _AM_DIRNAME
+ 
+ 
+ # The stamp files are numbered to have different names.
+ # We could number them on a directory basis, but that's additional
+ # complications, let's have a unique counter.
+ m4_define([_AM_STAMP_Count], [0])
+ 
+ 
+ # _AM_STAMP(HEADER)
+ # -----------------
+ # The name of the stamp file for HEADER.
+ AC_DEFUN([_AM_STAMP],
+ [m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
+ AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
+                                [:.*])))/stamp-h[]_AM_STAMP_Count])
+ 
+ 
+ # _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
+ # ------------------------------------------------------------
+ # We used to try to get a real timestamp in stamp-h.  But the fear is that
+ # that will cause unnecessary cvs conflicts.
+ AC_DEFUN([_AM_CONFIG_HEADER],
+ [# Add the stamp file to the list of files AC keeps track of,
+ # along with our hook.
+ AC_CONFIG_HEADERS([$1],
+                   [# update the timestamp
+ echo 'timestamp for $1' >"_AM_STAMP([$1])"
+ $2],
+                   [$3])
+ ])# _AM_CONFIG_HEADER
+ 
+ 
+ # AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
+ # --------------------------------------------------------------
+ AC_DEFUN([AM_CONFIG_HEADER],
+ [AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
+ ])# AM_CONFIG_HEADER
+ 
+ # Do all the work for Automake.                            -*- Autoconf -*-
+ 
+ # This macro actually does too much some checks are only needed if
+ # your package does certain things.  But this isn't really a big deal.
+ 
+ # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+ # Free Software Foundation, Inc.
+ 
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # 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., 59 Temple Place - Suite 330, Boston, MA
+ # 02111-1307, USA.
+ 
+ # serial 8
+ 
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+ # will think it sees a *use*, and therefore will trigger all it's
+ # C support machinery.  Also note that it means that autoscan, seeing
+ # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+ 
+ 
+ AC_PREREQ([2.52])
+ 
+ # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
+ # the ones we care about.
+ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+ 
+ # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+ # AM_INIT_AUTOMAKE([OPTIONS])
+ # -----------------------------------------------
+ # The call with PACKAGE and VERSION arguments is the old style
+ # call (pre autoconf-2.50), which is being phased out.  PACKAGE
+ # and VERSION should now be passed to AC_INIT and removed from
+ # the call to AM_INIT_AUTOMAKE.
+ # We support both call styles for the transition.  After
+ # the next Automake release, Autoconf can make the AC_INIT
+ # arguments mandatory, and then we can depend on a new Autoconf
+ # release and drop the old call support.
+ AC_DEFUN([AM_INIT_AUTOMAKE],
+ [AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+ # test to see if srcdir already configured
+ if test "`cd $srcdir && pwd`" != "`pwd`" &&
+    test -f $srcdir/config.status; then
    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
  fi
- ifelse([$3],,
- AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
- AC_REQUIRE([AM_SANITY_CHECK])
- AC_REQUIRE([AC_ARG_PROGRAM])
- dnl FIXME This is truly gross.
- missing_dir=`cd $ac_aux_dir && pwd`
- AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
- AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
- AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
- AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
- AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
- AC_REQUIRE([AC_PROG_MAKE_SET])])
+ 
+ # Define the identity of the package.
+ dnl Distinguish between old-style and new-style calls.
+ m4_ifval([$2],
+ [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+  AC_SUBST([PACKAGE], [$1])dnl
+  AC_SUBST([VERSION], [$2])],
+ [_AM_SET_OPTIONS([$1])dnl
+  AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
+  AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
+ 
+ _AM_IF_OPTION([no-define],,
+ [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+  AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+ 
+ # Some tools Automake needs.
+ AC_REQUIRE([AM_SANITY_CHECK])dnl
+ AC_REQUIRE([AC_ARG_PROGRAM])dnl
+ AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+ AM_MISSING_PROG(AUTOCONF, autoconf)
+ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+ AM_MISSING_PROG(AUTOHEADER, autoheader)
+ AM_MISSING_PROG(MAKEINFO, makeinfo)
+ AM_MISSING_PROG(AMTAR, tar)
+ AM_PROG_INSTALL_SH
+ AM_PROG_INSTALL_STRIP
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+ AC_REQUIRE([AC_PROG_AWK])dnl
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ 
+ _AM_IF_OPTION([no-dependencies],,
+ [AC_PROVIDE_IFELSE([AC_PROG_][CC],
+                   [_AM_DEPENDENCIES(CC)],
+                   [define([AC_PROG_][CC],
+                           defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
+ AC_PROVIDE_IFELSE([AC_PROG_][CXX],
+                   [_AM_DEPENDENCIES(CXX)],
+                   [define([AC_PROG_][CXX],
+                           defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ ])
+ ])
+ 
+ # Copyright 2002  Free Software Foundation, Inc.
+ 
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # 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., 59 Temple Place - Suite 330, Boston, MA
+ 
+ # AM_AUTOMAKE_VERSION(VERSION)
+ # ----------------------------
+ # Automake X.Y traces this macro to ensure aclocal.m4 has been
+ # generated from the m4 files accompanying Automake X.Y.
+ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
+ 
+ # AM_SET_CURRENT_AUTOMAKE_VERSION
+ # -------------------------------
+ # Call AM_AUTOMAKE_VERSION so it can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
 -	 [AM_AUTOMAKE_VERSION([1.6.2])])
++	 [AM_AUTOMAKE_VERSION([1.6.3])])
+ 
+ # Helper functions for option handling.                    -*- Autoconf -*-
+ 
+ # Copyright 2001, 2002  Free Software Foundation, Inc.
+ 
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # 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., 59 Temple Place - Suite 330, Boston, MA
+ # 02111-1307, USA.
+ 
+ # serial 2
+ 
+ # _AM_MANGLE_OPTION(NAME)
+ # -----------------------
+ AC_DEFUN([_AM_MANGLE_OPTION],
+ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+ 
+ # _AM_SET_OPTION(NAME)
+ # ------------------------------
+ # Set option NAME.  Presently that only means defining a flag for this option.
+ AC_DEFUN([_AM_SET_OPTION],
+ [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+ 
+ # _AM_SET_OPTIONS(OPTIONS)
+ # ----------------------------------
+ # OPTIONS is a space-separated list of Automake options.
+ AC_DEFUN([_AM_SET_OPTIONS],
+ [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+ 
+ # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+ # -------------------------------------------
+ # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+ AC_DEFUN([_AM_IF_OPTION],
+ [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
  
  #
  # Check to make sure that the build environment is sane.
diff --cc config.guess
index a28a214,a28a214..78f6b92
--- a/config.guess
+++ b/config.guess
@@@ -1,8 -1,8 +1,10 @@@
  #! /bin/sh
  # Attempt to guess a canonical system name.
--#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
--#   Free Software Foundation, Inc.
--#
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
++#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
++
++timestamp='2003-01-10'
++
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
  # the Free Software Foundation; either version 2 of the License, or
@@@ -22,52 -22,52 +24,220 @@@
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
--# Written by Per Bothner <bothner at cygnus.com>.
--# The master version of this file is at the FSF in /home/gd/gnu/lib.
--# Please send patches to the Autoconf mailing list <autoconf at gnu.org>.
++# Originally written by Per Bothner <per at bothner.com>.
++# Please send patches to <config-patches at gnu.org>.  Submit a context
++# diff and a properly formatted ChangeLog entry.
  #
  # This script attempts to guess a canonical system name similar to
  # config.sub.  If it succeeds, it prints the system name on stdout, and
  # exits with 0.  Otherwise, it exits with 1.
  #
  # The plan is that this can be called by configure scripts if you
--# don't specify an explicit system type (host/target name).
--#
--# Only a few systems have been added to this list; please add others
--# (but try to keep the structure clean).
--#
++# don't specify an explicit build system type.
  
--# Use $HOST_CC if defined. $CC may point to a cross-compiler
--if test x"$CC_FOR_BUILD" = x; then
--  if test x"$HOST_CC" != x; then
--    CC_FOR_BUILD="$HOST_CC"
--  else
--    if test x"$CC" != x; then
--      CC_FOR_BUILD="$CC"
--    else
--      CC_FOR_BUILD=cc
--    fi
--  fi
++me=`echo "$0" | sed -e 's,.*/,,'`
++
++usage="\
++Usage: $0 [OPTION]
++
++Output the configuration name of the system \`$me' is run on.
++
++Operation modes:
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches at gnu.org>."
++
++version="\
++GNU config.guess ($timestamp)
++
++Originally written by Per Bothner.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++
++help="
++Try \`$me --help' for more information."
++
++# Parse command line
++while test $# -gt 0 ; do
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit 0 ;;
++    --version | -v )
++       echo "$version" ; exit 0 ;;
++    --help | --h* | -h )
++       echo "$usage"; exit 0 ;;
++    -- )     # Stop option processing
++       shift; break ;;
++    - )	# Use stdin as input.
++       break ;;
++    -* )
++       echo "$me: invalid option $1$help" >&2
++       exit 1 ;;
++    * )
++       break ;;
++  esac
++done
++
++if test $# != 0; then
++  echo "$me: too many arguments$help" >&2
++  exit 1
  fi
  
++trap 'exit 1' 1 2 15
++
++# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
++# compiler to aid in system detection is discouraged as it requires
++# temporary files to be created and, as you can see below, it is a
++# headache to deal with in a portable fashion.
++
++# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
++# use `HOST_CC' if defined, but it is deprecated.
++
++# Portable tmp directory creation inspired by the Autoconf team.
++
++set_cc_for_build='
++trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
++: ${TMPDIR=/tmp} ;
++ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
++dummy=$tmp/dummy ;
++tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
++case $CC_FOR_BUILD,$HOST_CC,$CC in
++ ,,)    echo "int x;" > $dummy.c ;
++	for c in cc gcc c89 c99 ; do
++	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
++	     CC_FOR_BUILD="$c"; break ;
++	  fi ;
++	done ;
++	if test x"$CC_FOR_BUILD" = x ; then
++	  CC_FOR_BUILD=no_compiler_found ;
++	fi
++	;;
++ ,,*)   CC_FOR_BUILD=$CC ;;
++ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
++esac ;'
  
  # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
--# (ghazi at noc.rutgers.edu 8/24/94.)
++# (ghazi at noc.rutgers.edu 1994-08-24)
  if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
  	PATH=$PATH:/.attbin ; export PATH
  fi
  
  UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
  UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
--UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
++UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
--dummy=dummy-$$
--trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
--
  # Note: order is significant - the case branches are not exclusive.
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++    *:NetBSD:*:*)
++	# NetBSD (nbsd) targets should (where applicable) match one or
++	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
++	# switched to ELF, *-*-netbsd* would select the old
++	# object file format.  This provides both forward
++	# compatibility and a consistent mechanism for selecting the
++	# object file format.
++	#
++	# Note: NetBSD doesn't particularly care about the vendor
++	# portion of the name.  We always set it to "unknown".
++	sysctl="sysctl -n hw.machine_arch"
++	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
++	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
++	case "${UNAME_MACHINE_ARCH}" in
++	    armeb) machine=armeb-unknown ;;
++	    arm*) machine=arm-unknown ;;
++	    sh3el) machine=shl-unknown ;;
++	    sh3eb) machine=sh-unknown ;;
++	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
++	esac
++	# The Operating System including object format, if it has switched
++	# to ELF recently, or will in the future.
++	case "${UNAME_MACHINE_ARCH}" in
++	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
++		eval $set_cc_for_build
++		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
++			| grep __ELF__ >/dev/null
++		then
++		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
++		    # Return netbsd for either.  FIX?
++		    os=netbsd
++		else
++		    os=netbsdelf
++		fi
++		;;
++	    *)
++	        os=netbsd
++		;;
++	esac
++	# The OS release
++	# Debian GNU/NetBSD machines have a different userland, and
++	# thus, need a distinct triplet. However, they do not need
++	# kernel version information, so it can be replaced with a
++	# suitable tag, in the style of linux-gnu.
++	case "${UNAME_VERSION}" in
++	    Debian*)
++		release='-gnu'
++		;;
++	    *)
++		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++		;;
++	esac
++	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
++	# contains redundant information, the shorter form:
++	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
++	echo "${machine}-${os}${release}"
++	exit 0 ;;
++    amiga:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    arc:OpenBSD:*:*)
++	echo mipsel-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    hp300:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    mac68k:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    macppc:OpenBSD:*:*)
++	echo powerpc-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    mvme68k:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    mvme88k:OpenBSD:*:*)
++	echo m88k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    mvmeppc:OpenBSD:*:*)
++	echo powerpc-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    pmax:OpenBSD:*:*)
++	echo mipsel-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    sgi:OpenBSD:*:*)
++	echo mipseb-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    sun3:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    wgrisc:OpenBSD:*:*)
++	echo mipsel-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    *:OpenBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    *:MicroBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
++	exit 0 ;;
      alpha:OSF1:*:*)
  	if test $UNAME_RELEASE = "V4.0"; then
  		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@@ -76,45 -76,45 +246,61 @@@
  	# A Tn.n version is a released field test version.
  	# A Xn.n version is an unreleased experimental baselevel.
  	# 1.2 uses "1.2" for uname -r.
++	eval $set_cc_for_build
  	cat <<EOF >$dummy.s
++	.data
++\$Lformat:
++	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
++
++	.text
  	.globl main
++	.align 4
  	.ent main
  main:
--	.frame \$30,0,\$26,0
--	.prologue 0
--	.long 0x47e03d80 # implver $0
--	lda \$2,259
--	.long 0x47e20c21 # amask $2,$1
--	srl \$1,8,\$2
--	sll \$2,2,\$2
--	sll \$0,3,\$0
--	addl \$1,\$0,\$0
--	addl \$2,\$0,\$0
--	ret \$31,(\$26),1
++	.frame \$30,16,\$26,0
++	ldgp \$29,0(\$27)
++	.prologue 1
++	.long 0x47e03d80 # implver \$0
++	lda \$2,-1
++	.long 0x47e20c21 # amask \$2,\$1
++	lda \$16,\$Lformat
++	mov \$0,\$17
++	not \$1,\$18
++	jsr \$26,printf
++	ldgp \$29,0(\$26)
++	mov 0,\$16
++	jsr \$26,exit
  	.end main
  EOF
--	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
++	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
  	if test "$?" = 0 ; then
--		./$dummy
--		case "$?" in
--			7)
++		case `$dummy` in
++			0-0)
  				UNAME_MACHINE="alpha"
  				;;
--			15)
++			1-0)
  				UNAME_MACHINE="alphaev5"
  				;;
--			14)
++			1-1)
  				UNAME_MACHINE="alphaev56"
  				;;
--			10)
++			1-101)
  				UNAME_MACHINE="alphapca56"
  				;;
--			16)
++			2-303)
  				UNAME_MACHINE="alphaev6"
  				;;
++			2-307)
++				UNAME_MACHINE="alphaev67"
++				;;
++			2-1307)
++				UNAME_MACHINE="alphaev68"
++				;;
++			3-1307)
++				UNAME_MACHINE="alphaev7"
++				;;
  		esac
  	fi
--	rm -f $dummy.s $dummy
  	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
  	exit 0 ;;
      Alpha\ *:Windows_NT*:*)
@@@ -127,42 -127,42 +313,21 @@@
  	echo alpha-dec-winnt3.5
  	exit 0 ;;
      Amiga*:UNIX_System_V:4.0:*)
--	echo m68k-cbm-sysv4
++	echo m68k-unknown-sysv4
  	exit 0;;
--    amiga:NetBSD:*:*)
--      echo m68k-cbm-netbsd${UNAME_RELEASE}
--      exit 0 ;;
--    amiga:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
      *:[Aa]miga[Oo][Ss]:*:*)
  	echo ${UNAME_MACHINE}-unknown-amigaos
  	exit 0 ;;
--    arc64:OpenBSD:*:*)
--	echo mips64el-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    arc:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    hkmips:OpenBSD:*:*)
--	echo mips-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    pmax:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sgi:OpenBSD:*:*)
--	echo mips-unknown-openbsd${UNAME_RELEASE}
++    *:[Mm]orph[Oo][Ss]:*:*)
++	echo ${UNAME_MACHINE}-unknown-morphos
  	exit 0 ;;
--    wgrisc:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
++    *:OS/390:*:*)
++	echo i370-ibm-openedition
  	exit 0 ;;
      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
  	echo arm-acorn-riscix${UNAME_RELEASE}
  	exit 0;;
--    arm32:NetBSD:*:*)
--	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
--	exit 0 ;;
--    SR2?01:HI-UX/MPP:*:*)
++    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
  	echo hppa1.1-hitachi-hiuxmpp
  	exit 0;;
      Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
@@@ -176,6 -176,6 +341,10 @@@
      NILE*:*:*:dcosx)
  	echo pyramid-pyramid-svr4
  	exit 0 ;;
++    DRS?6000:UNIX_SV:4.2*:7*)
++	case `/usr/bin/uname -p` in
++	    sparc) echo sparc-icl-nx7 && exit 0 ;;
++	esac ;;
      sun4H:SunOS:5.*:*)
  	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit 0 ;;
@@@ -204,7 -204,7 +373,7 @@@
  	echo m68k-sun-sunos${UNAME_RELEASE}
  	exit 0 ;;
      sun*:*:4.2BSD:*)
--	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
++	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
  	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
  	case "`/bin/arch`" in
  	    sun3)
@@@ -218,15 -218,15 +387,9 @@@
      aushp:SunOS:*:*)
  	echo sparc-auspex-sunos${UNAME_RELEASE}
  	exit 0 ;;
--    atari*:NetBSD:*:*)
--	echo m68k-atari-netbsd${UNAME_RELEASE}
--	exit 0 ;;
--    atari*:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
      # The situation for MiNT is a little confusing.  The machine name
      # can be virtually everything (everything which is not
--    # "atarist" or "atariste" at least should have a processor 
++    # "atarist" or "atariste" at least should have a processor
      # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
      # to the lowercase version "mint" (or "freemint").  Finally
      # the system name "TOS" denotes a system which is actually not
@@@ -250,30 -250,30 +413,9 @@@
      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
          echo m68k-unknown-mint${UNAME_RELEASE}
          exit 0 ;;
--    sun3*:NetBSD:*:*)
--	echo m68k-sun-netbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sun3*:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mac68k:NetBSD:*:*)
--	echo m68k-apple-netbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mac68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme88k:OpenBSD:*:*)
--	echo m88k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
      powerpc:machten:*:*)
  	echo powerpc-apple-machten${UNAME_RELEASE}
  	exit 0 ;;
--    macppc:NetBSD:*:*)
--        echo powerpc-apple-netbsd${UNAME_RELEASE}
--        exit 0 ;;
      RISC*:Mach:*:*)
  	echo mips-dec-mach_bsd4.3
  	exit 0 ;;
@@@ -287,8 -287,8 +429,10 @@@
  	echo clipper-intergraph-clix${UNAME_RELEASE}
  	exit 0 ;;
      mips:*:*:UMIPS | mips:*:*:RISCos)
++	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
  #ifdef __cplusplus
++#include <stdio.h>  /* for printf() prototype */
  	int main (int argc, char *argv[]) {
  #else
  	int main (argc, argv) int argc; char *argv[]; {
@@@ -307,12 -307,12 +451,20 @@@
  	  exit (-1);
  	}
  EOF
--	$CC_FOR_BUILD $dummy.c -o $dummy \
--	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
--	  && rm $dummy.c $dummy && exit 0
--	rm -f $dummy.c $dummy
++	$CC_FOR_BUILD -o $dummy $dummy.c \
++	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
++	  && exit 0
  	echo mips-mips-riscos${UNAME_RELEASE}
  	exit 0 ;;
++    Motorola:PowerMAX_OS:*:*)
++	echo powerpc-motorola-powermax
++	exit 0 ;;
++    Motorola:*:4.3:PL8-*)
++	echo powerpc-harris-powermax
++	exit 0 ;;
++    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
++	echo powerpc-harris-powermax
++	exit 0 ;;
      Night_Hawk:Power_UNIX:*:*)
  	echo powerpc-harris-powerunix
  	exit 0 ;;
@@@ -328,15 -328,15 +480,18 @@@
      AViiON:dgux:*:*)
          # DG/UX returns AViiON for all architectures
          UNAME_PROCESSOR=`/usr/bin/uname -p`
--        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
--	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
--	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
++	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
++	then
++	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
++	       [ ${TARGET_BINARY_INTERFACE}x = x ]
++	    then
  		echo m88k-dg-dgux${UNAME_RELEASE}
--	else
++	    else
  		echo m88k-dg-dguxbcs${UNAME_RELEASE}
++	    fi
++	else
++	    echo i586-dg-dgux${UNAME_RELEASE}
  	fi
--        else echo i586-dg-dgux${UNAME_RELEASE}
--        fi
   	exit 0 ;;
      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
  	echo m88k-dolphin-sysv3
@@@ -357,11 -357,11 +512,20 @@@
      ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
  	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
  	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
--    i?86:AIX:*:*)
++    i*86:AIX:*:*)
  	echo i386-ibm-aix
  	exit 0 ;;
++    ia64:AIX:*:*)
++	if [ -x /usr/bin/oslevel ] ; then
++		IBM_REV=`/usr/bin/oslevel`
++	else
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++	fi
++	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
++	exit 0 ;;
      *:AIX:2:3)
  	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
++		eval $set_cc_for_build
  		sed 's/^		//' << EOF >$dummy.c
  		#include <sys/systemcfg.h>
  
@@@ -373,8 -373,8 +537,7 @@@
  			exit(0);
  			}
  EOF
--		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
--		rm -f $dummy.c $dummy
++		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
  		echo rs6000-ibm-aix3.2.5
  	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
  		echo rs6000-ibm-aix3.2.4
@@@ -382,9 -382,9 +545,9 @@@
  		echo rs6000-ibm-aix3.2
  	fi
  	exit 0 ;;
--    *:AIX:*:4)
--	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
--	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
++    *:AIX:*:[45])
++	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
++	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
  	else
  		IBM_ARCH=powerpc
@@@ -392,7 -392,7 +555,7 @@@
  	if [ -x /usr/bin/oslevel ] ; then
  		IBM_REV=`/usr/bin/oslevel`
  	else
--		IBM_REV=4.${UNAME_RELEASE}
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
  	exit 0 ;;
@@@ -402,7 -402,7 +565,7 @@@
      ibmrt:4.4BSD:*|romp-ibm:BSD:*)
  	echo romp-ibm-bsd4.4
  	exit 0 ;;
--    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
++    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
  	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
  	exit 0 ;;                           # report: romp-ibm BSD 4.3
      *:BOSX:*:*)
@@@ -418,11 -418,11 +581,30 @@@
  	echo m68k-hp-bsd4.4
  	exit 0 ;;
      9000/[34678]??:HP-UX:*:*)
++	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  	case "${UNAME_MACHINE}" in
  	    9000/31? )            HP_ARCH=m68000 ;;
  	    9000/[34]?? )         HP_ARCH=m68k ;;
  	    9000/[678][0-9][0-9])
--              sed 's/^              //' << EOF >$dummy.c
++		if [ -x /usr/bin/getconf ]; then
++		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
++                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++                    case "${sc_cpu_version}" in
++                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++                      532)                      # CPU_PA_RISC2_0
++                        case "${sc_kernel_bits}" in
++                          32) HP_ARCH="hppa2.0n" ;;
++                          64) HP_ARCH="hppa2.0w" ;;
++			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
++                        esac ;;
++                    esac
++		fi
++		if [ "${HP_ARCH}" = "" ]; then
++		    eval $set_cc_for_build
++		    sed 's/^              //' << EOF >$dummy.c
++
++              #define _HPUX_SOURCE
                #include <stdlib.h>
                #include <unistd.h>
  
@@@ -453,13 -453,13 +635,29 @@@
                    exit (0);
                }
  EOF
--	($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
--	rm -f $dummy.c $dummy
++		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
++		    test -z "$HP_ARCH" && HP_ARCH=hppa
++		fi ;;
  	esac
--	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
++	if [ ${HP_ARCH} = "hppa2.0w" ]
++	then
++	    # avoid double evaluation of $set_cc_for_build
++	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
++	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
++	    then
++		HP_ARCH="hppa2.0w"
++	    else
++		HP_ARCH="hppa64"
++	    fi
++	fi
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
  	exit 0 ;;
++    ia64:HP-UX:*:*)
++	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
++	echo ia64-hp-hpux${HPUX_REV}
++	exit 0 ;;
      3050*:HI-UX:*:*)
++	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
  	#include <unistd.h>
  	int
@@@ -485,8 -485,8 +683,7 @@@
  	  exit (0);
  	}
  EOF
--	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
--	rm -f $dummy.c $dummy
++	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
  	echo unknown-hitachi-hiuxwe2
  	exit 0 ;;
      9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@@ -495,7 -495,7 +692,7 @@@
      9000/8??:4.3bsd:*:*)
  	echo hppa1.0-hp-bsd
  	exit 0 ;;
--    *9??*:MPE/iX:*:*)
++    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
  	echo hppa1.0-hp-mpeix
  	exit 0 ;;
      hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@@@ -504,7 -504,7 +701,7 @@@
      hp8??:OSF1:*:*)
  	echo hppa1.0-hp-osf
  	exit 0 ;;
--    i?86:OSF1:*:*)
++    i*86:OSF1:*:*)
  	if [ -x /usr/sbin/sysversion ] ; then
  	    echo ${UNAME_MACHINE}-unknown-osf1mk
  	else
@@@ -514,9 -514,9 +711,6 @@@
      parisc*:Lites*:*:*)
  	echo hppa1.1-hp-lites
  	exit 0 ;;
--    hppa*:OpenBSD:*:*)
--	echo hppa-unknown-openbsd
--	exit 0 ;;
      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
  	echo c1-convex-bsd
          exit 0 ;;
@@@ -535,41 -535,41 +729,34 @@@
      C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
  	echo c4-convex-bsd
          exit 0 ;;
--    CRAY*X-MP:*:*:*)
--	echo xmp-cray-unicos
--        exit 0 ;;
      CRAY*Y-MP:*:*:*)
--	echo ymp-cray-unicos${UNAME_RELEASE}
++	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  	exit 0 ;;
      CRAY*[A-Z]90:*:*:*)
  	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
  	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
--	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
++	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
++	      -e 's/\.[^.]*$/.X/'
  	exit 0 ;;
      CRAY*TS:*:*:*)
--	echo t90-cray-unicos${UNAME_RELEASE}
++	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  	exit 0 ;;
      CRAY*T3E:*:*:*)
--	echo alpha-cray-unicosmk${UNAME_RELEASE}
++	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
  	exit 0 ;;
--    CRAY-2:*:*:*)
--	echo cray2-cray-unicos
--        exit 0 ;;
--    F300:UNIX_System_V:*:*)
++    CRAY*SV1:*:*:*)
++	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
++    *:UNICOS/mp:*:*)
++	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
++	exit 0 ;;
++    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
++	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
          FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
          FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
--        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
          exit 0 ;;
--    F301:UNIX_System_V:*:*)
--       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
--       exit 0 ;;
--    hp3[0-9][05]:NetBSD:*:*)
--	echo m68k-hp-netbsd${UNAME_RELEASE}
--	exit 0 ;;
--    hp300:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
++    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
  	exit 0 ;;
      sparc*:BSD/OS:*:*)
@@@ -579,19 -579,19 +766,18 @@@
  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
  	exit 0 ;;
      *:FreeBSD:*:*)
--	if test -x /usr/bin/objformat; then
--	    if test "elf" = "`/usr/bin/objformat`"; then
--		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
--		exit 0
--	    fi
--	fi
--	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--	exit 0 ;;
--    *:NetBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
--	exit 0 ;;
--    *:OpenBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++	# Determine whether the default compiler uses glibc.
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#include <features.h>
++	#if __GLIBC__ >= 2
++	LIBC=gnu
++	#else
++	LIBC=
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
++	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
  	exit 0 ;;
      i*:CYGWIN*:*)
  	echo ${UNAME_MACHINE}-pc-cygwin
@@@ -599,11 -599,11 +785,20 @@@
      i*:MINGW*:*)
  	echo ${UNAME_MACHINE}-pc-mingw32
  	exit 0 ;;
++    i*:PW*:*)
++	echo ${UNAME_MACHINE}-pc-pw32
++	exit 0 ;;
++    x86:Interix*:3*)
++	echo i586-pc-interix3
++	exit 0 ;;
++    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
++	echo i${UNAME_MACHINE}-pc-mks
++	exit 0 ;;
      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
  	# How do we know it's Interix rather than the generic POSIX subsystem?
  	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
  	# UNAME_MACHINE based on the output of uname instead of i386?
--	echo i386-pc-interix
++	echo i586-pc-interix
  	exit 0 ;;
      i*:UWIN*:*)
  	echo ${UNAME_MACHINE}-pc-uwin
@@@ -617,179 -617,179 +812,159 @@@
      *:GNU:*:*)
  	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
  	exit 0 ;;
--    *:Linux:*:*)
--	# uname on the ARM produces all sorts of strangeness, and we need to
--	# filter it out.
--	case "$UNAME_MACHINE" in
--	  armv*)		      UNAME_MACHINE=$UNAME_MACHINE ;;
--	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
++    i*86:Minix:*:*)
++	echo ${UNAME_MACHINE}-pc-minix
++	exit 0 ;;
++    arm*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    ia64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    m68*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    mips:Linux:*:*)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#undef CPU
++	#undef mips
++	#undef mipsel
++	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++	CPU=mipsel
++	#else
++	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++	CPU=mips
++	#else
++	CPU=
++	#endif
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
++	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
++	;;
++    mips64:Linux:*:*)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#undef CPU
++	#undef mips64
++	#undef mips64el
++	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++	CPU=mips64el
++	#else
++	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++	CPU=mips64
++	#else
++	CPU=
++	#endif
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
++	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
++	;;
++    ppc:Linux:*:*)
++	echo powerpc-unknown-linux-gnu
++	exit 0 ;;
++    ppc64:Linux:*:*)
++	echo powerpc64-unknown-linux-gnu
++	exit 0 ;;
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
++        esac
++	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	exit 0 ;;
++    parisc:Linux:*:* | hppa:Linux:*:*)
++	# Look for CPU level
++	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
++	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
++	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
++	  *)    echo hppa-unknown-linux-gnu ;;
  	esac
--
++	exit 0 ;;
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
++	exit 0 ;;
++    s390:Linux:*:* | s390x:Linux:*:*)
++	echo ${UNAME_MACHINE}-ibm-linux
++	exit 0 ;;
++    sh*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    sparc:Linux:*:* | sparc64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    x86_64:Linux:*:*)
++	echo x86_64-unknown-linux-gnu
++	exit 0 ;;
++    i*86:Linux:*:*)
  	# The BFD linker knows what the default object file format is, so
  	# first see if it will tell us. cd to the root directory to prevent
  	# problems with other programs or directories called `ld' in the path.
--	ld_help_string=`cd /; ld --help 2>&1`
--	ld_supported_emulations=`echo $ld_help_string \
--			 | sed -ne '/supported emulations:/!d
++	# Set LC_ALL=C to ensure ld outputs messages in English.
++	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
++			 | sed -ne '/supported targets:/!d
  				    s/[ 	][ 	]*/ /g
--				    s/.*supported emulations: *//
++				    s/.*supported targets: *//
  				    s/ .*//
  				    p'`
--        case "$ld_supported_emulations" in
--	  *ia64)      echo "${UNAME_MACHINE}-unknown-linux"         ; exit 0 ;;
--	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
--	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
--	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
--	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
--	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
--	  elf32ppc | elf32ppclinux)
--		# Determine Lib Version
--		cat >$dummy.c <<EOF
--#include <features.h>
--#if defined(__GLIBC__)
--extern char __libc_version[];
--extern char __libc_release[];
--#endif
--main(argc, argv)
--     int argc;
--     char *argv[];
--{
--#if defined(__GLIBC__)
--  printf("%s %s\n", __libc_version, __libc_release);
--#else
--  printf("unkown\n");
--#endif
--  return 0;
--}
--EOF
--		LIBC=""
--		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
--		if test "$?" = 0 ; then
--			./$dummy | grep 1\.99 > /dev/null
--			if test "$?" = 0 ; then
--				LIBC="libc1"
--			fi
--		fi	
--		rm -f $dummy.c $dummy
--		echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
++        case "$ld_supported_targets" in
++	  elf32-i386)
++		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
++		;;
++	  a.out-i386-linux)
++		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
++		exit 0 ;;
++	  coff-i386)
++		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
++		exit 0 ;;
++	  "")
++		# Either a pre-BFD a.out linker (linux-gnuoldld) or
++		# one that does not give us useful --help.
++		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
++		exit 0 ;;
  	esac
--
--	if test "${UNAME_MACHINE}" = "alpha" ; then
--		sed 's/^	//'  <<EOF >$dummy.s
--		.globl main
--		.ent main
--	main:
--		.frame \$30,0,\$26,0
--		.prologue 0
--		.long 0x47e03d80 # implver $0
--		lda \$2,259
--		.long 0x47e20c21 # amask $2,$1
--		srl \$1,8,\$2
--		sll \$2,2,\$2
--		sll \$0,3,\$0
--		addl \$1,\$0,\$0
--		addl \$2,\$0,\$0
--		ret \$31,(\$26),1
--		.end main
--EOF
--		LIBC=""
--		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
--		if test "$?" = 0 ; then
--			./$dummy
--			case "$?" in
--			7)
--				UNAME_MACHINE="alpha"
--				;;
--			15)
--				UNAME_MACHINE="alphaev5"
--				;;
--			14)
--				UNAME_MACHINE="alphaev56"
--				;;
--			10)
--				UNAME_MACHINE="alphapca56"
--				;;
--			16)
--				UNAME_MACHINE="alphaev6"
--				;;
--			esac
--
--			objdump --private-headers $dummy | \
--			  grep ld.so.1 > /dev/null
--			if test "$?" = 0 ; then
--				LIBC="libc1"
--			fi
--		fi
--		rm -f $dummy.s $dummy
--		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
--	elif test "${UNAME_MACHINE}" = "mips" ; then
--	  cat >$dummy.c <<EOF
--#ifdef __cplusplus
--	int main (int argc, char *argv[]) {
--#else
--	int main (argc, argv) int argc; char *argv[]; {
--#endif
--#ifdef __MIPSEB__
--  printf ("%s-unknown-linux-gnu\n", argv[1]);
--#endif
--#ifdef __MIPSEL__
--  printf ("%sel-unknown-linux-gnu\n", argv[1]);
--#endif
--  return 0;
--}
--EOF
--	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
--	  rm -f $dummy.c $dummy
--	else
--	  # Either a pre-BFD a.out linker (linux-gnuoldld)
--	  # or one that does not give us useful --help.
--	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
--	  # If ld does not provide *any* "supported emulations:"
--	  # that means it is gnuoldld.
--	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
--	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
--
--	  case "${UNAME_MACHINE}" in
--	  i?86)
--	    VENDOR=pc;
--	    ;;
--	  *)
--	    VENDOR=unknown;
--	    ;;
--	  esac
--	  # Determine whether the default compiler is a.out or elf
--	  cat >$dummy.c <<EOF
--#include <features.h>
--#ifdef __cplusplus
--	int main (int argc, char *argv[]) {
--#else
--	int main (argc, argv) int argc; char *argv[]; {
--#endif
--#ifdef __ELF__
--# ifdef __GLIBC__
--#  if __GLIBC__ >= 2
--    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
--#  else
--    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
--#  endif
--# else
--   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
--# endif
--#else
--  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
--#endif
--  return 0;
--}
++	# Determine whether the default compiler is a.out or elf
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#include <features.h>
++	#ifdef __ELF__
++	# ifdef __GLIBC__
++	#  if __GLIBC__ >= 2
++	LIBC=gnu
++	#  else
++	LIBC=gnulibc1
++	#  endif
++	# else
++	LIBC=gnulibc1
++	# endif
++	#else
++	#ifdef __INTEL_COMPILER
++	LIBC=gnu
++	#else
++	LIBC=gnuaout
++	#endif
++	#endif
  EOF
--	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
--	  rm -f $dummy.c $dummy
--	fi ;;
--# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
--# are messed up and put the nodename in both sysname and nodename.
--    i?86:DYNIX/ptx:4*:*)
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
++	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
++	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
++	;;
++    i*86:DYNIX/ptx:4*:*)
++	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
++	# earlier versions are messed up and put the nodename in both
++	# sysname and nodename.
  	echo i386-sequent-sysv4
  	exit 0 ;;
--    i?86:UNIX_SV:4.2MP:2.*)
++    i*86:UNIX_SV:4.2MP:2.*)
          # Unixware is an offshoot of SVR4, but it has its own version
          # number series starting with 2...
          # I am not positive that other SVR4 systems won't match this,
@@@ -797,33 -797,33 +972,51 @@@
          # Use sysv4.2uw... so that sysv4* matches it.
  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
  	exit 0 ;;
--    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
++    i*86:OS/2:*:*)
++	# If we were able to find `uname', then EMX Unix compatibility
++	# is probably installed.
++	echo ${UNAME_MACHINE}-pc-os2-emx
++	exit 0 ;;
++    i*86:XTS-300:*:STOP)
++	echo ${UNAME_MACHINE}-unknown-stop
++	exit 0 ;;
++    i*86:atheos:*:*)
++	echo ${UNAME_MACHINE}-unknown-atheos
++	exit 0 ;;
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++	echo i386-unknown-lynxos${UNAME_RELEASE}
++	exit 0 ;;
++    i*86:*DOS:*:*)
++	echo ${UNAME_MACHINE}-pc-msdosdjgpp
++	exit 0 ;;
++    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
++	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
  	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
--		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
++		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
  	else
--		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
++		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
  	fi
  	exit 0 ;;
--    i?86:*:5:7*)
--	UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
--	(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
--	(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
--	(/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
--	(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
--	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
++    i*86:*:5:[78]*)
++	case `/bin/uname -X | grep "^Machine"` in
++	    *486*)	     UNAME_MACHINE=i486 ;;
++	    *Pentium)	     UNAME_MACHINE=i586 ;;
++	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
++	esac
++	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
  	exit 0 ;;
--    i?86:*:3.2:*)
++    i*86:*:3.2:*)
  	if test -f /usr/options/cb.name; then
  		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
  		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
  	elif /bin/uname -X 2>/dev/null >/dev/null ; then
--		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
--		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
--		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
++		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
++		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
++		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
  			&& UNAME_MACHINE=i586
--		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
++		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
  			&& UNAME_MACHINE=i686
--		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
++		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
  			&& UNAME_MACHINE=i686
  		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
  	else
@@@ -831,6 -831,6 +1024,7 @@@
  	fi
  	exit 0 ;;
      pc:*:*:*)
++	# Left here for compatibility:
          # uname -m prints for DJGPP always 'pc', but it prints nothing about
          # the processor, so we play safe by assuming i386.
  	echo i386-pc-msdosdjgpp
@@@ -852,9 -852,9 +1046,15 @@@
  	# "miniframe"
  	echo m68010-convergent-sysv
  	exit 0 ;;
++    mc68k:UNIX:SYSTEM5:3.51m)
++	echo m68k-convergent-sysv
++	exit 0 ;;
++    M680?0:D-NIX:5.3:*)
++	echo m68k-diab-dnix
++	exit 0 ;;
      M68*:*:R3V[567]*:*)
  	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
--    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
++    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
  	OS_REL=''
  	test -r /etc/.relid \
  	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@@ -865,21 -865,21 +1065,21 @@@
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
          /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
            && echo i486-ncr-sysv4 && exit 0 ;;
--    m68*:LynxOS:2.*:*)
++    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
  	echo m68k-unknown-lynxos${UNAME_RELEASE}
  	exit 0 ;;
      mc68030:UNIX_System_V:4.*:*)
  	echo m68k-atari-sysv4
  	exit 0 ;;
--    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
--	echo i386-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
      TSUNAMI:LynxOS:2.*:*)
  	echo sparc-unknown-lynxos${UNAME_RELEASE}
  	exit 0 ;;
--    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
++    rs6000:LynxOS:2.*:*)
  	echo rs6000-unknown-lynxos${UNAME_RELEASE}
  	exit 0 ;;
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++	echo powerpc-unknown-lynxos${UNAME_RELEASE}
++	exit 0 ;;
      SM[BE]S:UNIX_SV:*:*)
  	echo mips-dde-sysv${UNAME_RELEASE}
  	exit 0 ;;
@@@ -897,8 -897,8 +1097,8 @@@
  		echo ns32k-sni-sysv
  	fi
  	exit 0 ;;
--    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
--                           # says <Richard.M.Bartel at ccMail.Census.GOV>
++    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++                      # says <Richard.M.Bartel at ccMail.Census.GOV>
          echo i586-unisys-sysv4
          exit 0 ;;
      *:UNIX_System_V:4*:FTX*)
@@@ -910,10 -910,10 +1110,14 @@@
  	# From seanf at swdc.stratus.com.
  	echo i860-stratus-sysv4
  	exit 0 ;;
++    *:VOS:*:*)
++	# From Paul.Green at stratus.com.
++	echo hppa1.1-stratus-vos
++	exit 0 ;;
      mc68*:A/UX:*:*)
  	echo m68k-apple-aux${UNAME_RELEASE}
  	exit 0 ;;
--    news*:NEWS-OS:*:6*)
++    news*:NEWS-OS:6*:*)
  	echo mips-sony-newsos6
  	exit 0 ;;
      R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
@@@ -938,17 -938,17 +1142,80 @@@
      SX-5:SUPER-UX:*:*)
  	echo sx5-nec-superux${UNAME_RELEASE}
  	exit 0 ;;
++    SX-6:SUPER-UX:*:*)
++	echo sx6-nec-superux${UNAME_RELEASE}
++	exit 0 ;;
      Power*:Rhapsody:*:*)
  	echo powerpc-apple-rhapsody${UNAME_RELEASE}
  	exit 0 ;;
      *:Rhapsody:*:*)
  	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
  	exit 0 ;;
++    *:Darwin:*:*)
++	case `uname -p` in
++	    *86) UNAME_PROCESSOR=i686 ;;
++	    powerpc) UNAME_PROCESSOR=powerpc ;;
++	esac
++	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
++	exit 0 ;;
++    *:procnto*:*:* | *:QNX:[0123456789]*:*)
++	UNAME_PROCESSOR=`uname -p`
++	if test "$UNAME_PROCESSOR" = "x86"; then
++		UNAME_PROCESSOR=i386
++		UNAME_MACHINE=pc
++	fi
++	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
++	exit 0 ;;
++    *:QNX:*:4*)
++	echo i386-pc-qnx
++	exit 0 ;;
++    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
++	echo nsr-tandem-nsk${UNAME_RELEASE}
++	exit 0 ;;
++    *:NonStop-UX:*:*)
++	echo mips-compaq-nonstopux
++	exit 0 ;;
++    BS2000:POSIX*:*:*)
++	echo bs2000-siemens-sysv
++	exit 0 ;;
++    DS/*:UNIX_System_V:*:*)
++	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
++	exit 0 ;;
++    *:Plan9:*:*)
++	# "uname -m" is not consistent, so use $cputype instead. 386
++	# is converted to i386 for consistency with other x86
++	# operating systems.
++	if test "$cputype" = "386"; then
++	    UNAME_MACHINE=i386
++	else
++	    UNAME_MACHINE="$cputype"
++	fi
++	echo ${UNAME_MACHINE}-unknown-plan9
++	exit 0 ;;
++    *:TOPS-10:*:*)
++	echo pdp10-unknown-tops10
++	exit 0 ;;
++    *:TENEX:*:*)
++	echo pdp10-unknown-tenex
++	exit 0 ;;
++    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
++	echo pdp10-dec-tops20
++	exit 0 ;;
++    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
++	echo pdp10-xkl-tops20
++	exit 0 ;;
++    *:TOPS-20:*:*)
++	echo pdp10-unknown-tops20
++	exit 0 ;;
++    *:ITS:*:*)
++	echo pdp10-unknown-its
++	exit 0 ;;
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
  #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
  
++eval $set_cc_for_build
  cat >$dummy.c <<EOF
  #ifdef _SEQUENT_
  # include <sys/types.h>
@@@ -1035,11 -1035,11 +1302,24 @@@ main (
  #endif
  
  #if defined (vax)
--#if !defined (ultrix)
--  printf ("vax-dec-bsd\n"); exit (0);
--#else
--  printf ("vax-dec-ultrix\n"); exit (0);
--#endif
++# if !defined (ultrix)
++#  include <sys/param.h>
++#  if defined (BSD)
++#   if BSD == 43
++      printf ("vax-dec-bsd4.3\n"); exit (0);
++#   else
++#    if BSD == 199006
++      printf ("vax-dec-bsd4.3reno\n"); exit (0);
++#    else
++      printf ("vax-dec-bsd\n"); exit (0);
++#    endif
++#   endif
++#  else
++    printf ("vax-dec-bsd\n"); exit (0);
++#  endif
++# else
++    printf ("vax-dec-ultrix\n"); exit (0);
++# endif
  #endif
  
  #if defined (alliant) && defined (i860)
@@@ -1050,8 -1050,8 +1330,7 @@@
  }
  EOF
  
--$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
--rm -f $dummy.c $dummy
++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
  
  # Apollos put the system type in the environment.
  
@@@ -1083,6 -1083,6 +1362,48 @@@ the
      esac
  fi
  
--#echo '(Unable to guess system type)' 1>&2
++cat >&2 <<EOF
++$0: unable to guess system type
++
++This script, last modified $timestamp, has failed to recognize
++the operating system you are using. It is advised that you
++download the most up to date version of the config scripts from
++
++    ftp://ftp.gnu.org/pub/gnu/config/
++
++If the version you run ($0) is already up to date, please
++send the following data and any information you think might be
++pertinent to <config-patches at gnu.org> in order to provide the needed
++information to handle your system.
++
++config.guess timestamp = $timestamp
++
++uname -m = `(uname -m) 2>/dev/null || echo unknown`
++uname -r = `(uname -r) 2>/dev/null || echo unknown`
++uname -s = `(uname -s) 2>/dev/null || echo unknown`
++uname -v = `(uname -v) 2>/dev/null || echo unknown`
++
++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
++/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
++
++hostinfo               = `(hostinfo) 2>/dev/null`
++/bin/universe          = `(/bin/universe) 2>/dev/null`
++/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
++/bin/arch              = `(/bin/arch) 2>/dev/null`
++/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
++
++UNAME_MACHINE = ${UNAME_MACHINE}
++UNAME_RELEASE = ${UNAME_RELEASE}
++UNAME_SYSTEM  = ${UNAME_SYSTEM}
++UNAME_VERSION = ${UNAME_VERSION}
++EOF
  
  exit 1
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "timestamp='"
++# time-stamp-format: "%:y-%02m-%02d"
++# time-stamp-end: "'"
++# End:
diff --cc config.sub
index e494441,e494441..04baf3d
--- a/config.sub
+++ b/config.sub
@@@ -1,6 -1,6 +1,10 @@@
  #! /bin/sh
--# Configuration validation subroutine script, version 1.1.
--#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
++# Configuration validation subroutine script.
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
++#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
++
++timestamp='2003-01-03'
++
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
  # can handle that machine.  It does not imply ALL GNU software can.
@@@ -25,6 -25,6 +29,9 @@@
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
++# Please send patches to <config-patches at gnu.org>.  Submit a context
++# diff and a properly formatted ChangeLog entry.
++#
  # Configuration subroutine to validate and canonicalize a configuration type.
  # Supply the specified configuration type as an argument.
  # If it is invalid, we print an error message on stderr and exit with code 1.
@@@ -45,30 -45,30 +52,73 @@@
  #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
  # It is wrong to echo any other type of specification.
  
--if [ x$1 = x ]
--then
--	echo Configuration name missing. 1>&2
--	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
--	echo "or     $0 ALIAS" 1>&2
--	echo where ALIAS is a recognized configuration type. 1>&2
--	exit 1
--fi
++me=`echo "$0" | sed -e 's,.*/,,'`
  
--# First pass through any local machine types.
--case $1 in
--	*local*)
--		echo $1
--		exit 0
--		;;
--	*)
--	;;
++usage="\
++Usage: $0 [OPTION] CPU-MFR-OPSYS
++       $0 [OPTION] ALIAS
++
++Canonicalize a configuration name.
++
++Operation modes:
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches at gnu.org>."
++
++version="\
++GNU config.sub ($timestamp)
++
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++
++help="
++Try \`$me --help' for more information."
++
++# Parse command line
++while test $# -gt 0 ; do
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit 0 ;;
++    --version | -v )
++       echo "$version" ; exit 0 ;;
++    --help | --h* | -h )
++       echo "$usage"; exit 0 ;;
++    -- )     # Stop option processing
++       shift; break ;;
++    - )	# Use stdin as input.
++       break ;;
++    -* )
++       echo "$me: invalid option $1$help"
++       exit 1 ;;
++
++    *local*)
++       # First pass through any local machine types.
++       echo $1
++       exit 0;;
++
++    * )
++       break ;;
++  esac
++done
++
++case $# in
++ 0) echo "$me: missing argument$help" >&2
++    exit 1;;
++ 1) ;;
++ *) echo "$me: too many arguments$help" >&2
++    exit 1;;
  esac
  
  # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
  # Here we must recognize all the valid KERNEL-OS combinations.
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
--  linux-gnu*)
++  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
@@@ -94,7 -94,7 +144,7 @@@ case $os i
  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
--	-apple)
++	-apple | -axis)
  		os=
  		basic_machine=$1
  		;;
@@@ -105,9 -105,9 +155,17 @@@
  	-scout)
  		;;
  	-wrs)
--		os=vxworks
++		os=-vxworks
  		basic_machine=$1
  		;;
++	-chorusos*)
++		os=-chorusos
++		basic_machine=$1
++		;;
++ 	-chorusrdb)
++ 		os=-chorusrdb
++		basic_machine=$1
++ 		;;
  	-hiux*)
  		os=-hiuxwe2
  		;;
@@@ -156,33 -156,33 +214,72 @@@
  	-psos*)
  		os=-psos
  		;;
++	-mint | -mint[0-9]*)
++		basic_machine=m68k-atari
++		os=-mint
++		;;
  esac
  
  # Decode aliases for certain CPU-COMPANY combinations.
  case $basic_machine in
  	# Recognize the basic CPU types without company name.
  	# Some are omitted here because they have special meanings below.
--	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
--		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
--		| 580 | i960 | h8300 \
--		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
--		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
--		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
--		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
--		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
--		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
--		| mips64vr5000 | miprs64vr5000el | mcore \
--		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
--		| thumb | d10v)
++	1750a | 580 \
++	| a29k \
++	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
++	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
++	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++	| clipper \
++	| d10v | d30v | dlx | dsp16xx \
++	| fr30 | frv \
++	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++	| i370 | i860 | i960 | ia64 \
++	| ip2k \
++	| m32r | m68000 | m68k | m88k | mcore \
++	| mips | mipsbe | mipseb | mipsel | mipsle \
++	| mips16 \
++	| mips64 | mips64el \
++	| mips64vr | mips64vrel \
++	| mips64orion | mips64orionel \
++	| mips64vr4100 | mips64vr4100el \
++	| mips64vr4300 | mips64vr4300el \
++	| mips64vr5000 | mips64vr5000el \
++	| mipsisa32 | mipsisa32el \
++	| mipsisa32r2 | mipsisa32r2el \
++	| mipsisa64 | mipsisa64el \
++	| mipsisa64sb1 | mipsisa64sb1el \
++	| mipsisa64sr71k | mipsisa64sr71kel \
++	| mipstx39 | mipstx39el \
++	| mn10200 | mn10300 \
++	| msp430 \
++	| ns16k | ns32k \
++	| openrisc | or32 \
++	| pdp10 | pdp11 | pj | pjl \
++	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++	| pyramid \
++	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++	| sh64 | sh64le \
++	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
++	| strongarm \
++	| tahoe | thumb | tic80 | tron \
++	| v850 | v850e \
++	| we32k \
++	| x86 | xscale | xstormy16 | xtensa \
++	| z8k)
  		basic_machine=$basic_machine-unknown
  		;;
--	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
++	m6811 | m68hc11 | m6812 | m68hc12)
++		# Motorola 68HC11/12.
++		basic_machine=$basic_machine-unknown
++		os=-none
++		;;
++	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
  		;;
  
  	# We use `pc' rather than `unknown'
  	# because (1) that's what they normally are, and
  	# (2) the word "unknown" tends to confuse beginning users.
--	i[34567]86)
++	i*86 | x86_64)
  	  basic_machine=$basic_machine-pc
  	  ;;
  	# Object if more than one company name word.
@@@ -191,24 -191,24 +288,58 @@@
  		exit 1
  		;;
  	# Recognize the basic CPU types with company name.
--	# FIXME: clean up the formatting here.
--	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
--	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
--	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
--	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
--	      | xmp-* | ymp-* \
--	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
--	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
--	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
--	      | clipper-* | orion-* \
--	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
--	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
--	      | mips64el-* | mips64orion-* | mips64orionel-* \
--	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
--	      | mipstx39-* | mipstx39el-* | mcore-* \
--	      | f301-* | armv*-* | t3e-* \
--	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
--	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
++	580-* \
++	| a29k-* \
++	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
++	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
++	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
++	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++	| avr-* \
++	| bs2000-* \
++	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
++	| clipper-* | cydra-* \
++	| d10v-* | d30v-* | dlx-* \
++	| elxsi-* \
++	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
++	| h8300-* | h8500-* \
++	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++	| i*86-* | i860-* | i960-* | ia64-* \
++	| ip2k-* \
++	| m32r-* \
++	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
++	| m88110-* | m88k-* | mcore-* \
++	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
++	| mips16-* \
++	| mips64-* | mips64el-* \
++	| mips64vr-* | mips64vrel-* \
++	| mips64orion-* | mips64orionel-* \
++	| mips64vr4100-* | mips64vr4100el-* \
++	| mips64vr4300-* | mips64vr4300el-* \
++	| mips64vr5000-* | mips64vr5000el-* \
++	| mipsisa32-* | mipsisa32el-* \
++	| mipsisa32r2-* | mipsisa32r2el-* \
++	| mipsisa64-* | mipsisa64el-* \
++	| mipsisa64sb1-* | mipsisa64sb1el-* \
++	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
++	| mipstx39-* | mipstx39el-* \
++	| msp430-* \
++	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
++	| orion-* \
++	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++	| pyramid-* \
++	| romp-* | rs6000-* \
++	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
++	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
++	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
++	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
++	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
++	| v850-* | v850e-* | vax-* \
++	| we32k-* \
++	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
++	| xtensa-* \
++	| ymp-* \
++	| z8k-*)
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
@@@ -245,14 -245,14 +376,14 @@@
  		os=-sysv
  		;;
  	amiga | amiga-*)
--		basic_machine=m68k-cbm
++		basic_machine=m68k-unknown
  		;;
  	amigaos | amigados)
--		basic_machine=m68k-cbm
++		basic_machine=m68k-unknown
  		os=-amigaos
  		;;
  	amigaunix | amix)
--		basic_machine=m68k-cbm
++		basic_machine=m68k-unknown
  		os=-sysv4
  		;;
  	apollo68)
@@@ -271,6 -271,6 +402,10 @@@
  		basic_machine=ns32k-sequent
  		os=-dynix
  		;;
++	c90)
++		basic_machine=c90-cray
++		os=-unicos
++		;;
  	convex-c1)
  		basic_machine=c1-convex
  		os=-bsd
@@@ -291,27 -291,27 +426,30 @@@
  		basic_machine=c38-convex
  		os=-bsd
  		;;
--	cray | ymp)
--		basic_machine=ymp-cray
--		os=-unicos
--		;;
--	cray2)
--		basic_machine=cray2-cray
--		os=-unicos
--		;;
--	[ctj]90-cray)
--		basic_machine=c90-cray
++	cray | j90)
++		basic_machine=j90-cray
  		os=-unicos
  		;;
  	crds | unos)
  		basic_machine=m68k-crds
  		;;
++	cris | cris-* | etrax*)
++		basic_machine=cris-axis
++		;;
  	da30 | da30-*)
  		basic_machine=m68k-da30
  		;;
  	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
  		basic_machine=mips-dec
  		;;
++	decsystem10* | dec10*)
++		basic_machine=pdp10-dec
++		os=-tops10
++		;;
++	decsystem20* | dec20*)
++		basic_machine=pdp10-dec
++		os=-tops20
++		;;
  	delta | 3300 | motorola-3300 | motorola-delta \
  	      | 3300-motorola | delta-motorola)
  		basic_machine=m68k-motorola
@@@ -353,6 -353,6 +491,10 @@@
  		basic_machine=tron-gmicro
  		os=-sysv
  		;;
++	go32)
++		basic_machine=i386-pc
++		os=-go32
++		;;
  	h3050r* | hiux*)
  		basic_machine=hppa1.1-hitachi
  		os=-hiuxwe2
@@@ -426,22 -426,22 +568,21 @@@
  		;;
  	i370-ibm* | ibm*)
  		basic_machine=i370-ibm
--		os=-mvs
  		;;
  # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
--	i[34567]86v32)
++	i*86v32)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv32
  		;;
--	i[34567]86v4*)
++	i*86v4*)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv4
  		;;
--	i[34567]86v)
++	i*86v)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv
  		;;
--	i[34567]86sol2)
++	i*86sol2)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-solaris2
  		;;
@@@ -453,14 -453,14 +594,6 @@@
  		basic_machine=i386-unknown
  		os=-vsta
  		;;
--	i386-go32 | go32)
--		basic_machine=i386-unknown
--		os=-go32
--		;;
--	i386-mingw32 | mingw32)
--		basic_machine=i386-unknown
--		os=-mingw32
--		;;
  	iris | iris4d)
  		basic_machine=mips-sgi
  		case $os in
@@@ -486,35 -486,35 +619,43 @@@
  		basic_machine=ns32k-utek
  		os=-sysv
  		;;
++	mingw32)
++		basic_machine=i386-pc
++		os=-mingw32
++		;;
  	miniframe)
  		basic_machine=m68000-convergent
  		;;
--	*mint | *MiNT)
++	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
  		basic_machine=m68k-atari
  		os=-mint
  		;;
--	mipsel*-linux*)
--		basic_machine=mipsel-unknown
--		os=-linux-gnu
--		;;
--	mips*-linux*)
--		basic_machine=mips-unknown
--		os=-linux-gnu
--		;;
  	mips3*-*)
  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
  		;;
  	mips3*)
  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
  		;;
++	mmix*)
++		basic_machine=mmix-knuth
++		os=-mmixware
++		;;
  	monitor)
  		basic_machine=m68k-rom68k
  		os=-coff
  		;;
++	morphos)
++		basic_machine=powerpc-unknown
++		os=-morphos
++		;;
  	msdos)
--		basic_machine=i386-unknown
++		basic_machine=i386-pc
  		os=-msdos
  		;;
++	mvs)
++		basic_machine=i370-ibm
++		os=-mvs
++		;;
  	ncr3000)
  		basic_machine=i486-ncr
  		os=-sysv4
@@@ -524,7 -524,7 +665,7 @@@
  		os=-netbsd
  		;;
  	netwinder)
--		basic_machine=armv4l-corel
++		basic_machine=armv4l-rebel
  		os=-linux
  		;;
  	news | news700 | news800 | news900)
@@@ -572,13 -572,13 +713,28 @@@
  		basic_machine=i960-intel
  		os=-mon960
  		;;
++	nonstopux)
++		basic_machine=mips-compaq
++		os=-nonstopux
++		;;
  	np1)
  		basic_machine=np1-gould
  		;;
++	nv1)
++		basic_machine=nv1-cray
++		os=-unicosmp
++		;;
++	nsr-tandem)
++		basic_machine=nsr-tandem
++		;;
  	op50n-* | op60c-*)
  		basic_machine=hppa1.1-oki
  		os=-proelf
  		;;
++	or32 | or32-*)
++		basic_machine=or32-unknown
++		os=-coff
++		;;
  	OSE68000 | ose68000)
  		basic_machine=m68000-ericsson
  		os=-ose
@@@ -601,45 -601,45 +757,59 @@@
  	pbb)
  		basic_machine=m68k-tti
  		;;
--        pc532 | pc532-*)
++	pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
--	pentium | p5 | k5 | k6 | nexen)
++	pentium | p5 | k5 | k6 | nexgen | viac3)
  		basic_machine=i586-pc
  		;;
--	pentiumpro | p6 | 6x86)
++	pentiumpro | p6 | 6x86 | athlon | athlon_*)
  		basic_machine=i686-pc
  		;;
  	pentiumii | pentium2)
--		basic_machine=i786-pc
++		basic_machine=i686-pc
  		;;
--	pentium-* | p5-* | k5-* | k6-* | nexen-*)
++	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
--	pentiumpro-* | p6-* | 6x86-*)
++	pentiumpro-* | p6-* | 6x86-* | athlon-*)
  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pentiumii-* | pentium2-*)
--		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pn)
  		basic_machine=pn-gould
  		;;
--	power)	basic_machine=rs6000-ibm
++	power)	basic_machine=power-ibm
  		;;
  	ppc)	basic_machine=powerpc-unknown
--	        ;;
++		;;
  	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	ppcle | powerpclittle | ppc-le | powerpc-little)
  		basic_machine=powerpcle-unknown
--	        ;;
++		;;
  	ppcle-* | powerpclittle-*)
  		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
++	ppc64)	basic_machine=powerpc64-unknown
++		;;
++	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
++		basic_machine=powerpc64le-unknown
++		;;
++	ppc64le-* | powerpc64little-*)
++		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
  	ps2)
  		basic_machine=i386-ibm
  		;;
++	pw32)
++		basic_machine=i586-unknown
++		os=-pw32
++		;;
  	rom68k)
  		basic_machine=m68k-rom68k
  		os=-coff
@@@ -650,10 -650,10 +820,22 @@@
  	rtpc | rtpc-*)
  		basic_machine=romp-ibm
  		;;
++	s390 | s390-*)
++		basic_machine=s390-ibm
++		;;
++	s390x | s390x-*)
++		basic_machine=s390x-ibm
++		;;
  	sa29200)
  		basic_machine=a29k-amd
  		os=-udi
  		;;
++	sb1)
++		basic_machine=mipsisa64sb1-unknown
++		;;
++	sb1el)
++		basic_machine=mipsisa64sb1el-unknown
++		;;
  	sequent)
  		basic_machine=i386-sequent
  		;;
@@@ -661,7 -661,7 +843,7 @@@
  		basic_machine=sh-hitachi
  		os=-hms
  		;;
--	sparclite-wrs)
++	sparclite-wrs | simso-wrs)
  		basic_machine=sparclite-wrs
  		os=-vxworks
  		;;
@@@ -719,20 -719,20 +901,40 @@@
  	sun386 | sun386i | roadrunner)
  		basic_machine=i386-sun
  		;;
++	sv1)
++		basic_machine=sv1-cray
++		os=-unicos
++		;;
  	symmetry)
  		basic_machine=i386-sequent
  		os=-dynix
  		;;
  	t3e)
--		basic_machine=t3e-cray
++		basic_machine=alphaev5-cray
++		os=-unicos
++		;;
++	t90)
++		basic_machine=t90-cray
  		os=-unicos
  		;;
++        tic4x | c4x*)
++		basic_machine=tic4x-unknown
++		os=-coff
++		;;
++	tic54x | c54x*)
++		basic_machine=tic54x-unknown
++		os=-coff
++		;;
  	tx39)
  		basic_machine=mipstx39-unknown
  		;;
  	tx39el)
  		basic_machine=mipstx39el-unknown
  		;;
++	toad1)
++		basic_machine=pdp10-xkl
++		os=-tops20
++		;;
  	tower | tower-32)
  		basic_machine=m68k-ncr
  		;;
@@@ -757,8 -757,8 +959,8 @@@
  		os=-vms
  		;;
  	vpp*|vx|vx-*)
--               basic_machine=f301-fujitsu
--               ;;
++		basic_machine=f301-fujitsu
++		;;
  	vxworks960)
  		basic_machine=i960-wrs
  		os=-vxworks
@@@ -779,13 -779,13 +981,13 @@@
  		basic_machine=hppa1.1-winbond
  		os=-proelf
  		;;
--	xmp)
--		basic_machine=xmp-cray
--		os=-unicos
--		;;
--        xps | xps100)
++	xps | xps100)
  		basic_machine=xps100-honeywell
  		;;
++	ymp)
++		basic_machine=ymp-cray
++		os=-unicos
++		;;
  	z8k-*-coff)
  		basic_machine=z8k-unknown
  		os=-sim
@@@ -806,13 -806,13 +1008,6 @@@
  	op60c)
  		basic_machine=hppa1.1-oki
  		;;
--	mips)
--		if [ x$os = x-linux-gnu ]; then
--			basic_machine=mips-unknown
--		else
--			basic_machine=mips-mips
--		fi
--		;;
  	romp)
  		basic_machine=romp-ibm
  		;;
@@@ -822,16 -822,16 +1017,26 @@@
  	vax)
  		basic_machine=vax-dec
  		;;
++	pdp10)
++		# there are many clones, so DEC is not a safe bet
++		basic_machine=pdp10-unknown
++		;;
  	pdp11)
  		basic_machine=pdp11-dec
  		;;
  	we32k)
  		basic_machine=we32k-att
  		;;
--	sparc | sparcv9)
++	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
++		basic_machine=sh-unknown
++		;;
++	sh64)
++		basic_machine=sh64-unknown
++		;;
++	sparc | sparcv9 | sparcv9b)
  		basic_machine=sparc-sun
  		;;
--        cydra)
++	cydra)
  		basic_machine=cydra-cydrome
  		;;
  	orion)
@@@ -846,9 -846,9 +1051,8 @@@
  	pmac | pmac-mpw)
  		basic_machine=powerpc-apple
  		;;
--	c4x*)
--		basic_machine=c4x-none
--		os=-coff
++	*-unknown)
++		# Make sure to match an already-canonicalized machine name.
  		;;
  	*)
  		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@@ -906,14 -906,14 +1110,34 @@@ case $os i
  	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -chorusos* | -chorusrdb* \
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
--	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
++	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
++	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
++	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
++	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
++	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
++	      | -powermax* | -dnix* | -microbsd*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
++	-qnx*)
++		case $basic_machine in
++		    x86-* | i*86-*)
++			;;
++		    *)
++			os=-nto$os
++			;;
++		esac
++		;;
++	-nto-qnx*)
++		;;
++	-nto*)
++		os=`echo $os | sed -e 's|nto|nto-qnx|'`
++		;;
  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
  	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
--	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
++	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
  		;;
  	-mac*)
  		os=`echo $os | sed -e 's|mac|macos|'`
@@@ -927,6 -927,6 +1151,12 @@@
  	-sunos6*)
  		os=`echo $os | sed -e 's|sunos6|solaris3|'`
  		;;
++	-opened*)
++		os=-openedition
++		;;
++	-wince*)
++		os=-wince
++		;;
  	-osfrose*)
  		os=-osfrose
  		;;
@@@ -942,14 -942,14 +1172,23 @@@
  	-acis*)
  		os=-aos
  		;;
++	-atheos*)
++		os=-atheos
++		;;
  	-386bsd)
  		os=-bsd
  		;;
  	-ctix* | -uts*)
  		os=-sysv
  		;;
++	-nova*)
++		os=-rtmk-nova
++		;;
  	-ns2 )
--	        os=-nextstep2
++		os=-nextstep2
++		;;
++	-nsk*)
++		os=-nsk
  		;;
  	# Preserve the version number of sinix5.
  	-sinix5.*)
@@@ -985,8 -985,8 +1224,8 @@@
  	-xenix)
  		os=-xenix
  		;;
--        -*mint | -*MiNT)
--	        os=-mint
++	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
++		os=-mint
  		;;
  	-none)
  		;;
@@@ -1013,13 -1013,13 +1252,17 @@@ case $basic_machine i
  	*-acorn)
  		os=-riscix1.2
  		;;
--	arm*-corel)
++	arm*-rebel)
  		os=-linux
  		;;
  	arm*-semi)
  		os=-aout
  		;;
--        pdp11-*)
++	# This must come before the *-dec entry.
++	pdp10-*)
++		os=-tops20
++		;;
++	pdp11-*)
  		os=-none
  		;;
  	*-dec | vax-*)
@@@ -1046,6 -1046,6 +1289,9 @@@
  	mips*-*)
  		os=-elf
  		;;
++	or32-*)
++		os=-coff
++		;;
  	*-tti)	# must be before sparc entry or we get the wrong os.
  		os=-sysv3
  		;;
@@@ -1109,25 -1109,25 +1355,25 @@@
  	*-next)
  		os=-nextstep3
  		;;
--        *-gould)
++	*-gould)
  		os=-sysv
  		;;
--        *-highlevel)
++	*-highlevel)
  		os=-bsd
  		;;
  	*-encore)
  		os=-bsd
  		;;
--        *-sgi)
++	*-sgi)
  		os=-irix
  		;;
--        *-siemens)
++	*-siemens)
  		os=-sysv4
  		;;
  	*-masscomp)
  		os=-rtu
  		;;
--	f301-fujitsu)
++	f30[01]-fujitsu | f700-fujitsu)
  		os=-uxpv
  		;;
  	*-rom68k)
@@@ -1187,13 -1187,13 +1433,13 @@@ case $basic_machine i
  			-genix*)
  				vendor=ns
  				;;
--			-mvs*)
++			-mvs* | -opened*)
  				vendor=ibm
  				;;
  			-ptx*)
  				vendor=sequent
  				;;
--			-vxsim* | -vxworks*)
++			-vxsim* | -vxworks* | -windiss*)
  				vendor=wrs
  				;;
  			-aux*)
@@@ -1205,12 -1205,12 +1451,23 @@@
  			-mpw* | -macos*)
  				vendor=apple
  				;;
--			-*mint | -*MiNT)
++			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
  				vendor=atari
  				;;
++			-vos*)
++				vendor=stratus
++				;;
  		esac
  		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
  		;;
  esac
  
  echo $basic_machine$os
++exit 0
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "timestamp='"
++# time-stamp-format: "%:y-%02m-%02d"
++# time-stamp-end: "'"
++# End:
diff --cc configure
index 9d62f51,84f736d..ad06fcd
--- a/configure
+++ b/configure
@@@ -1,28 -1,310 +1,324 @@@
  #! /bin/sh
- 
  # Guess values for system-dependent variables and create Makefiles.
- # Generated automatically using autoconf version 2.13 
- # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 -# Generated by GNU Autoconf 2.53.
++# Generated by GNU Autoconf 2.57.
  #
+ # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+ # Free Software Foundation, Inc.
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
 -
 -if expr a : '\(a\)' >/dev/null 2>&1; then
 -  as_expr=expr
 -else
 -  as_expr=false
 -fi
 -
 -
+ ## --------------------- ##
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
+ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+   set -o posix
+ fi
+ 
 -# NLS nuisances.
+ # Support unset when possible.
+ if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+   as_unset=unset
+ else
+   as_unset=false
+ fi
+ 
 -(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
 -    { $as_unset LANG || test "${LANG+set}" != set; } ||
 -      { LANG=C; export LANG; }
 -(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
 -    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
 -      { LC_ALL=C; export LC_ALL; }
 -(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
 -    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
 -      { LC_TIME=C; export LC_TIME; }
 -(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
 -    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
 -      { LC_CTYPE=C; export LC_CTYPE; }
 -(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
 -    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
 -      { LANGUAGE=C; export LANGUAGE; }
 -(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
 -    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
 -      { LC_COLLATE=C; export LC_COLLATE; }
 -(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
 -    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
 -      { LC_NUMERIC=C; export LC_NUMERIC; }
 -(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
 -    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
 -      { LC_MESSAGES=C; export LC_MESSAGES; }
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    $as_unset $as_var
++  fi
++done
++
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
+ 
+ 
+ # Name of the executable.
 -as_me=`(basename "$0") 2>/dev/null ||
++as_me=`$as_basename "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+ 	 X"$0" : 'X\(/\)$' \| \
+ 	 .     : '\(.\)' 2>/dev/null ||
+ echo X/"$0" |
+     sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+   	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\/\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+ 
++
+ # PATH needs CR, and LINENO needs CR and PATH.
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
 -  echo "#! /bin/sh" >conftest.sh
 -  echo  "exit 0"   >>conftest.sh
 -  chmod +x conftest.sh
 -  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+     PATH_SEPARATOR=';'
+   else
+     PATH_SEPARATOR=:
+   fi
 -  rm -f conftest.sh
++  rm -f conf$$.sh
+ fi
+ 
+ 
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+   # Find who we are.  Look in the path if we contain no path at all
+   # relative or not.
+   case $0 in
+     *[\\/]* ) as_myself=$0 ;;
+     *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+ 
+        ;;
+   esac
+   # We did not find ourselves, most probably we were run as `sh COMMAND'
+   # in which case we are not to be found in the path.
+   if test "x$as_myself" = x; then
+     as_myself=$0
+   fi
+   if test ! -f "$as_myself"; then
+     { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+    { (exit 1); exit 1; }; }
+   fi
+   case $CONFIG_SHELL in
+   '')
+     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for as_base in sh bash ksh sh5; do
+ 	 case $as_dir in
+ 	 /*)
+ 	   if ("$as_dir/$as_base" -c '
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
++	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+ 	     CONFIG_SHELL=$as_dir/$as_base
+ 	     export CONFIG_SHELL
+ 	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+ 	   fi;;
+ 	 esac
+        done
+ done
+ ;;
+   esac
+ 
+   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+   # uniformly replaced by the line number.  The first 'sed' inserts a
+   # line-number line before each line; the second 'sed' does the real
+   # work.  The second script uses 'N' to pair each line-number line
+   # with the numbered line, and appends trailing '-' during
+   # substitution so that $LINENO is not a special case at line end.
+   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+   # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+   sed '=' <$as_myself |
+     sed '
+       N
+       s,$,-,
+       : loop
+       s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+       t loop
+       s,-$,,
+       s,^['$as_cr_digits']*\n,,
+     ' >$as_me.lineno &&
+   chmod +x $as_me.lineno ||
+     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+   # original and so on.  Autoconf is especially sensible to this).
+   . ./$as_me.lineno
+   # Exit status is that of the last command.
+   exit
+ }
  
- # Defaults:
- ac_help=
+ 
+ case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+   *c*,-n*) ECHO_N= ECHO_C='
+ ' ECHO_T='	' ;;
+   *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+   *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+ esac
+ 
+ if expr a : '\(a\)' >/dev/null 2>&1; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+   # We could just check for DJGPP; but this test a) works b) is more generic
+   # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+   if test -f conf$$.exe; then
+     # Don't use ln at all; we don't have any links
+     as_ln_s='cp -p'
+   else
+     as_ln_s='ln -s'
+   fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+   as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.file
+ 
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  as_mkdir_p=false
++fi
++
+ as_executable_p="test -f"
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+ 
+ # Sed expression to map a string onto a valid variable name.
+ as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+ 
+ 
+ # IFS
+ # We need space, tab and new line, in precisely that order.
+ as_nl='
+ '
+ IFS=" 	$as_nl"
+ 
+ # CDPATH.
 -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
++$as_unset CDPATH
+ 
+ 
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+ 
+ exec 6>&1
+ 
+ #
+ # Initializations.
+ #
  ac_default_prefix=/usr/local
- # Any additions from configure.in:
- ac_help="$ac_help
-   --with-x                use the X Window System"
++ac_config_libobj_dir=.
+ cross_compiling=no
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+ SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+ # Maximum number of lines to put in a shell here document.
+ # This variable seems obsolete.  It should probably be removed, and
+ # only ac_max_sed_lines should be used.
+ : ${ac_max_here_lines=38}
+ 
+ # Identity of this package.
+ PACKAGE_NAME=
+ PACKAGE_TARNAME=
+ PACKAGE_VERSION=
+ PACKAGE_STRING=
+ PACKAGE_BUGREPORT=
+ 
+ ac_unique_file="wmfsm/wmfsm.c"
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+ #if HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
+ #if HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+ #if STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+ # if HAVE_STDLIB_H
+ #  include <stdlib.h>
+ # endif
+ #endif
+ #if HAVE_STRING_H
+ # if !STDC_HEADERS && HAVE_MEMORY_H
+ #  include <memory.h>
+ # endif
+ # include <string.h>
+ #endif
+ #if HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
+ #if HAVE_INTTYPES_H
+ # include <inttypes.h>
+ #else
+ # if HAVE_STDINT_H
+ #  include <stdint.h>
+ # endif
+ #endif
+ #if HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif"
+ 
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCON [...]
++ac_subst_files=''
  
  # Initialize some variables set by options.
+ ac_init_help=
+ ac_init_version=false
  # The variables have the same names as the options, with
  # dashes changed to underlines.
- build=NONE
- cache_file=./config.cache
+ cache_file=/dev/null
  exec_prefix=NONE
- host=NONE
  no_create=
- nonopt=NONE
  no_recursion=
  prefix=NONE
  program_prefix=NONE
@@@ -471,13 -712,386 +726,446 @@@ els
  fi
  if test ! -r $srcdir/$ac_unique_file; then
    if test "$ac_srcdir_defaulted" = yes; then
-     { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+     { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+    { (exit 1); exit 1; }; }
    else
-     { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+     { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+    { (exit 1); exit 1; }; }
    fi
  fi
- srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
++(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
++  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
++   { (exit 1); exit 1; }; }
+ srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ ac_env_build_alias_set=${build_alias+set}
+ ac_env_build_alias_value=$build_alias
+ ac_cv_env_build_alias_set=${build_alias+set}
+ ac_cv_env_build_alias_value=$build_alias
+ ac_env_host_alias_set=${host_alias+set}
+ ac_env_host_alias_value=$host_alias
+ ac_cv_env_host_alias_set=${host_alias+set}
+ ac_cv_env_host_alias_value=$host_alias
+ ac_env_target_alias_set=${target_alias+set}
+ ac_env_target_alias_value=$target_alias
+ ac_cv_env_target_alias_set=${target_alias+set}
+ ac_cv_env_target_alias_value=$target_alias
+ ac_env_CC_set=${CC+set}
+ ac_env_CC_value=$CC
+ ac_cv_env_CC_set=${CC+set}
+ ac_cv_env_CC_value=$CC
+ ac_env_CFLAGS_set=${CFLAGS+set}
+ ac_env_CFLAGS_value=$CFLAGS
+ ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ ac_cv_env_CFLAGS_value=$CFLAGS
+ ac_env_LDFLAGS_set=${LDFLAGS+set}
+ ac_env_LDFLAGS_value=$LDFLAGS
+ ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ ac_cv_env_LDFLAGS_value=$LDFLAGS
+ ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ ac_env_CPPFLAGS_value=$CPPFLAGS
+ ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ ac_env_CPP_set=${CPP+set}
+ ac_env_CPP_value=$CPP
+ ac_cv_env_CPP_set=${CPP+set}
+ ac_cv_env_CPP_value=$CPP
+ 
+ #
+ # Report the --help message.
+ #
+ 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 this package to adapt to many kinds of systems.
+ 
+ Usage: $0 [OPTION]... [VAR=VALUE]...
+ 
+ To assign environment variables (e.g., CC, CFLAGS...), specify them as
+ VAR=VALUE.  See below for descriptions of some of the useful variables.
+ 
+ Defaults for the options are specified in brackets.
+ 
+ Configuration:
+   -h, --help              display this help and exit
+       --help=short        display options specific to this package
+       --help=recursive    display the short help of all the included packages
+   -V, --version           display version information and exit
+   -q, --quiet, --silent   do not print \`checking...' messages
+       --cache-file=FILE   cache test results in FILE [disabled]
+   -C, --config-cache      alias for \`--cache-file=config.cache'
+   -n, --no-create         do not create output files
+       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+ 
+ _ACEOF
+ 
+   cat <<_ACEOF
+ Installation directories:
+   --prefix=PREFIX         install architecture-independent files in PREFIX
+                           [$ac_default_prefix]
+   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                           [PREFIX]
+ 
+ By default, \`make install' will install all the files in
+ \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+ an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+ for instance \`--prefix=\$HOME'.
+ 
+ For better control, use the options below.
+ 
+ Fine tuning of the installation directories:
+   --bindir=DIR           user executables [EPREFIX/bin]
+   --sbindir=DIR          system admin executables [EPREFIX/sbin]
+   --libexecdir=DIR       program executables [EPREFIX/libexec]
+   --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+   --libdir=DIR           object code libraries [EPREFIX/lib]
+   --includedir=DIR       C header files [PREFIX/include]
+   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+   --infodir=DIR          info documentation [PREFIX/info]
+   --mandir=DIR           man documentation [PREFIX/man]
+ _ACEOF
+ 
+   cat <<\_ACEOF
+ 
+ Program names:
+   --program-prefix=PREFIX            prepend PREFIX to installed program names
+   --program-suffix=SUFFIX            append SUFFIX to installed program names
+   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
+ 
+ X features:
+   --x-includes=DIR    X include files are in DIR
+   --x-libraries=DIR   X library files are in DIR
+ 
+ System types:
+   --build=BUILD     configure for building on BUILD [guessed]
+   --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+ _ACEOF
+ fi
+ 
+ if test -n "$ac_init_help"; then
+ 
+   cat <<\_ACEOF
+ 
+ Optional Features:
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+   --disable-dependency-tracking Speeds up one-time builds
+   --enable-dependency-tracking  Do not reject slow dependency extractors
+ 
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+   --with-x                use the X Window System
+ 
+ Some influential environment variables:
+   CC          C compiler command
+   CFLAGS      C compiler flags
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+               nonstandard directory <lib dir>
+   CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+               headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
+ 
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+ 
+ _ACEOF
+ fi
+ 
+ if test "$ac_init_help" = "recursive"; then
+   # If there are subdirs, report their specific --help.
+   ac_popdir=`pwd`
+   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+     test -d $ac_dir || continue
+     ac_builddir=.
+ 
+ if test "$ac_dir" != .; then
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   # A "../" for each directory in $ac_dir_suffix.
+   ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+ else
+   ac_dir_suffix= ac_top_builddir=
+ fi
+ 
+ case $srcdir in
+   .)  # No --srcdir option.  We are building in place.
+     ac_srcdir=.
+     if test -z "$ac_top_builddir"; then
+        ac_top_srcdir=.
+     else
+        ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+     fi ;;
+   [\\/]* | ?:[\\/]* )  # Absolute path.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+     ac_top_srcdir=$srcdir ;;
+   *) # Relative path.
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+ # absolute.
+ ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
 -ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
++ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+ 
+     cd $ac_dir
+     # Check for guested configure; otherwise get Cygnus style configure.
+     if test -f $ac_srcdir/configure.gnu; then
+       echo
+       $SHELL $ac_srcdir/configure.gnu  --help=recursive
+     elif test -f $ac_srcdir/configure; then
+       echo
+       $SHELL $ac_srcdir/configure  --help=recursive
+     elif test -f $ac_srcdir/configure.ac ||
+            test -f $ac_srcdir/configure.in; then
+       echo
+       $ac_configure --help
+     else
+       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+     fi
+     cd $ac_popdir
+   done
+ fi
+ 
+ test -n "$ac_init_help" && exit 0
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ 
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+ Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+   exit 0
+ fi
+ exec 5>config.log
+ cat >&5 <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
 -generated by GNU Autoconf 2.53.  Invocation command line was
++generated by GNU Autoconf 2.57.  Invocation command line was
+ 
+   $ $0 $@
+ 
+ _ACEOF
+ {
+ cat <<_ASUNAME
+ ## --------- ##
+ ## Platform. ##
+ ## --------- ##
+ 
+ hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+ uname -m = `(uname -m) 2>/dev/null || echo unknown`
+ uname -r = `(uname -r) 2>/dev/null || echo unknown`
+ uname -s = `(uname -s) 2>/dev/null || echo unknown`
+ uname -v = `(uname -v) 2>/dev/null || echo unknown`
+ 
+ /usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+ /bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+ 
+ /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+ /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+ hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+ /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+ /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+ /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+ 
+ _ASUNAME
+ 
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   echo "PATH: $as_dir"
+ done
+ 
+ } >&5
+ 
+ cat >&5 <<_ACEOF
+ 
+ 
+ ## ----------- ##
+ ## Core tests. ##
+ ## ----------- ##
+ 
+ _ACEOF
+ 
+ 
+ # Keep a trace of the command line.
+ # Strip out --no-create and --no-recursion so they do not pile up.
++# Strip out --silent because we don't want to record it for future runs.
+ # Also quote any args containing shell meta-characters.
++# Make two passes to allow for proper duplicate-argument suppression.
+ ac_configure_args=
++ac_configure_args0=
++ac_configure_args1=
+ ac_sep=
 -for ac_arg
++ac_must_keep_next=false
++for ac_pass in 1 2
+ do
 -  case $ac_arg in
 -  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
 -  | --no-cr | --no-c | -n ) continue ;;
 -  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
 -  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
 -    continue ;;
 -  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
 -    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
 -  esac
 -  case " $ac_configure_args " in
 -    *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
 -    *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
 -       ac_sep=" " ;;
 -  esac
 -  # Get rid of the leading space.
++  for ac_arg
++  do
++    case $ac_arg in
++    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
++    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++    | -silent | --silent | --silen | --sile | --sil)
++      continue ;;
++    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    esac
++    case $ac_pass in
++    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
++    2)
++      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
++      if test $ac_must_keep_next = true; then
++        ac_must_keep_next=false # Got value, back to normal.
++      else
++        case $ac_arg in
++          *=* | --config-cache | -C | -disable-* | --disable-* \
++          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
++          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
++          | -with-* | --with-* | -without-* | --without-* | --x)
++            case "$ac_configure_args0 " in
++              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
++            esac
++            ;;
++          -* ) ac_must_keep_next=true ;;
++        esac
++      fi
++      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
++      # Get rid of the leading space.
++      ac_sep=" "
++      ;;
++    esac
++  done
+ done
++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+ 
+ # When interrupted or exit'd, cleanup temporary files, and complete
+ # config.log.  We remove comments because anyway the quotes in there
+ # would cause problems or look ugly.
+ # WARNING: Be sure not to use single quotes in there, as some shells,
+ # such as our DU 5.0 friend, will then `close' the trap.
+ trap 'exit_status=$?
+   # Save into config.log some information that might help in debugging.
+   {
+     echo
++
+     cat <<\_ASBOX
+ ## ---------------- ##
+ ## Cache variables. ##
+ ## ---------------- ##
+ _ASBOX
+     echo
+     # The following way of writing the cache mishandles newlines in values,
+ {
+   (set) 2>&1 |
+     case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+     *ac_space=\ *)
+       sed -n \
+         "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+     	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+       ;;
+     *)
+       sed -n \
+         "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+       ;;
+     esac;
+ }
+     echo
++
++    cat <<\_ASBOX
++## ----------------- ##
++## Output variables. ##
++## ----------------- ##
++_ASBOX
++    echo
++    for ac_var in $ac_subst_vars
++    do
++      eval ac_val=$`echo $ac_var`
++      echo "$ac_var='"'"'$ac_val'"'"'"
++    done | sort
++    echo
++
++    if test -n "$ac_subst_files"; then
++      cat <<\_ASBOX
++## ------------- ##
++## Output files. ##
++## ------------- ##
++_ASBOX
++      echo
++      for ac_var in $ac_subst_files
++      do
++	eval ac_val=$`echo $ac_var`
++        echo "$ac_var='"'"'$ac_val'"'"'"
++      done | sort
++      echo
++    fi
++
+     if test -s confdefs.h; then
+       cat <<\_ASBOX
+ ## ----------- ##
+ ## confdefs.h. ##
+ ## ----------- ##
+ _ASBOX
+       echo
 -      sed "/^$/d" confdefs.h
++      sed "/^$/d" confdefs.h | sort
+       echo
+     fi
+     test "$ac_signal" != 0 &&
+       echo "$as_me: caught signal $ac_signal"
+     echo "$as_me: exit $exit_status"
+   } >&5
+   rm -f core core.* *.core &&
+   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+     exit $exit_status
+      ' 0
+ for ac_signal in 1 2 13 15; do
+   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ done
+ ac_signal=0
+ 
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+ rm -rf conftest* confdefs.h
+ # AIX cpp loses on an empty file, so make sure it contains at least a newline.
+ echo >confdefs.h
+ 
+ # Predefined preprocessor variables.
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_NAME "$PACKAGE_NAME"
+ _ACEOF
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+ _ACEOF
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_VERSION "$PACKAGE_VERSION"
+ _ACEOF
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_STRING "$PACKAGE_STRING"
+ _ACEOF
  
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+ _ACEOF
+ 
+ 
+ # Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
    if test "x$prefix" != xNONE; then
@@@ -502,27 -1178,28 +1252,29 @@@ echo "$as_me: error: run \`make distcle
  fi
  
  ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
- ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
- 
- ac_exeext=
- ac_objext=o
- if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-   # Stardent Vistra SVR4 grep lacks -e, says ghazi at caip.rutgers.edu.
-   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-     ac_n= ac_c='
- ' ac_t='	'
-   else
-     ac_n=-n ac_c= ac_t=
-   fi
- else
-   ac_n= ac_c='\c' ac_t=
- fi
+ 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
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  
 +
  ac_aux_dir=
  for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
    if test -f $ac_dir/install-sh; then
@@@ -536,39 -1217,71 +1292,71 @@@
    fi
  done
  if test -z "$ac_aux_dir"; then
-   { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+   { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+ echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+    { (exit 1); exit 1; }; }
  fi
- ac_config_guess=$ac_aux_dir/config.guess
- ac_config_sub=$ac_aux_dir/config.sub
- ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
- 
+ ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
  
  # Make sure we can run config.sub.
- if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
- else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
- fi
- 
- echo $ac_n "checking host system type""... $ac_c" 1>&6
- echo "configure:553: checking host system type" >&5
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+   { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ echo "$as_me:$LINENO: checking build system type" >&5
+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_build_alias=$build_alias
+ test -z "$ac_cv_build_alias" &&
+   ac_cv_build_alias=`$ac_config_guess`
+ test -z "$ac_cv_build_alias" &&
+   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+    { (exit 1); exit 1; }; }
+ ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+   { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+ echo "${ECHO_T}$ac_cv_build" >&6
+ build=$ac_cv_build
+ build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+ 
+ echo "$as_me:$LINENO: checking host system type" >&5
+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_host_alias=$host_alias
+ test -z "$ac_cv_host_alias" &&
+   ac_cv_host_alias=$ac_cv_build_alias
+ ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+   { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+ echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+    { (exit 1); exit 1; }; }
  
- host_alias=$host
- case "$host_alias" in
- NONE)
-   case $nonopt in
-   NONE)
-     if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-     else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-     fi ;;
-   *) host_alias=$nonopt ;;
-   esac ;;
- esac
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+ echo "${ECHO_T}$ac_cv_host" >&6
+ host=$ac_cv_host
+ host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
  
- host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
- host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- echo "$ac_t""$host" 1>&6
  
+ # Add the stamp file to the list of files AC keeps track of,
+ # along with our hook.
 -ac_config_headers="$ac_config_headers config.h"
++          ac_config_headers="$ac_config_headers config.h"
  
  
  
@@@ -670,42 -1401,93 +1476,93 @@@ the
     # Ok.
     :
  else
-    { echo "configure: error: newly created file is older than distributed files!
- Check your system clock" 1>&2; exit 1; }
- fi
- rm -f conftest*
- echo "$ac_t""yes" 1>&6
- if test "$program_transform_name" = s,x,x,; then
-   program_transform_name=
- else
-   # Double any \ or $.  echo might interpret backslashes.
-   cat <<\EOF_SED > conftestsed
- s,\\,\\\\,g; s,\$,$$,g
- EOF_SED
-   program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-   rm -f conftestsed
- fi
+    { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+ Check your system clock" >&5
+ echo "$as_me: error: newly created file is older than distributed files!
+ Check your system clock" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
  test "$program_prefix" != NONE &&
-   program_transform_name="s,^,${program_prefix},; $program_transform_name"
+   program_transform_name="s,^,$program_prefix,;$program_transform_name"
  # Use a double $ so make ignores it.
  test "$program_suffix" != NONE &&
-   program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+   program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+ # Double any \ or $.  echo might interpret backslashes.
+ # By default was `s,x,x', remove it if useless.
+ cat <<\_ACEOF >conftest.sed
+ s/[\\$]/&&/g;s/;s,x,x,$//
+ _ACEOF
+ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+ rm conftest.sed
+ 
+ 
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ 
+ test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+ # Use eval to expand $SHELL
+ if eval "$MISSING --run true"; then
+   am_missing_run="$MISSING --run "
+ else
+   am_missing_run=
+   { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+ 
+ for ac_prog in gawk mawk nawk awk
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AWK+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$AWK"; then
+   ac_cv_prog_AWK="$AWK" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_AWK="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
+ 
+ fi
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+   echo "$as_me:$LINENO: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
  
- # sed with no file args requires a program.
- test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+   test -n "$AWK" && break
+ done
  
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
- echo "configure:699: checking whether ${MAKE-make} sets \${MAKE}" >&5
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
 -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5
 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+ if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   cat > conftestmake <<\EOF
+   cat >conftest.make <<\_ACEOF
  all:
--	@echo 'ac_maketemp="${MAKE}"'
- EOF
++	@echo 'ac_maketemp="$(MAKE)"'
+ _ACEOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+ eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
  if test -n "$ac_maketemp"; then
    eval ac_cv_prog_make_${ac_make}_set=yes
  else
@@@ -908,9 -1890,9 +1965,7 @@@ if test $ac_prog_rejected = yes; the
      # However, it has the same basename, so the bogon will be chosen
      # first if we set CC to just the basename; use the full file name.
      shift
-     set dummy "$ac_dir/$ac_word" "$@"
 -    set dummy "$as_dir/$ac_word" ${1+"$@"}
--    shift
--    ac_cv_prog_CC="$@"
++    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
    fi
  fi
  fi
@@@ -935,123 -1921,393 +1994,410 @@@ els
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
-   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-   ac_dummy="$PATH"
-   for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_prog_CC="cl"
-       break
-     fi
-   done
-   IFS="$ac_save_ifs"
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
+ 
  fi
  fi
- CC="$ac_cv_prog_CC"
+ CC=$ac_cv_prog_CC
  if test -n "$CC"; then
-   echo "$ac_t""$CC" 1>&6
+   echo "$as_me:$LINENO: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
  else
-   echo "$ac_t""no" 1>&6
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
  fi
-  ;;
-     esac
+ 
+     test -n "$CC" && break
+   done
+ fi
+ if test -z "$CC"; then
+   ac_ct_CC=$CC
+   for ac_prog in cl
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$ac_ct_CC"; then
+   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
    fi
-   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+ done
+ done
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+   echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
  fi
  
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
- echo "configure:964: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+   test -n "$ac_ct_CC" && break
+ done
  
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
- ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
- 
- cat > conftest.$ac_ext << EOF
- 
- #line 975 "configure"
- #include "confdefs.h"
- 
- main(){return(0);}
- EOF
- if { (eval echo configure:980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
-   # If we can't run a trivial program, we are probably using a cross compiler.
-   if (./conftest; exit) 2>/dev/null; then
-     ac_cv_prog_cc_cross=no
+   CC=$ac_ct_CC
+ fi
+ 
+ fi
+ 
+ 
 -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5
 -echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;}
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&5
++echo "$as_me: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ 
+ # Provide some information about the compiler.
+ echo "$as_me:$LINENO:" \
+      "checking for C compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+ { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+   (eval $ac_compiler --version </dev/null >&5) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ { (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+   (eval $ac_compiler -v </dev/null >&5) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ { (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+   (eval $ac_compiler -V </dev/null >&5) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ ac_clean_files_save=$ac_clean_files
 -ac_clean_files="$ac_clean_files a.out a.exe"
++ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+ echo "$as_me:$LINENO: checking for C compiler default output" >&5
+ echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+ ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # Find the output, starting from the most likely.  This scheme is
+ # not robust to junk in `.', hence go to wildcards (a.*) only as a last
+ # resort.
+ 
+ # Be careful to initialize this variable, since it used to be cached.
+ # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+ ac_cv_exeext=
 -for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null;
 -                ls a.out conftest 2>/dev/null;
 -                ls a.* conftest.* 2>/dev/null`; do
++# b.out is created by i960 compilers.
++for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++do
++  test -f "$ac_file" || continue
+   case $ac_file in
 -    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;;
 -    a.out ) # We found the default executable, but exeext='' is most
 -            # certainly right.
 -            break;;
 -    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 -          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
 -          export ac_cv_exeext
 -          break;;
 -    * ) break;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
++        ;;
++    conftest.$ac_ext )
++        # This is the source file.
++        ;;
++    [ab].out )
++        # We found the default executable, but exeext='' is most
++        # certainly right.
++        break;;
++    *.* )
++        ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++        # FIXME: I believe we export ac_cv_exeext for Libtool,
++        # but it would be cool to find out if it's true.  Does anybody
++        # maintain Libtool? --akim.
++        export ac_cv_exeext
++        break;;
++    * )
++        break;;
+   esac
+ done
+ else
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5
 -echo "$as_me: error: C compiler cannot create executables" >&2;}
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
++See \`config.log' for more details." >&5
++echo "$as_me: error: C compiler cannot create executables
++See \`config.log' for more details." >&2;}
+    { (exit 77); exit 77; }; }
+ fi
+ 
+ ac_exeext=$ac_cv_exeext
+ echo "$as_me:$LINENO: result: $ac_file" >&5
+ echo "${ECHO_T}$ac_file" >&6
+ 
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+     cross_compiling=no
    else
-     ac_cv_prog_cc_cross=yes
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+ 	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
 -If you meant to cross compile, use \`--host'." >&5
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot run C compiled programs.
 -If you meant to cross compile, use \`--host'." >&2;}
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+     fi
    fi
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   ac_cv_prog_cc_works=no
  fi
- rm -fr conftest*
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
- ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
- 
- echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
- if test $ac_cv_prog_cc_works = no; then
-   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
- echo "configure:1006: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
- cross_compiling=$ac_cv_prog_cc_cross
- 
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
- echo "configure:1011: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.c <<EOF
- #ifdef __GNUC__
-   yes;
- #endif
- EOF
- if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-   ac_cv_prog_gcc=yes
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
 -rm -f a.out a.exe conftest$ac_cv_exeext
++rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+ echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+ # work properly (i.e., refer to `conftest.exe'), while it won't with
+ # `rm'.
 -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
++for ac_file in conftest.exe conftest conftest.*; do
++  test -f "$ac_file" || continue
+   case $ac_file in
 -    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+           export ac_cv_exeext
+           break;;
+     * ) break;;
+   esac
+ done
  else
-   ac_cv_prog_gcc=no
- fi
- fi
- 
- echo "$ac_t""$ac_cv_prog_gcc" 1>&6
 -  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5
 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;}
++  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ rm -f conftest$ac_cv_exeext
+ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+ echo "${ECHO_T}$ac_cv_exeext" >&6
+ 
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+ echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+ if test "${ac_cv_objext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+   case $ac_file in
 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+        break;;
+   esac
+ done
+ else
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5
 -echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;}
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+ echo "${ECHO_T}$ac_cv_objext" >&6
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+ echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ #ifndef __GNUC__
+        choke me
+ #endif
  
- if test $ac_cv_prog_gcc = yes; then
-   GCC=yes
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_compiler_gnu=yes
  else
-   GCC=
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_compiler_gnu=no
  fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
- ac_test_CFLAGS="${CFLAGS+set}"
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
- echo "configure:1039: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+ GCC=`test $ac_compiler_gnu = yes && echo yes`
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ CFLAGS="-g"
+ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+ echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   echo 'void f(){}' > conftest.c
- if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
    ac_cv_prog_cc_g=yes
  else
-   ac_cv_prog_cc_g=no
- fi
- rm -f conftest*
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
+ ac_cv_prog_cc_g=no
  fi
- 
- echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
  if test "$ac_test_CFLAGS" = set; then
-   CFLAGS="$ac_save_CFLAGS"
+   CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
    if test "$GCC" = yes; then
      CFLAGS="-g -O2"
@@@ -1065,126 -2321,455 +2411,550 @@@ els
      CFLAGS=
    fi
  fi
++echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
++echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
++if test "${ac_cv_prog_cc_stdc+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_prog_cc_stdc=no
++ac_save_CC=$CC
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++     char **p;
++     int i;
++{
++  return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++  char *s;
++  va_list v;
++  va_start (v,p);
++  s = g (p, va_arg (v,int));
++  va_end (v);
++  return s;
++}
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
++int
++main ()
++{
++return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
++  ;
++  return 0;
++}
++_ACEOF
++# Don't try gcc -ansi; that turns off useful extensions and
++# breaks some systems' header files.
++# AIX			-qlanglvl=ansi
++# Ultrix and OSF/1	-std1
++# HP-UX 10.20 and later	-Ae
++# HP-UX older versions	-Aa -D_HPUX_SOURCE
++# SVR4			-Xc -D__EXTENSIONS__
++for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++  CC="$ac_save_CC $ac_arg"
++  rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_cc_stdc=$ac_arg
++break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
- # 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
- # 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"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
- echo "configure:1082: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-     IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-   for ac_dir in $PATH; do
-     # Account for people who put trailing slashes in PATH elements.
-     case "$ac_dir/" in
-     /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/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
-         if test -f $ac_dir/$ac_prog; then
- 	  if test $ac_prog = install &&
-             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
- 	    # AIX install.  It has an incompatible calling convention.
- 	    :
- 	  else
- 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
- 	    break 2
- 	  fi
- 	fi
-       done
-       ;;
-     esac
-   done
-   IFS="$ac_save_IFS"
- 
- 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.  We don't cache a
-     # path for INSTALL within a source directory, because that will
-     # break other packages using the cache if that directory is
-     # removed, or if the path is relative.
-     INSTALL="$ac_install_sh"
-   fi
 +fi
- echo "$ac_t""$INSTALL" 1>&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 conftest.$ac_objext
++done
++rm -f conftest.$ac_ext conftest.$ac_objext
++CC=$ac_save_CC
 +
- test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++fi
 +
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
++case "x$ac_cv_prog_cc_stdc" in
++  x|xno)
++    echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6 ;;
++  *)
++    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
++    CC="$CC $ac_cv_prog_cc_stdc" ;;
++esac
 +
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
- echo "configure:1135: checking whether ${MAKE-make} sets \${MAKE}" >&5
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+ # Some people use a C++ compiler to compile C.  Since we use `exit',
+ # in C++ we need to declare it.  In case someone uses the same compiler
+ # for both compiling C and C++ we need to have the C++ compiler decide
+ # the declaration of exit, since it's the most demanding environment.
+ cat >conftest.$ac_ext <<_ACEOF
+ #ifndef __cplusplus
+   choke me
+ #endif
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   for ac_declaration in \
+    ''\
+    '#include <stdlib.h>' \
+    'extern "C" void std::exit (int) throw (); using std::exit;' \
+    'extern "C" void std::exit (int); using std::exit;' \
+    'extern "C" void exit (int) throw ();' \
+    'extern "C" void exit (int);' \
+    'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <stdlib.h>
+ $ac_declaration
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ exit (42);
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
  else
-   cat > conftestmake <<\EOF
- all:
- 	@echo 'ac_maketemp="${MAKE}"'
- EOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
- if test -n "$ac_maketemp"; then
-   eval ac_cv_prog_make_${ac_make}_set=yes
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ continue
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_declaration
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ exit (42);
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   break
  else
-   eval ac_cv_prog_make_${ac_make}_set=no
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
  fi
- rm -f conftestmake
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ rm -f conftest*
+ if test -n "$ac_declaration"; then
+   echo '#ifdef __cplusplus' >>confdefs.h
+   echo $ac_declaration      >>confdefs.h
+   echo '#endif'             >>confdefs.h
  fi
- if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   SET_MAKE=
+ 
  else
-   echo "$ac_t""no" 1>&6
-   SET_MAKE="MAKE=${MAKE-make}"
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 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
+ rm -f .deps 2>/dev/null
+ mkdir .deps 2>/dev/null
+ if test -d .deps; then
+   DEPDIR=.deps
+ else
+   # MS-DOS does not allow filenames that begin with a dot.
+   DEPDIR=_deps
+ fi
+ rmdir .deps 2>/dev/null
+ 
+ 
 -ac_config_commands="$ac_config_commands depfiles"
++          ac_config_commands="$ac_config_commands depfiles"
+ 
+ 
+ am_make=${MAKE-make}
+ cat > confinc << 'END'
+ doit:
+ 	@echo done
+ END
+ # If we don't find an include directive, just comment out the code.
+ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+ echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&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 | fgrep -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
  
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
- echo "configure:1164: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+ 
+ echo "$as_me:$LINENO: result: $_am_result" >&5
+ echo "${ECHO_T}$_am_result" >&6
+ rm -f confinc confmf
+ 
+ # Check whether --enable-dependency-tracking or --disable-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
-   if test -n "$RANLIB"; then
-   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+   AMDEP_TRUE='#'
+   AMDEP_FALSE=
+ fi
+ 
+ 
+ 
+ 
+ depcc="$CC"   am_compiler_list=
+ 
+ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+ echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-   ac_dummy="$PATH"
-   for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-       ac_cv_prog_RANLIB="ranlib"
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+   # We make a subdir and do the tests there.  Otherwise we can end up
+   # making bogus files that we don't know about and never remove.  For
+   # instance it was reported that on HP-UX the gcc test will end up
+   # making a dummy file named `D' -- because `-MD' means `put the output
+   # in D'.
+   mkdir conftest.dir
+   # Copy depcomp to subdir because otherwise we won't find it if we're
+   # using a relative directory.
+   cp "$am_depcomp" conftest.dir
+   cd conftest.dir
+ 
+   am_cv_CC_dependencies_compiler_type=none
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
+   for depmode in $am_compiler_list; do
+     # We need to recreate these files for each test, as the compiler may
+     # overwrite some of them when testing with obscure command lines.
+     # This happens at least with the AIX C compiler.
+     echo '#include "conftest.h"' > conftest.c
+     echo 'int i;' > conftest.h
+     echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+ 
+     case $depmode in
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+       if test "x$enable_dependency_tracking" = xyes; then
+ 	continue
+       else
+ 	break
+       fi
+       ;;
+     none) break ;;
+     esac
+     # We check with `-c' and `-o' for the sake of the "dashmstdout"
+     # mode.  It turns out that the SunPro C++ compiler does not properly
+     # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+        source=conftest.c object=conftest.o \
+        depfile=conftest.Po tmpdepfile=conftest.TPo \
+        $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
+        grep conftest.h conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       am_cv_CC_dependencies_compiler_type=$depmode
        break
      fi
    done
-   IFS="$ac_save_ifs"
-   test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+ 
+   cd ..
+   rm -rf conftest.dir
+ else
+   am_cv_CC_dependencies_compiler_type=none
+ fi
+ 
+ fi
+ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+ 
+ 
+ # 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"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+ echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ 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/* | \
+   /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 $as_executable_p "$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
+             ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+             break 3
+           fi
+         fi
+       done
+     done
+     ;;
+ esac
+ done
+ 
+ 
+ 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.  We don't cache a
+     # path for INSTALL within a source directory, because that will
+     # break other packages using the cache if that directory is
+     # removed, or if the path is relative.
+     INSTALL=$ac_install_sh
+   fi
+ fi
+ echo "$as_me:$LINENO: result: $INSTALL" >&5
+ echo "${ECHO_T}$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}'
+ 
+ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
 -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5
 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+ if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.make <<\_ACEOF
+ all:
 -	@echo 'ac_maketemp="${MAKE}"'
++	@echo 'ac_maketemp="$(MAKE)"'
+ _ACEOF
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+ if test -n "$ac_maketemp"; then
+   eval ac_cv_prog_make_${ac_make}_set=yes
+ else
+   eval ac_cv_prog_make_${ac_make}_set=no
+ fi
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+   echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$RANLIB"; then
+   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
+ 
  fi
  fi
- RANLIB="$ac_cv_prog_RANLIB"
+ RANLIB=$ac_cv_prog_RANLIB
  if test -n "$RANLIB"; then
-   echo "$ac_t""$RANLIB" 1>&6
+   echo "$as_me:$LINENO: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ fi
+ if test -z "$ac_cv_prog_RANLIB"; then
+   ac_ct_RANLIB=$RANLIB
+   # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -n "$ac_ct_RANLIB"; then
+   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+     ac_cv_prog_ac_ct_RANLIB="ranlib"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
+ 
+   test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+ fi
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+   echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   RANLIB=$ac_ct_RANLIB
  else
-   echo "$ac_t""no" 1>&6
+   RANLIB="$ac_cv_prog_RANLIB"
  fi
  
  
@@@ -1195,85 -2786,198 +2971,232 @@@ if test -n "$CPP" && test -d "$CPP"; th
    CPP=
  fi
  if test -z "$CPP"; then
- if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+   if test "${ac_cv_prog_CPP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-     # This must be in double quotes, not single quotes, because CPP may get
-   # substituted into the Makefile and "${CC-cc}" will confuse make.
-   CPP="${CC-cc} -E"
+       # 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
+   # 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.
-   cat > conftest.$ac_ext <<EOF
- #line 1208 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:1214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
 -#include <assert.h>
++/* 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 { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+   fi
  else
-   echo "$ac_err" >&5
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CPP="${CC-cc} -E -traditional-cpp"
-   cat > conftest.$ac_ext <<EOF
- #line 1225 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:1231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
+   ac_cpp_err=yes
+ fi
+ if test -z "$ac_cpp_err"; then
    :
  else
-   echo "$ac_err" >&5
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CPP="${CC-cc} -nologo -E"
-   cat > conftest.$ac_ext <<EOF
- #line 1242 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:1248: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
+   echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&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 non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+   fi
  else
-   echo "$ac_err" >&5
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CPP=/lib/cpp
+   ac_cpp_err=yes
  fi
- rm -f conftest*
+ if test -z "$ac_cpp_err"; then
+   # Broken: success on invalid input.
+ continue
+ else
+   echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   # Passes both tests.
+ ac_preproc_ok=:
+ break
  fi
- rm -f conftest*
+ 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
+   break
  fi
- rm -f conftest*
-   ac_cv_prog_CPP="$CPP"
+ 
+     done
+     ac_cv_prog_CPP=$CPP
+ 
+ fi
+   CPP=$ac_cv_prog_CPP
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+ echo "$as_me:$LINENO: result: $CPP" >&5
+ echo "${ECHO_T}$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
+ #line $LINENO "configure"
 -#include "confdefs.h"
 -#include <assert.h>
++/* 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 { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+   fi
+ else
+   ac_cpp_err=yes
+ fi
+ if test -z "$ac_cpp_err"; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&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 non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+   fi
+ else
+   ac_cpp_err=yes
+ fi
+ if test -z "$ac_cpp_err"; then
+   # Broken: success on invalid input.
+ continue
+ else
+   echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   # Passes both tests.
+ ac_preproc_ok=:
+ break
  fi
-   CPP="$ac_cv_prog_CPP"
+ 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
-   ac_cv_prog_CPP="$CPP"
 -  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5
 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
++  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
  fi
- echo "$ac_t""$CPP" 1>&6
  
- # If we find X, set shell vars x_includes and x_libraries to the
- # paths, otherwise set no_x=yes.
- # Uses ac_ vars as temps to allow command line to override cache and checks.
- # --without-x overrides everything else, but does not touch the cache.
- echo $ac_n "checking for X""... $ac_c" 1>&6
- echo "configure:1277: checking for X" >&5
+ 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
+ 
+ 
+ echo "$as_me:$LINENO: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
  
  # Check whether --with-x or --without-x was given.
  if test "${with_x+set}" = set; then
@@@ -1326,147 -3029,134 +3248,138 @@@ _ACEO
      esac
    fi
    cd ..
-   rm -fr conftestdir
+   rm -fr conftest.dir
  fi
  
- if test "$ac_x_includes" = NO; then
-   # Guess where to find include files, by looking for this one X11 .h file.
-   test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
- 
+ # Standard set of common directories for X headers.
+ # Check X11 before X11Rn because it is often a symlink to the current release.
+ ac_x_header_dirs='
+ /usr/X11/include
+ /usr/X11R6/include
+ /usr/X11R5/include
+ /usr/X11R4/include
+ 
+ /usr/include/X11
+ /usr/include/X11R6
+ /usr/include/X11R5
+ /usr/include/X11R4
+ 
+ /usr/local/X11/include
+ /usr/local/X11R6/include
+ /usr/local/X11R5/include
+ /usr/local/X11R4/include
+ 
+ /usr/local/include/X11
+ /usr/local/include/X11R6
+ /usr/local/include/X11R5
+ /usr/local/include/X11R4
+ 
+ /usr/X386/include
+ /usr/x386/include
+ /usr/XFree86/include/X11
+ 
+ /usr/include
+ /usr/local/include
+ /usr/unsupported/include
+ /usr/athena/include
+ /usr/local/x11r5/include
+ /usr/lpp/Xamples/include
+ 
+ /usr/openwin/include
+ /usr/openwin/share/include'
+ 
+ if test "$ac_x_includes" = no; then
+   # Guess where to find include files, by looking for Intrinsic.h.
    # First, try using that file with no special directory specified.
- cat > conftest.$ac_ext <<EOF
- #line 1339 "configure"
- #include "confdefs.h"
- #include <$x_direct_test_include>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:1344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <X11/Intrinsic.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+   fi
+ else
+   ac_cpp_err=yes
+ fi
+ if test -z "$ac_cpp_err"; then
    # We can compile using X headers with no special include directory.
  ac_x_includes=
  else
-   echo "$ac_err" >&5
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   # Look for the header file in a standard set of common directories.
- # Check X11 before X11Rn because it is often a symlink to the current release.
-   for ac_dir in               \
-     /usr/X11/include          \
-     /usr/X11R6/include        \
-     /usr/X11R5/include        \
-     /usr/X11R4/include        \
-                               \
-     /usr/include/X11          \
-     /usr/include/X11R6        \
-     /usr/include/X11R5        \
-     /usr/include/X11R4        \
-                               \
-     /usr/local/X11/include    \
-     /usr/local/X11R6/include  \
-     /usr/local/X11R5/include  \
-     /usr/local/X11R4/include  \
-                               \
-     /usr/local/include/X11    \
-     /usr/local/include/X11R6  \
-     /usr/local/include/X11R5  \
-     /usr/local/include/X11R4  \
-                               \
-     /usr/X386/include         \
-     /usr/x386/include         \
-     /usr/XFree86/include/X11  \
-                               \
-     /usr/include              \
-     /usr/local/include        \
-     /usr/unsupported/include  \
-     /usr/athena/include       \
-     /usr/local/x11r5/include  \
-     /usr/lpp/Xamples/include  \
-                               \
-     /usr/openwin/include      \
-     /usr/openwin/share/include \
-     ; \
-   do
-     if test -r "$ac_dir/$x_direct_test_include"; then
-       ac_x_includes=$ac_dir
-       break
-     fi
-   done
+   echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   for ac_dir in $ac_x_header_dirs; do
+   if test -r "$ac_dir/X11/Intrinsic.h"; then
+     ac_x_includes=$ac_dir
+     break
+   fi
+ done
  fi
- rm -f conftest*
- fi # $ac_x_includes = NO
+ rm -f conftest.err conftest.$ac_ext
+ fi # $ac_x_includes = no
  
- if test "$ac_x_libraries" = NO; then
+ if test "$ac_x_libraries" = no; then
    # Check for the libraries.
- 
-   test -z "$x_direct_test_library" && x_direct_test_library=Xt
-   test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
- 
    # See if we find them without any special options.
    # Don't add to $LIBS permanently.
-   ac_save_LIBS="$LIBS"
-   LIBS="-l$x_direct_test_library $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1413 "configure"
- #include "confdefs.h"
- 
- int main() {
- ${x_direct_test_function}()
- ; return 0; }
- EOF
- if { (eval echo configure:1420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   LIBS="$ac_save_LIBS"
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <X11/Intrinsic.h>
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ XtMalloc (0)
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   LIBS=$ac_save_LIBS
  # We can link X programs with no special library path.
  ac_x_libraries=
  else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   LIBS="$ac_save_LIBS"
- # First see if replacing the include by lib works.
- # Check X11 before X11Rn because it is often a symlink to the current release.
- for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
-     /usr/X11/lib          \
-     /usr/X11R6/lib        \
-     /usr/X11R5/lib        \
-     /usr/X11R4/lib        \
-                           \
-     /usr/lib/X11          \
-     /usr/lib/X11R6        \
-     /usr/lib/X11R5        \
-     /usr/lib/X11R4        \
-                           \
-     /usr/local/X11/lib    \
-     /usr/local/X11R6/lib  \
-     /usr/local/X11R5/lib  \
-     /usr/local/X11R4/lib  \
-                           \
-     /usr/local/lib/X11    \
-     /usr/local/lib/X11R6  \
-     /usr/local/lib/X11R5  \
-     /usr/local/lib/X11R4  \
-                           \
-     /usr/X386/lib         \
-     /usr/x386/lib         \
-     /usr/XFree86/lib/X11  \
-                           \
-     /usr/lib              \
-     /usr/local/lib        \
-     /usr/unsupported/lib  \
-     /usr/athena/lib       \
-     /usr/local/x11r5/lib  \
-     /usr/lpp/Xamples/lib  \
-     /lib/usr/lib/X11	  \
-                           \
-     /usr/openwin/lib      \
-     /usr/openwin/share/lib \
-     ; \
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ LIBS=$ac_save_LIBS
+ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
  do
+   # Don't even attempt the hair of trying to link an X program!
    for ac_extension in a so sl; do
-     if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
+     if test -r $ac_dir/libXt.$ac_extension; then
        ac_x_libraries=$ac_dir
        break 2
      fi
@@@ -1519,60 -3213,101 +3436,99 @@@ els
      X_LIBS="$X_LIBS -L$x_libraries"
      # For Solaris; some versions of Sun CC require a space after -R and
      # others require no space.  Words are not sufficient . . . .
-     case "`(uname -sr) 2>/dev/null`" in
+     case `(uname -sr) 2>/dev/null` in
      "SunOS 5"*)
-       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
- echo "configure:1526: checking whether -R must be followed by a space" >&5
-       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
-       cat > conftest.$ac_ext <<EOF
- #line 1529 "configure"
- #include "confdefs.h"
- 
- int main() {
- 
- ; return 0; }
- EOF
- if { (eval echo configure:1536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
+       echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+       cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
    ac_R_nospace=yes
  else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   ac_R_nospace=no
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_R_nospace=no
  fi
- rm -f conftest*
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
        if test $ac_R_nospace = yes; then
- 	echo "$ac_t""no" 1>&6
+ 	echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
  	X_LIBS="$X_LIBS -R$x_libraries"
        else
  	LIBS="$ac_xsave_LIBS -R $x_libraries"
- 	cat > conftest.$ac_ext <<EOF
- #line 1552 "configure"
- #include "confdefs.h"
- 
- int main() {
- 
- ; return 0; }
- EOF
- if { (eval echo configure:1559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
+ 	cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
    ac_R_space=yes
  else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   ac_R_space=no
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_R_space=no
  fi
- rm -f conftest*
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  	if test $ac_R_space = yes; then
- 	  echo "$ac_t""yes" 1>&6
+ 	  echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
  	  X_LIBS="$X_LIBS -R $x_libraries"
  	else
- 	  echo "$ac_t""neither works" 1>&6
+ 	  echo "$as_me:$LINENO: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
  	fi
        fi
-       LIBS="$ac_xsave_LIBS"
+       LIBS=$ac_xsave_LIBS
      esac
    fi
  
@@@ -1583,88 -3318,168 +3539,165 @@@
    if test "$ISC" = yes; then
      X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
    else
-     # Martyn.Johnson at cl.cam.ac.uk says this is needed for Ultrix, if the X
-     # libraries were built with DECnet support.  And karl at cs.umb.edu says
+     # Martyn Johnson says this is needed for Ultrix, if the X
+     # libraries were built with DECnet support.  And Karl Berry says
      # the Alpha needs dnet_stub (dnet does not exist).
-     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
- echo "configure:1591: checking for dnet_ntoa in -ldnet" >&5
- ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+     cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char XOpenDisplay ();
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ XOpenDisplay ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldnet  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1599 "configure"
- #include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
  /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
  /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char dnet_ntoa();
- 
- int main() {
- dnet_ntoa()
- ; return 0; }
- EOF
- if { (eval echo configure:1610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
- rm -f conftest*
- LIBS="$ac_save_LIBS"
+    builtin and then its argument prototype would still apply.  */
+ char dnet_ntoa ();
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ dnet_ntoa ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
+ ac_cv_lib_dnet_dnet_ntoa=no
  fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
- else
-   echo "$ac_t""no" 1>&6
  fi
  
      if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
- echo "configure:1632: checking for dnet_ntoa in -ldnet_stub" >&5
- ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+       echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldnet_stub  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1640 "configure"
- #include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
  /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
  /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char dnet_ntoa();
- 
- int main() {
- dnet_ntoa()
- ; return 0; }
- EOF
- if { (eval echo configure:1651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
- rm -f conftest*
- LIBS="$ac_save_LIBS"
+    builtin and then its argument prototype would still apply.  */
+ char dnet_ntoa ();
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ dnet_ntoa ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
+ ac_cv_lib_dnet_stub_dnet_ntoa=no
  fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
- else
-   echo "$ac_t""no" 1>&6
  fi
  
      fi
@@@ -1671,379 -3489,586 +3707,613 @@@ rm -f conftest.$ac_objext conftest$ac_e
  
      # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
      # to get the SysV transport functions.
-     # chad at anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
+     # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
      # needs -lnsl.
      # The nsl library prevents programs from opening the X display
-     # on Irix 5.2, according to dickey at clark.net.
-     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
- echo "configure:1680: checking for gethostbyname" >&5
- if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 1685 "configure"
- #include "confdefs.h"
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+     echo "$as_me:$LINENO: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gethostbyname(); below.  */
 -    which can conflict with char gethostbyname (); below.  */
--#include <assert.h>
++    which can conflict with char gethostbyname (); 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
  /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
++{
+ #endif
  /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char gethostbyname();
- 
- int main() {
- 
+    builtin and then its argument prototype would still apply.  */
+ char gethostbyname ();
 -char (*f) ();
 -
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
 -int
 -main ()
 -{
  /* 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_gethostbyname) || defined (__stub___gethostbyname)
  choke me
  #else
- gethostbyname();
 -f = gethostbyname;
++char (*f) () = gethostbyname;
++#endif
++#ifdef __cplusplus
++}
  #endif
  
- ; return 0; }
- EOF
- if { (eval echo configure:1708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_gethostbyname=yes"
++int
++main ()
++{
++return f != gethostbyname;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_gethostbyname=yes
  else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_func_gethostbyname=no"
- fi
- rm -f conftest*
- fi
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
- if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   :
- else
-   echo "$ac_t""no" 1>&6
+ ac_cv_func_gethostbyname=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
+ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
  
      if test $ac_cv_func_gethostbyname = no; then
-       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
- echo "configure:1729: checking for gethostbyname in -lnsl" >&5
- ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+       echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
  LIBS="-lnsl  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1737 "configure"
- #include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
  /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
  /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char gethostbyname();
- 
- int main() {
- gethostbyname()
- ; return 0; }
- EOF
- if { (eval echo configure:1748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
- rm -f conftest*
- LIBS="$ac_save_LIBS"
+    builtin and then its argument prototype would still apply.  */
+ char gethostbyname ();
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ gethostbyname ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
+ ac_cv_lib_nsl_gethostbyname=no
  fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test $ac_cv_lib_nsl_gethostbyname = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
- else
-   echo "$ac_t""no" 1>&6
  fi
  
-     fi
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+         echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  
-     # lieder at skyler.mavd.honeywell.com says without -lsocket,
-     # socket/setsockopt and other routines are undefined under SCO ODT
-     # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
-     # on later versions), says simon at lia.di.epfl.ch: it contains
-     # gethostby* variants that don't use the nameserver (or something).
-     # -lsocket must be given before -lnsl if both are needed.
-     # We assume that if connect needs -lnsl, so does gethostbyname.
-     echo $ac_n "checking for connect""... $ac_c" 1>&6
- echo "configure:1778: checking for connect" >&5
- if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 1783 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char connect(); below.  */
- #include <assert.h>
  /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
  /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char connect();
- 
- int main() {
+    builtin and then its argument prototype would still apply.  */
+ char gethostbyname ();
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ gethostbyname ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_bsd_gethostbyname=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test $ac_cv_lib_bsd_gethostbyname = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+ fi
+ 
+       fi
+     fi
  
+     # lieder at skyler.mavd.honeywell.com says without -lsocket,
+     # socket/setsockopt and other routines are undefined under SCO ODT
+     # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
+     # on later versions), says Simon Leinen: it contains gethostby*
 -    # variants that don't use the nameserver (or something).  -lsocket
++    # variants that don't use the name server (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+     echo "$as_me:$LINENO: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ /* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char connect (); below.  */
 -#include <assert.h>
++    which can conflict with char connect (); 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
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
++{
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char connect ();
 -char (*f) ();
 -
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
 -int
 -main ()
 -{
  /* 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_connect) || defined (__stub___connect)
  choke me
  #else
- connect();
 -f = connect;
++char (*f) () = connect;
++#endif
++#ifdef __cplusplus
++}
  #endif
  
- ; return 0; }
- EOF
- if { (eval echo configure:1806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_connect=yes"
++int
++main ()
++{
++return f != connect;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_connect=yes
  else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_func_connect=no"
- fi
- rm -f conftest*
- fi
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
- if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   :
- else
-   echo "$ac_t""no" 1>&6
+ ac_cv_func_connect=no
  fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
  
      if test $ac_cv_func_connect = no; then
-       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
- echo "configure:1827: checking for connect in -lsocket" >&5
- ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+       echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1835 "configure"
- #include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
  /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
  /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char connect();
- 
- int main() {
- connect()
- ; return 0; }
- EOF
- if { (eval echo configure:1846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
- rm -f conftest*
- LIBS="$ac_save_LIBS"
+    builtin and then its argument prototype would still apply.  */
+ char connect ();
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ connect ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_socket_connect=yes
+ else
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
+ ac_cv_lib_socket_connect=no
  fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test $ac_cv_lib_socket_connect = yes; then
    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
- else
-   echo "$ac_t""no" 1>&6
  fi
  
      fi
  
-     # gomez at mi.uni-erlangen.de says -lposix is necessary on A/UX.
-     echo $ac_n "checking for remove""... $ac_c" 1>&6
- echo "configure:1870: checking for remove" >&5
- if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+     echo "$as_me:$LINENO: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   cat > conftest.$ac_ext <<EOF
- #line 1875 "configure"
- #include "confdefs.h"
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char remove(); below.  */
 -    which can conflict with char remove (); below.  */
--#include <assert.h>
++    which can conflict with char remove (); 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
  /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
++{
+ #endif
  /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char remove();
- 
- int main() {
- 
+    builtin and then its argument prototype would still apply.  */
+ char remove ();
 -char (*f) ();
 -
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
 -int
 -main ()
 -{
  /* 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_remove) || defined (__stub___remove)
  choke me
  #else
- remove();
 -f = remove;
++char (*f) () = remove;
++#endif
++#ifdef __cplusplus
++}
  #endif
  
- ; return 0; }
- EOF
- if { (eval echo configure:1898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_remove=yes"
++int
++main ()
++{
++return f != remove;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_remove=yes
  else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_func_remove=no"
- fi
- rm -f conftest*
- fi
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
- if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   :
- else
-   echo "$ac_t""no" 1>&6
+ ac_cv_func_remove=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
+ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
  
      if test $ac_cv_func_remove = no; then
-       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
- echo "configure:1919: checking for remove in -lposix" >&5
- ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+       echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
  LIBS="-lposix  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1927 "configure"
- #include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
  /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
  /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char remove();
- 
- int main() {
- remove()
- ; return 0; }
- EOF
- if { (eval echo configure:1938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
- rm -f conftest*
- LIBS="$ac_save_LIBS"
+    builtin and then its argument prototype would still apply.  */
+ char remove ();
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ remove ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_posix_remove=yes
+ else
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
+ ac_cv_lib_posix_remove=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
  fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
+ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test $ac_cv_lib_posix_remove = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
- else
-   echo "$ac_t""no" 1>&6
  fi
  
      fi
  
      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-     echo $ac_n "checking for shmat""... $ac_c" 1>&6
- echo "configure:1962: checking for shmat" >&5
- if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 1967 "configure"
- #include "confdefs.h"
+     echo "$as_me:$LINENO: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char shmat(); below.  */
 -    which can conflict with char shmat (); below.  */
--#include <assert.h>
++    which can conflict with char shmat (); 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
  /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
++{
+ #endif
  /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char shmat();
- 
- int main() {
- 
+    builtin and then its argument prototype would still apply.  */
+ char shmat ();
 -char (*f) ();
 -
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
 -int
 -main ()
 -{
  /* 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_shmat) || defined (__stub___shmat)
  choke me
  #else
- shmat();
 -f = shmat;
++char (*f) () = shmat;
++#endif
++#ifdef __cplusplus
++}
  #endif
  
- ; return 0; }
- EOF
- if { (eval echo configure:1990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_shmat=yes"
++int
++main ()
++{
++return f != shmat;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_shmat=yes
  else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_func_shmat=no"
- fi
- rm -f conftest*
- fi
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
- if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   :
- else
-   echo "$ac_t""no" 1>&6
+ ac_cv_func_shmat=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
+ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
  
      if test $ac_cv_func_shmat = no; then
-       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
- echo "configure:2011: checking for shmat in -lipc" >&5
- ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+       echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
  LIBS="-lipc  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2019 "configure"
- #include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
  /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
  /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char shmat();
- 
- int main() {
- shmat()
- ; return 0; }
- EOF
- if { (eval echo configure:2030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
- rm -f conftest*
- LIBS="$ac_save_LIBS"
+    builtin and then its argument prototype would still apply.  */
+ char shmat ();
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ shmat ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
+ ac_cv_lib_ipc_shmat=no
  fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test $ac_cv_lib_ipc_shmat = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
- else
-   echo "$ac_t""no" 1>&6
  fi
  
      fi
@@@ -2057,169 -4082,261 +4327,283 @@@
    # we get undefined symbols.  So assume we have SM if we have ICE.
    # These have to be linked with before -lX11, unlike the other
    # libraries we check for below, so use a different variable.
-   #  --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
-   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
- echo "configure:2063: checking for IceConnectionNumber in -lICE" >&5
- ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
+   # John Interrante, Karl Berry
+   echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
  LIBS="-lICE $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 2071 "configure"
- #include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
  /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
  /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char IceConnectionNumber();
- 
- int main() {
- IceConnectionNumber()
- ; return 0; }
- EOF
- if { (eval echo configure:2082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
- rm -f conftest*
- LIBS="$ac_save_LIBS"
+    builtin and then its argument prototype would still apply.  */
+ char IceConnectionNumber ();
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ IceConnectionNumber ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
 +
+ ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
  fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
+ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
- else
-   echo "$ac_t""no" 1>&6
  fi
  
-   LDFLAGS="$ac_save_LDFLAGS"
+   LDFLAGS=$ac_save_LDFLAGS
  
  fi
  
  X11LIBS="-L$x_libraries -I$x_includes -lX11 -lXpm -lXext"
  
- echo $ac_n "checking to see if we can use X""... $ac_c" 1>&6
- echo "configure:2109: checking to see if we can use X" >&5
- cat > conftest.$ac_ext <<EOF
- #line 2111 "configure"
- #include "confdefs.h"
+ echo "$as_me:$LINENO: checking to see if we can use X" >&5
+ echo $ECHO_N "checking to see if we can use X... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  #include <X11/Xlib.h>
- int main() {
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
  
- ; return 0; }
- EOF
- if { (eval echo configure:2118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   echo "$ac_t""yes" 1>&6
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
  else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   echo "$ac_t""no" 1>&6; exit 1
- fi
- rm -f conftest*
- 
- echo $ac_n "checking how to call statfs""... $ac_c" 1>&6
- echo "configure:2130: checking how to call statfs" >&5 
- cat > conftest.$ac_ext <<EOF
- #line 2132 "configure"
- #include "confdefs.h"
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; exit 1
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 
+ echo "$as_me:$LINENO: checking how to call statfs" >&5
+ echo $ECHO_N "checking how to call statfs... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  #include <sys/vfs.h>
  #include <sys/param.h>
  #include <sys/mount.h>
  
- int main() {
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
  struct statfs a; statfs("/", &a);
- ; return 0; }
- EOF
- if { (eval echo configure:2142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   echo "$ac_t""2 arguments" 1>&6 
- cat >> confdefs.h <<\EOF
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   echo "$as_me:$LINENO: result: 2 arguments" >&5
+ echo "${ECHO_T}2 arguments" >&6
+ cat >>confdefs.h <<\_ACEOF
  #define STATFS_2_ARGUMENTS 1
- EOF
+ _ACEOF
  
  ac_statfs_args=2
  else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   cat > conftest.$ac_ext <<EOF
- #line 2155 "configure"
- #include "confdefs.h"
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  
  #include <sys/types.h>
  #include <sys/statfs.h>
  
- int main() {
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
  struct statfs a; statfs("/", &a, sizeof(struct statfs), 0);
- ; return 0; }
- EOF
- if { (eval echo configure:2165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   echo "$ac_t""4 arguments" 1>&6 
- cat >> confdefs.h <<\EOF
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   echo "$as_me:$LINENO: result: 4 arguments" >&5
+ echo "${ECHO_T}4 arguments" >&6
+ cat >>confdefs.h <<\_ACEOF
  #define STATFS_4_ARGUMENTS 1
- EOF
+ _ACEOF
  
  
  else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   echo "$ac_t""Can not determine" 1>&6
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ echo "$as_me:$LINENO: result: Can not determine" >&5
+ echo "${ECHO_T}Can not determine" >&6
  fi
- rm -f conftest*
+ rm -f conftest.$ac_objext conftest.$ac_ext
  fi
- rm -f conftest*
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ 
++echo "$as_me:$LINENO: checking for egrep" >&5
++echo $ECHO_N "checking for egrep... $ECHO_C" >&6
++if test "${ac_cv_prog_egrep+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
++    then ac_cv_prog_egrep='grep -E'
++    else ac_cv_prog_egrep='egrep'
++    fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
++echo "${ECHO_T}$ac_cv_prog_egrep" >&6
++ EGREP=$ac_cv_prog_egrep
 +
 +
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
- echo "configure:2185: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   cat > conftest.$ac_ext <<EOF
- #line 2190 "configure"
- #include "confdefs.h"
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  #include <stdlib.h>
  #include <stdarg.h>
  #include <string.h>
  #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:2198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
+ 
++int
++main ()
++{
++
++  ;
++  return 0;
++}
+ _ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
+   ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null; then
 -  if test -s conftest.err; then
 -    ac_cpp_err=$ac_c_preproc_warn_flag
 -  else
 -    ac_cpp_err=
 -  fi
 -else
 -  ac_cpp_err=yes
 -fi
 -if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
    ac_cv_header_stdc=yes
  else
-   echo "$ac_err" >&5
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   ac_cv_header_stdc=no
+   echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
 -  ac_cv_header_stdc=no
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_header_stdc=no
  fi
- rm -f conftest*
 -rm -f conftest.err conftest.$ac_ext
++rm -f conftest.$ac_objext conftest.$ac_ext
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
- #line 2215 "configure"
- #include "confdefs.h"
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  #include <string.h>
- EOF
+ 
+ _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "memchr" >/dev/null 2>&1; then
++  $EGREP "memchr" >/dev/null 2>&1; then
    :
  else
-   rm -rf conftest*
    ac_cv_header_stdc=no
  fi
  rm -f conftest*
@@@ -2228,16 -4345,16 +4612,20 @@@ f
  
  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 <<EOF
- #line 2233 "configure"
- #include "confdefs.h"
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  #include <stdlib.h>
- EOF
+ 
+ _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "free" >/dev/null 2>&1; then
++  $EGREP "free" >/dev/null 2>&1; then
    :
  else
-   rm -rf conftest*
    ac_cv_header_stdc=no
  fi
  rm -f conftest*
@@@ -2246,268 -4363,596 +4634,553 @@@ f
  
  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
+   if test "$cross_compiling" = yes; then
    :
  else
-   cat > conftest.$ac_ext <<EOF
- #line 2254 "configure"
- #include "confdefs.h"
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
- #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
- int main () { int i; for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
- exit (0); }
+ #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') \
++# define ISLOWER(c) \
++                   (('a' <= (c) && (c) <= 'i') \
+                      || ('j' <= (c) && (c) <= 'r') \
+                      || ('s' <= (c) && (c) <= 'z'))
+ # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+ #endif
  
- EOF
- if { (eval echo configure:2265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
+ #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+ int
+ main ()
+ {
+   int i;
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+         || toupper (i) != TOUPPER (i))
+       exit(2);
+   exit (0);
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
    :
  else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -fr conftest*
-   ac_cv_header_stdc=no
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
  fi
- rm -fr conftest*
 -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
- 
  fi
  fi
- 
- echo "$ac_t""$ac_cv_header_stdc" 1>&6
+ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
  if test $ac_cv_header_stdc = yes; then
-   cat >> confdefs.h <<\EOF
+ 
+ cat >>confdefs.h <<\_ACEOF
  #define STDC_HEADERS 1
- EOF
+ _ACEOF
  
  fi
  
- for ac_hdr in unistd.h sys/statfs.h sys/vfs.h sys/param.h sys/mount.h
+ # 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
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
- echo "configure:2292: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 2297 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:2302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-   eval "ac_cv_header_$ac_safe=yes"
- else
-   echo "$ac_err" >&5
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_header_$ac_safe=no"
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_Header=yes"
+ else
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ eval "$as_ac_Header=no"
  fi
- rm -f conftest*
+ rm -f conftest.$ac_objext conftest.$ac_ext
  fi
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-     ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_hdr 1
- EOF
-  
- else
-   echo "$ac_t""no" 1>&6
- fi
- done
- 
- 
- echo $ac_n "checking for working const""... $ac_c" 1>&6
- echo "configure:2330: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 2335 "configure"
- #include "confdefs.h"
- 
- int main() {
- 
- /* Ultrix mips cc rejects this.  */
- typedef int charset[2]; const charset x = {0,0};
- /* SunOS 4.1.1 cc rejects this.  */
- char const *const *ccp;
- char **p;
- /* NEC SVR4.0.2 mips cc rejects this.  */
- struct point {int x, y;};
- static struct point const zero = {0,0};
- /* AIX XL C 1.02.0.0 rejects this.
-    It does not let you subtract one const X* pointer from another in an arm
-    of an if-expression whose if-part is not a constant expression */
- const char *g = "string";
- ccp = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
- ++ccp;
- p = (char**) ccp;
- ccp = (char const *const *) p;
- { /* SCO 3.2v4 cc rejects this.  */
-   char *t;
-   char const *s = 0 ? (char *) 0 : (char const *) 0;
- 
-   *t++ = 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-   int x[] = {25, 17};
-   const int *foo = &x[0];
-   ++foo;
- }
- { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-   typedef const int *iptr;
-   iptr p = 0;
-   ++p;
- }
- { /* AIX XL C 1.02.0.0 rejects this saying
-      "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-   struct s { int j; const int *ap[3]; };
-   struct s *b; b->j = 5;
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-   const int foo = 10;
- }
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
  
- ; return 0; }
- EOF
- if { (eval echo configure:2384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_c_const=yes
+ fi
+ 
+ done
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ for ac_header in unistd.h sys/statfs.h sys/vfs.h sys/param.h sys/mount.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ else
+   # Is the header compilable?
+ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* 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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_header_compiler=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6
+ 
+ # Is the header present?
+ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
 -  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+   fi
  else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   ac_cv_c_const=no
+   ac_cpp_err=yes
  fi
- rm -f conftest*
+ if test -z "$ac_cpp_err"; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   ac_header_preproc=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+ echo "${ECHO_T}$ac_header_preproc" >&6
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc in
+   yes:no )
+     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+ echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------ ##
++## Report this to bug-autoconf at gnu.org. ##
++## ------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
+   no:yes )
+     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+ echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+ echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------ ##
++## Report this to bug-autoconf at gnu.org. ##
++## ------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
+ esac
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   eval "$as_ac_Header=$ac_header_preproc"
  fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ 
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ 
+ done
  
- echo "$ac_t""$ac_cv_c_const" 1>&6
+ 
 -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 -if test "${ac_cv_prog_cc_stdc+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  ac_cv_prog_cc_stdc=no
 -ac_save_CC=$CC
 -cat >conftest.$ac_ext <<_ACEOF
 -#line $LINENO "configure"
 -#include "confdefs.h"
 -#include <stdarg.h>
 -#include <stdio.h>
 -#include <sys/types.h>
 -#include <sys/stat.h>
 -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 -struct buf { int x; };
 -FILE * (*rcsopen) (struct buf *, struct stat *, int);
 -static char *e (p, i)
 -     char **p;
 -     int i;
 -{
 -  return p[i];
 -}
 -static char *f (char * (*g) (char **, int), char **p, ...)
 -{
 -  char *s;
 -  va_list v;
 -  va_start (v,p);
 -  s = g (p, va_arg (v,int));
 -  va_end (v);
 -  return s;
 -}
 -int test (int i, double x);
 -struct s1 {int (*f) (int a);};
 -struct s2 {int (*f) (double a);};
 -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
 -int argc;
 -char **argv;
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
 -int
 -main ()
 -{
 -return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -# Don't try gcc -ansi; that turns off useful extensions and
 -# breaks some systems' header files.
 -# AIX			-qlanglvl=ansi
 -# Ultrix and OSF/1	-std1
 -# HP-UX 10.20 and later	-Ae
 -# HP-UX older versions	-Aa -D_HPUX_SOURCE
 -# SVR4			-Xc -D__EXTENSIONS__
 -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 -do
 -  CC="$ac_save_CC $ac_arg"
 -  rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_prog_cc_stdc=$ac_arg
 -break
 -else
 -  echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
 -fi
 -rm -f conftest.$ac_objext
 -done
 -rm -f conftest.$ac_ext conftest.$ac_objext
 -CC=$ac_save_CC
 -
 -fi
 -
 -case "x$ac_cv_prog_cc_stdc" in
 -  x|xno)
 -    echo "$as_me:$LINENO: result: none needed" >&5
 -echo "${ECHO_T}none needed" >&6 ;;
 -  *)
 -    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
 -    CC="$CC $ac_cv_prog_cc_stdc" ;;
 -esac
 -
+ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
+ int
+ main ()
+ {
+ /* FIXME: Include the comments suggested by Paul. */
+ #ifndef __cplusplus
+   /* Ultrix mips cc rejects this.  */
+   typedef int charset[2];
+   const charset x;
+   /* SunOS 4.1.1 cc rejects this.  */
+   char const *const *ccp;
+   char **p;
+   /* NEC SVR4.0.2 mips cc rejects this.  */
+   struct point {int x, y;};
+   static struct point const zero = {0,0};
+   /* AIX XL C 1.02.0.0 rejects this.
+      It does not let you subtract one const X* pointer from another in
+      an arm of an if-expression whose if-part is not a constant
+      expression */
+   const char *g = "string";
+   ccp = &g + (g ? g-g : 0);
+   /* HPUX 7.0 cc rejects these. */
+   ++ccp;
+   p = (char**) ccp;
+   ccp = (char const *const *) p;
+   { /* SCO 3.2v4 cc rejects this.  */
+     char *t;
+     char const *s = 0 ? (char *) 0 : (char const *) 0;
+ 
+     *t++ = 0;
+   }
+   { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+     int x[] = {25, 17};
+     const int *foo = &x[0];
+     ++foo;
+   }
+   { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+     typedef const int *iptr;
+     iptr p = 0;
+     ++p;
+   }
+   { /* AIX XL C 1.02.0.0 rejects this saying
+        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+     struct s { int j; const int *ap[3]; };
+     struct s *b; b->j = 5;
+   }
+   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+     const int foo = 10;
+   }
+ #endif
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_const=yes
+ else
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_c_const=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
  if test $ac_cv_c_const = no; then
-   cat >> confdefs.h <<\EOF
- #define const 
- EOF
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define const
+ _ACEOF
  
  fi
  
  
+ 
+ 
+ 
+ 
+ 
+ 
  for ac_func in gethostname strcspn strdup strspn strstr statfs
  do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:2408: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 2413 "configure"
- #include "confdefs.h"
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
 -    which can conflict with char $ac_func (); below.  */
--#include <assert.h>
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
  /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
++{
+ #endif
  /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char $ac_func();
- 
- int main() {
- 
+    builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
 -char (*f) ();
 -
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
 -int
 -main ()
 -{
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #else
- $ac_func();
 -f = $ac_func;
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
  #endif
  
- ; return 0; }
- EOF
- if { (eval echo configure:2436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
++int
++main ()
++{
++return f != $ac_func;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
  else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=no"
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ eval "$as_ac_var=no"
  fi
- rm -f conftest*
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
  
- if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_func 1
- EOF
-  
- else
-   echo "$ac_t""no" 1>&6
  fi
  done
  
+ 
  for ac_func in getopt_long
  do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
- echo "configure:2463: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 2468 "configure"
- #include "confdefs.h"
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
 -#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
 -    which can conflict with char $ac_func (); below.  */
--#include <assert.h>
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
  /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
++{
+ #endif
  /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char $ac_func();
- 
- int main() {
- 
+    builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
 -char (*f) ();
 -
 -#ifdef F77_DUMMY_MAIN
 -#  ifdef __cplusplus
 -     extern "C"
 -#  endif
 -   int F77_DUMMY_MAIN() { return 1; }
 -#endif
 -int
 -main ()
 -{
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #else
- $ac_func();
 -f = $ac_func;
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
  #endif
  
- ; return 0; }
- EOF
- if { (eval echo configure:2491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
++int
++main ()
++{
++return f != $ac_func;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+          { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   eval "$as_ac_var=yes"
  else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=no"
+   echo "$as_me: failed program was:" >&5
 -cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ eval "$as_ac_var=no"
  fi
- rm -f conftest*
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
- 
- if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-   cat >> confdefs.h <<EOF
- #define $ac_tr_func 1
- EOF
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
   have_getopt=true
- else
-   echo "$ac_t""no" 1>&6
  fi
  done
  
@@@ -2521,48 -4966,57 +5194,57 @@@ els
    GETOPT_FALSE=
  fi
  
- trap '' 1 2 15
- cat > confcache <<\EOF
+ 
 -ac_config_files="$ac_config_files Makefile wmfsm/Makefile wmgeneral/Makefile"
++                              ac_config_files="$ac_config_files Makefile wmfsm/Makefile wmgeneral/Makefile"
+ cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
- # scripts and configure runs.  It is not useful on other systems.
- # If it contains results you don't want to keep, you may remove or edit it.
+ # scripts and configure runs, see configure's option --config-cache.
+ # It is not useful on other systems.  If it contains results you don't
+ # want to keep, you may remove or edit it.
  #
- # By default, configure uses ./config.cache as the cache file,
- # creating it if it does not exist already.  You can give configure
- # the --cache-file=FILE option to use a different cache file; that is
- # what configure does when it calls configure scripts in
- # subdirectories, so they share the cache.
- # Giving --cache-file=/dev/null disables caching, for debugging configure.
- # config.status only pays attention to the cache file if you give it the
- # --recheck option to rerun configure.
+ # config.status only pays attention to the cache file if you give it
+ # the --recheck option to rerun configure.
  #
- EOF
 -# `ac_cv_env_foo' variables (set or unset) will be overriden when
++# `ac_cv_env_foo' variables (set or unset) will be overridden when
+ # loading this file, other *unset* `ac_cv_foo' will be assigned the
+ # following values.
+ 
+ _ACEOF
+ 
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
  # So, don't put newlines in cache variables' values.
  # Ultrix sh set writes to stderr and can't be redirected directly,
  # and sets the high bit in the cache file unless we assign to the vars.
- (set) 2>&1 |
-   case `(ac_space=' '; set | grep ac_space) 2>&1` in
-   *ac_space=\ *)
-     # `set' does not quote correctly, so add quotes (double-quote substitution
-     # turns \\\\ into \\, and sed turns \\ into \).
-     sed -n \
-       -e "s/'/'\\\\''/g" \
-       -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-     ;;
-   *)
-     # `set' quotes correctly as required by POSIX, so do not add quotes.
-     sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-     ;;
-   esac >> confcache
- if cmp -s $cache_file confcache; then
-   :
- else
+ {
+   (set) 2>&1 |
+     case `(ac_space=' '; set | grep ac_space) 2>&1` in
+     *ac_space=\ *)
+       # `set' does not quote correctly, so add quotes (double-quote
+       # substitution turns \\\\ into \\, and sed turns \\ into \).
+       sed -n \
+         "s/'/'\\\\''/g;
+     	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+       ;;
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+       sed -n \
+         "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+       ;;
+     esac;
+ } |
+   sed '
+      t clear
+      : clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+      /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+      : end' >>confcache
 -if cmp -s $cache_file confcache; then :; else
++if diff $cache_file confcache >/dev/null 2>&1; then :; else
    if test -w $cache_file; then
-     echo "updating cache $cache_file"
-     cat confcache > $cache_file
+     test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+     cat confcache >$cache_file
    else
      echo "not updating unwritable cache $cache_file"
    fi
@@@ -2575,210 -5027,783 +5255,847 @@@ test "x$prefix" = xNONE && prefix=$ac_d
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
- # Any assignment to VPATH causes Sun make to only execute
- # the first set of double-colon rules, so remove it if not needed.
- # If there is a colon in the path, we need to keep it.
+ # VPATH may cause trouble with some makes, so we remove $(srcdir),
+ # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+ # (actually we leave an empty line to preserve line numbers).
  if test "x$srcdir" = x.; then
-   ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
+   ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
+ s/:*\$(srcdir):*/:/;
+ s/:*\${srcdir}:*/:/;
+ s/:*@srcdir@:*/:/;
+ s/^\([^=]*=[ 	]*\):*/\1/;
+ s/:*$//;
+ s/^[^=]*=[ 	]*$//;
+ }'
  fi
  
- trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
- 
  DEFS=-DHAVE_CONFIG_H
  
- # Without the "./", some shells look in PATH for config.status.
- : ${CONFIG_STATUS=./config.status}
++ac_libobjs=
++ac_ltlibobjs=
++for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
++  # 1. Remove the extension, and $U if already installed.
++  ac_i=`echo "$ac_i" |
++         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
++  # 2. Add them.
++  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
++  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
++done
++LIBOBJS=$ac_libobjs
 +
- echo creating $CONFIG_STATUS
- rm -f $CONFIG_STATUS
- cat > $CONFIG_STATUS <<EOF
- #! /bin/sh
- # Generated automatically by configure.
++LTLIBOBJS=$ac_ltlibobjs
++
++
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ if test -z "${GETOPT_TRUE}" && test -z "${GETOPT_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"GETOPT\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+ echo "$as_me: error: conditional \"GETOPT\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+ { echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+ # Generated by $as_me.
  # Run this file to recreate the current configuration.
- # This directory was configured as follows,
- # on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- #
- # $0 $ac_configure_args
- #
  # Compiler output produced by configure, useful for debugging
- # configure, is in ./config.log if it exists.
+ # configure, is in config.log if it exists.
+ 
+ debug=false
++ac_cs_recheck=false
++ac_cs_silent=false
+ SHELL=\${CONFIG_SHELL-$SHELL}
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
 -
+ ## --------------------- ##
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
+ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+   set -o posix
+ fi
+ 
 -# NLS nuisances.
+ # Support unset when possible.
+ if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+   as_unset=unset
+ else
+   as_unset=false
+ fi
  
- ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
- for ac_option
 -(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
 -    { $as_unset LANG || test "${LANG+set}" != set; } ||
 -      { LANG=C; export LANG; }
 -(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
 -    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
 -      { LC_ALL=C; export LC_ALL; }
 -(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
 -    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
 -      { LC_TIME=C; export LC_TIME; }
 -(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
 -    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
 -      { LC_CTYPE=C; export LC_CTYPE; }
 -(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
 -    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
 -      { LANGUAGE=C; export LANGUAGE; }
 -(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
 -    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
 -      { LC_COLLATE=C; export LC_COLLATE; }
 -(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
 -    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
 -      { LC_NUMERIC=C; export LC_NUMERIC; }
 -(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
 -    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
 -      { LC_MESSAGES=C; export LC_MESSAGES; }
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
 +do
-   case "\$ac_option" in
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-     echo "$CONFIG_STATUS generated by autoconf version 2.13"
-     exit 0 ;;
-   -help | --help | --hel | --he | --h)
-     echo "\$ac_cs_usage"; exit 0 ;;
-   *) echo "\$ac_cs_usage"; exit 1 ;;
-   esac
++  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    $as_unset $as_var
++  fi
 +done
 +
- ac_given_srcdir=$srcdir
- ac_given_INSTALL="$INSTALL"
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
+ 
+ 
+ # Name of the executable.
 -as_me=`(basename "$0") 2>/dev/null ||
++as_me=`$as_basename "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+ 	 X"$0" : 'X\(/\)$' \| \
+ 	 .     : '\(.\)' 2>/dev/null ||
+ echo X/"$0" |
+     sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+   	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\/\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+ 
++
+ # PATH needs CR, and LINENO needs CR and PATH.
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
 -  echo "#! /bin/sh" >conftest.sh
 -  echo  "exit 0"   >>conftest.sh
 -  chmod +x conftest.sh
 -  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+     PATH_SEPARATOR=';'
+   else
+     PATH_SEPARATOR=:
+   fi
 -  rm -f conftest.sh
++  rm -f conf$$.sh
+ fi
  
- trap 'rm -fr `echo "Makefile wmfsm/Makefile wmgeneral/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
- EOF
- cat >> $CONFIG_STATUS <<EOF
  
- # Protect against being on the right side of a sed subst in config.status.
- sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
-  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
- $ac_vpsub
- $extrasub
- s%@SHELL@%$SHELL%g
- s%@CFLAGS@%$CFLAGS%g
- s%@CPPFLAGS@%$CPPFLAGS%g
- s%@CXXFLAGS@%$CXXFLAGS%g
- s%@FFLAGS@%$FFLAGS%g
- s%@DEFS@%$DEFS%g
- s%@LDFLAGS@%$LDFLAGS%g
- s%@LIBS@%$LIBS%g
- s%@exec_prefix@%$exec_prefix%g
- s%@prefix@%$prefix%g
- s%@program_transform_name@%$program_transform_name%g
- s%@bindir@%$bindir%g
- s%@sbindir@%$sbindir%g
- s%@libexecdir@%$libexecdir%g
- s%@datadir@%$datadir%g
- s%@sysconfdir@%$sysconfdir%g
- s%@sharedstatedir@%$sharedstatedir%g
- s%@localstatedir@%$localstatedir%g
- s%@libdir@%$libdir%g
- s%@includedir@%$includedir%g
- s%@oldincludedir@%$oldincludedir%g
- s%@infodir@%$infodir%g
- s%@mandir@%$mandir%g
- s%@host@%$host%g
- s%@host_alias@%$host_alias%g
- s%@host_cpu@%$host_cpu%g
- s%@host_vendor@%$host_vendor%g
- s%@host_os@%$host_os%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
- s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@PACKAGE@%$PACKAGE%g
- s%@VERSION@%$VERSION%g
- s%@ACLOCAL@%$ACLOCAL%g
- s%@AUTOCONF@%$AUTOCONF%g
- s%@AUTOMAKE@%$AUTOMAKE%g
- s%@AUTOHEADER@%$AUTOHEADER%g
- s%@MAKEINFO@%$MAKEINFO%g
- s%@SET_MAKE@%$SET_MAKE%g
- s%@CC@%$CC%g
- s%@RANLIB@%$RANLIB%g
- s%@CPP@%$CPP%g
- s%@X_CFLAGS@%$X_CFLAGS%g
- s%@X_PRE_LIBS@%$X_PRE_LIBS%g
- s%@X_LIBS@%$X_LIBS%g
- s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
- s%@X11LIBS@%$X11LIBS%g
- s%@GETOPT_TRUE@%$GETOPT_TRUE%g
- s%@GETOPT_FALSE@%$GETOPT_FALSE%g
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+   # Find who we are.  Look in the path if we contain no path at all
+   # relative or not.
+   case $0 in
+     *[\\/]* ) as_myself=$0 ;;
+     *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
  
- CEOF
- EOF
- 
- cat >> $CONFIG_STATUS <<\EOF
- 
- # Split the substitutions into bite-sized pieces for seds with
- # small command number limits, like on Digital OSF/1 and HP-UX.
- ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
- ac_file=1 # Number of current file.
- ac_beg=1 # First line for current file.
- ac_end=$ac_max_sed_cmds # Line after last line for current file.
- ac_more_lines=:
- ac_sed_cmds=""
- while $ac_more_lines; do
-   if test $ac_beg -gt 1; then
-     sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-   else
-     sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+        ;;
+   esac
+   # We did not find ourselves, most probably we were run as `sh COMMAND'
+   # in which case we are not to be found in the path.
+   if test "x$as_myself" = x; then
+     as_myself=$0
+   fi
+   if test ! -f "$as_myself"; then
+     { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+ echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+    { (exit 1); exit 1; }; }
    fi
-   if test ! -s conftest.s$ac_file; then
-     ac_more_lines=false
-     rm -f conftest.s$ac_file
+   case $CONFIG_SHELL in
+   '')
+     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for as_base in sh bash ksh sh5; do
+ 	 case $as_dir in
+ 	 /*)
+ 	   if ("$as_dir/$as_base" -c '
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
++	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+ 	     CONFIG_SHELL=$as_dir/$as_base
+ 	     export CONFIG_SHELL
+ 	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+ 	   fi;;
+ 	 esac
+        done
+ done
+ ;;
+   esac
+ 
+   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+   # uniformly replaced by the line number.  The first 'sed' inserts a
+   # line-number line before each line; the second 'sed' does the real
+   # work.  The second script uses 'N' to pair each line-number line
+   # with the numbered line, and appends trailing '-' during
+   # substitution so that $LINENO is not a special case at line end.
+   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+   # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+   sed '=' <$as_myself |
+     sed '
+       N
+       s,$,-,
+       : loop
+       s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+       t loop
+       s,-$,,
+       s,^['$as_cr_digits']*\n,,
+     ' >$as_me.lineno &&
+   chmod +x $as_me.lineno ||
+     { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+ echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+   # original and so on.  Autoconf is especially sensible to this).
+   . ./$as_me.lineno
+   # Exit status is that of the last command.
+   exit
+ }
+ 
+ 
+ case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+   *c*,-n*) ECHO_N= ECHO_C='
+ ' ECHO_T='	' ;;
+   *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+   *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+ esac
+ 
+ if expr a : '\(a\)' >/dev/null 2>&1; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
+ echo >conf$$.file
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+   # We could just check for DJGPP; but this test a) works b) is more generic
+   # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+   if test -f conf$$.exe; then
+     # Don't use ln at all; we don't have any links
+     as_ln_s='cp -p'
    else
-     if test -z "$ac_sed_cmds"; then
-       ac_sed_cmds="sed -f conftest.s$ac_file"
-     else
-       ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-     fi
-     ac_file=`expr $ac_file + 1`
-     ac_beg=$ac_end
-     ac_end=`expr $ac_end + $ac_max_sed_cmds`
+     as_ln_s='ln -s'
    fi
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+   as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+ rm -f conf$$ conf$$.exe conf$$.file
+ 
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  as_mkdir_p=false
++fi
++
+ as_executable_p="test -f"
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+ 
+ # Sed expression to map a string onto a valid variable name.
+ as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+ 
+ 
+ # IFS
+ # We need space, tab and new line, in precisely that order.
+ as_nl='
+ '
+ IFS=" 	$as_nl"
+ 
+ # CDPATH.
 -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
++$as_unset CDPATH
+ 
+ exec 6>&1
+ 
+ # Open the log real soon, to keep \$[0] and so on meaningful, and to
+ # report actual input values of CONFIG_FILES etc. instead of their
+ # values after options handling.  Logging --version etc. is OK.
+ exec 5>>config.log
+ {
+   echo
+   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+ ## Running $as_me. ##
+ _ASBOX
+ } >&5
+ cat >&5 <<_CSEOF
+ 
+ This file was extended by $as_me, which was
 -generated by GNU Autoconf 2.53.  Invocation command line was
++generated by GNU Autoconf 2.57.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+   CONFIG_LINKS    = $CONFIG_LINKS
+   CONFIG_COMMANDS = $CONFIG_COMMANDS
+   $ $0 $@
+ 
+ _CSEOF
+ echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+ echo >&5
+ _ACEOF
+ 
+ # Files that config.status was made for.
+ if test -n "$ac_config_files"; then
+   echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+ fi
+ 
+ if test -n "$ac_config_headers"; then
+   echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+ fi
+ 
+ if test -n "$ac_config_links"; then
+   echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+ fi
+ 
+ if test -n "$ac_config_commands"; then
+   echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+ fi
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+ ac_cs_usage="\
+ \`$as_me' instantiates files from templates according to the
+ current configuration.
+ 
+ Usage: $0 [OPTIONS] [FILE]...
+ 
+   -h, --help       print this help, then exit
+   -V, --version    print version number, then exit
++  -q, --quiet      do not print progress messages
+   -d, --debug      don't remove temporary files
+       --recheck    update $as_me by reconfiguring in the same conditions
+   --file=FILE[:TEMPLATE]
+                    instantiate the configuration file FILE
+   --header=FILE[:TEMPLATE]
+                    instantiate the configuration header FILE
+ 
+ Configuration files:
+ $config_files
+ 
+ Configuration headers:
+ $config_headers
+ 
+ Configuration commands:
+ $config_commands
+ 
+ Report bugs to <bug-autoconf at gnu.org>."
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ config.status
 -configured by $0, generated by GNU Autoconf 2.53,
++configured by $0, generated by GNU Autoconf 2.57,
+   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+ 
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+ Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+ srcdir=$srcdir
+ INSTALL="$INSTALL"
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ # If no file are specified by the user, then we need to provide default
+ # value.  By we need to know if files were specified by the user.
+ ac_need_defaults=:
+ while test $# != 0
+ do
+   case $1 in
+   --*=*)
+     ac_option=`expr "x$1" : 'x\([^=]*\)='`
+     ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
 -    shift
 -    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
 -    shift
++    ac_shift=:
++    ;;
++  -*)
++    ac_option=$1
++    ac_optarg=$2
++    ac_shift=shift
+     ;;
 -  -*);;
+   *) # This is not an option, so the user has probably given explicit
+      # arguments.
++     ac_option=$1
+      ac_need_defaults=false;;
+   esac
+ 
 -  case $1 in
++  case $ac_option in
+   # Handling of the options.
+ _ACEOF
 -cat >>$CONFIG_STATUS <<_ACEOF
 -  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
 -    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
 -    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
 -_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
++  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+     # Conflict between --help and --header
+     { { echo "$as_me:$LINENO: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2;}
+    { (exit 1); exit 1; }; };;
+   --help | --hel | -h )
+     echo "$ac_cs_usage"; exit 0 ;;
+   --debug | --d* | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
 -    shift
 -    CONFIG_FILES="$CONFIG_FILES $1"
++    $ac_shift
++    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+     ac_need_defaults=false;;
+   --header | --heade | --head | --hea )
 -    shift
 -    CONFIG_HEADERS="$CONFIG_HEADERS $1"
++    $ac_shift
++    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+     ac_need_defaults=false;;
++  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++  | -silent | --silent | --silen | --sile | --sil | --si | --s)
++    ac_cs_silent=: ;;
+ 
+   # This is an error.
+   -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&2;}
+    { (exit 1); exit 1; }; } ;;
+ 
+   *) ac_config_targets="$ac_config_targets $1" ;;
+ 
+   esac
+   shift
  done
- if test -z "$ac_sed_cmds"; then
-   ac_sed_cmds=cat
+ 
++ac_configure_extra_args=
++
++if $ac_cs_silent; then
++  exec 6>/dev/null
++  ac_configure_extra_args="$ac_configure_extra_args --silent"
 +fi
- EOF
 +
- cat >> $CONFIG_STATUS <<EOF
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++if \$ac_cs_recheck; then
++  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++fi
 +
- CONFIG_FILES=\${CONFIG_FILES-"Makefile wmfsm/Makefile wmgeneral/Makefile"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-   case "$ac_file" in
-   *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-        ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-   *) ac_file_in="${ac_file}.in" ;;
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF
+ #
+ # INIT-COMMANDS section.
+ #
+ 
+ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+ 
+ _ACEOF
+ 
+ 
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ for ac_config_target in $ac_config_targets
+ do
+   case "$ac_config_target" in
+   # Handling of arguments.
+   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+   "wmfsm/Makefile" ) CONFIG_FILES="$CONFIG_FILES wmfsm/Makefile" ;;
+   "wmgeneral/Makefile" ) CONFIG_FILES="$CONFIG_FILES wmgeneral/Makefile" ;;
+   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
    esac
+ done
  
-   # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+ # If the user did not use the arguments to specify the items to instantiate,
+ # then the envvar interface is used.  Set only those that are not.
+ # We use the long form for the default assignment because of an extremely
+ # bizarre bug on SunOS 4.1.3.
+ if $ac_need_defaults; then
+   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+   test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+ fi
+ 
++# Have a temporary directory for convenience.  Make it in the build tree
++# simply because there is no reason to put it here, and in addition,
++# creating and moving files from /tmp can sometimes cause problems.
+ # Create a temporary directory, and hook for its removal unless debugging.
+ $debug ||
+ {
+   trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+   trap '{ (exit 1); exit 1; }' 1 2 13 15
+ }
  
-   # Remove last slash and all that follows it.  Not all systems have dirname.
-   ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-   if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-     # The file is in a subdirectory.
-     test ! -d "$ac_dir" && mkdir "$ac_dir"
-     ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-     # A "../" for each directory in $ac_dir_suffix.
-     ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-   else
-     ac_dir_suffix= ac_dots=
+ # Create a (secure) tmp directory for tmp files.
 -: ${TMPDIR=/tmp}
++
+ {
 -  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
++  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+   test -n "$tmp" && test -d "$tmp"
+ }  ||
+ {
 -  tmp=$TMPDIR/cs$$-$RANDOM
++  tmp=./confstat$$-$RANDOM
+   (umask 077 && mkdir $tmp)
+ } ||
+ {
 -   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
++   echo "$me: cannot create a temporary directory in ." >&2
+    { (exit 1); exit 1; }
+ }
+ 
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF
+ 
+ #
+ # CONFIG_FILES section.
+ #
+ 
+ # No need to generate the scripts if there are no CONFIG_FILES.
+ # This happens for instance when ./config.status config.h
+ if test -n "\$CONFIG_FILES"; then
+   # Protect against being on the right side of a sed subst in config.status.
+   sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+    s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+ s, at SHELL@,$SHELL,;t t
+ s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+ s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
+ s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+ s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+ s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
+ s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+ s, at exec_prefix@,$exec_prefix,;t t
+ s, at prefix@,$prefix,;t t
+ s, at program_transform_name@,$program_transform_name,;t t
+ s, at bindir@,$bindir,;t t
+ s, at sbindir@,$sbindir,;t t
+ s, at libexecdir@,$libexecdir,;t t
+ s, at datadir@,$datadir,;t t
+ s, at sysconfdir@,$sysconfdir,;t t
+ s, at sharedstatedir@,$sharedstatedir,;t t
+ s, at localstatedir@,$localstatedir,;t t
+ s, at libdir@,$libdir,;t t
+ s, at includedir@,$includedir,;t t
+ s, at oldincludedir@,$oldincludedir,;t t
+ s, at infodir@,$infodir,;t t
+ s, at mandir@,$mandir,;t t
+ s, at build_alias@,$build_alias,;t t
+ s, at host_alias@,$host_alias,;t t
+ s, at target_alias@,$target_alias,;t t
+ s, at DEFS@,$DEFS,;t t
+ s, at ECHO_C@,$ECHO_C,;t t
+ s, at ECHO_N@,$ECHO_N,;t t
+ s, at ECHO_T@,$ECHO_T,;t t
+ s, at LIBS@,$LIBS,;t t
+ s, at build@,$build,;t t
+ s, at build_cpu@,$build_cpu,;t t
+ s, at build_vendor@,$build_vendor,;t t
+ s, at build_os@,$build_os,;t t
+ s, at host@,$host,;t t
+ s, at host_cpu@,$host_cpu,;t t
+ s, at host_vendor@,$host_vendor,;t t
+ s, at host_os@,$host_os,;t t
+ s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+ s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+ s, at INSTALL_DATA@,$INSTALL_DATA,;t t
+ s, at PACKAGE@,$PACKAGE,;t t
+ s, at VERSION@,$VERSION,;t t
+ s, at ACLOCAL@,$ACLOCAL,;t t
+ s, at AUTOCONF@,$AUTOCONF,;t t
+ s, at AUTOMAKE@,$AUTOMAKE,;t t
+ s, at AUTOHEADER@,$AUTOHEADER,;t t
+ s, at MAKEINFO@,$MAKEINFO,;t t
+ s, at AMTAR@,$AMTAR,;t t
+ s, at install_sh@,$install_sh,;t t
+ s, at STRIP@,$STRIP,;t t
+ s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
+ s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+ s, at AWK@,$AWK,;t t
+ s, at SET_MAKE@,$SET_MAKE,;t t
+ s, at CC@,$CC,;t t
+ s, at CFLAGS@,$CFLAGS,;t t
+ s, at LDFLAGS@,$LDFLAGS,;t t
+ s, at CPPFLAGS@,$CPPFLAGS,;t t
+ s, at ac_ct_CC@,$ac_ct_CC,;t t
+ s, at EXEEXT@,$EXEEXT,;t t
+ s, at OBJEXT@,$OBJEXT,;t t
+ s, at DEPDIR@,$DEPDIR,;t t
+ s, at am__include@,$am__include,;t t
+ s, at am__quote@,$am__quote,;t t
+ s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
+ s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
+ s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+ s, at CCDEPMODE@,$CCDEPMODE,;t t
+ s, at RANLIB@,$RANLIB,;t t
+ s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+ s, at CPP@,$CPP,;t t
+ s, at X_CFLAGS@,$X_CFLAGS,;t t
+ s, at X_PRE_LIBS@,$X_PRE_LIBS,;t t
+ s, at X_LIBS@,$X_LIBS,;t t
+ s, at X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+ s, at X11LIBS@,$X11LIBS,;t t
++s, at EGREP@,$EGREP,;t t
+ s, at GETOPT_TRUE@,$GETOPT_TRUE,;t t
+ s, at GETOPT_FALSE@,$GETOPT_FALSE,;t t
++s, at LIBOBJS@,$LIBOBJS,;t t
++s, at LTLIBOBJS@,$LTLIBOBJS,;t t
+ CEOF
+ 
+ _ACEOF
+ 
+   cat >>$CONFIG_STATUS <<\_ACEOF
+   # Split the substitutions into bite-sized pieces for seds with
+   # small command number limits, like on Digital OSF/1 and HP-UX.
+   ac_max_sed_lines=48
+   ac_sed_frag=1 # Number of current file.
+   ac_beg=1 # First line for current file.
+   ac_end=$ac_max_sed_lines # Line after last line for current file.
+   ac_more_lines=:
+   ac_sed_cmds=
+   while $ac_more_lines; do
+     if test $ac_beg -gt 1; then
+       sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+     else
+       sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+     fi
+     if test ! -s $tmp/subs.frag; then
+       ac_more_lines=false
+     else
+       # The purpose of the label and of the branching condition is to
+       # speed up the sed processing (if there are no `@' at all, there
+       # is no need to browse any of the substitutions).
+       # These are the two extra sed commands mentioned above.
+       (echo ':t
+   /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+       if test -z "$ac_sed_cmds"; then
+   	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+       else
+   	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+       fi
+       ac_sed_frag=`expr $ac_sed_frag + 1`
+       ac_beg=$ac_end
+       ac_end=`expr $ac_end + $ac_max_sed_lines`
+     fi
+   done
+   if test -z "$ac_sed_cmds"; then
+     ac_sed_cmds=cat
    fi
+ fi # test -n "$CONFIG_FILES"
  
-   case "$ac_given_srcdir" in
-   .)  srcdir=.
-       if test -z "$ac_dots"; then top_srcdir=.
-       else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-   /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-   *) # Relative path.
-     srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-     top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+   case $ac_file in
+   - | *:- | *:-:* ) # input from stdin
+         cat >$tmp/stdin
+         ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+         ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+   *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+         ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+   * )   ac_file_in=$ac_file.in ;;
    esac
  
-   case "$ac_given_INSTALL" in
-   [/$]*) INSTALL="$ac_given_INSTALL" ;;
-   *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-   esac
+   # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+   ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$ac_file" : 'X\(//\)[^/]' \| \
+          X"$ac_file" : 'X\(//\)$' \| \
+          X"$ac_file" : 'X\(/\)' \| \
+          .     : '\(.\)' 2>/dev/null ||
+ echo X"$ac_file" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
 -  { case "$ac_dir" in
 -  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
 -  *)                      as_incr_dir=.;;
 -esac
 -as_dummy="$ac_dir"
 -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
 -  case $as_mkdir_dir in
 -    # Skip DOS drivespec
 -    ?:) as_incr_dir=$as_mkdir_dir ;;
 -    *)
 -      as_incr_dir=$as_incr_dir/$as_mkdir_dir
 -      test -d "$as_incr_dir" ||
 -        mkdir "$as_incr_dir" ||
 -	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
 -echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
 -   { (exit 1); exit 1; }; }
 -    ;;
 -  esac
 -done; }
++  { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
++  else
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++         X"$as_dir" : 'X\(//\)[^/]' \| \
++         X"$as_dir" : 'X\(//\)$' \| \
++         X"$as_dir" : 'X\(/\)' \| \
++         .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
+ 
+   ac_builddir=.
+ 
+ if test "$ac_dir" != .; then
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   # A "../" for each directory in $ac_dir_suffix.
+   ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+ else
+   ac_dir_suffix= ac_top_builddir=
+ fi
+ 
+ case $srcdir in
+   .)  # No --srcdir option.  We are building in place.
+     ac_srcdir=.
+     if test -z "$ac_top_builddir"; then
+        ac_top_srcdir=.
+     else
+        ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+     fi ;;
+   [\\/]* | ?:[\\/]* )  # Absolute path.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+     ac_top_srcdir=$srcdir ;;
+   *) # Relative path.
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+ # absolute.
+ ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
 -ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
++ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+ 
  
-   echo creating "$ac_file"
-   rm -f "$ac_file"
-   configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-   case "$ac_file" in
-   *Makefile*) ac_comsub="1i\\
- # $configure_input" ;;
-   *) ac_comsub= ;;
+   case $INSTALL in
+   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
-   ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-   sed -e "$ac_comsub
- s%@configure_input@%$configure_input%g
- s%@srcdir@%$srcdir%g
- s%@top_srcdir@%$top_srcdir%g
- s%@INSTALL@%$INSTALL%g
- " $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
- fi; done
- rm -f conftest.s*
+   if test x"$ac_file" != x-; then
+     { echo "$as_me:$LINENO: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+     rm -f "$ac_file"
+   fi
+   # Let's still pretend it is `configure' which instantiates (i.e., don't
+   # use $as_me), people would be surprised to read:
+   #    /* config.h.  Generated by config.status.  */
+   if test x"$ac_file" = x-; then
+     configure_input=
+   else
+     configure_input="$ac_file.  "
+   fi
+   configure_input=$configure_input"Generated from `echo $ac_file_in |
+                                      sed 's,.*/,,'` by configure."
+ 
+   # First look for the input files in the build tree, otherwise in the
+   # src tree.
+   ac_file_inputs=`IFS=:
+     for f in $ac_file_in; do
+       case $f in
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+          # Absolute (can't be DOS-style, as IFS=:)
+          test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          echo $f;;
+       *) # Relative
+          if test -f "$f"; then
+            # Build tree
+            echo $f
+          elif test -f "$srcdir/$f"; then
+            # Source tree
+            echo $srcdir/$f
+          else
+            # /dev/null tree
+            { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+          fi;;
+       esac
+     done` || { (exit 1); exit 1; }
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+   sed "$ac_vpsub
+ $extrasub
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ :t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+ s, at configure_input@,$configure_input,;t t
+ s, at srcdir@,$ac_srcdir,;t t
+ s, at abs_srcdir@,$ac_abs_srcdir,;t t
+ s, at top_srcdir@,$ac_top_srcdir,;t t
+ s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+ s, at builddir@,$ac_builddir,;t t
+ s, at abs_builddir@,$ac_abs_builddir,;t t
+ s, at top_builddir@,$ac_top_builddir,;t t
+ s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
+ s, at INSTALL@,$ac_INSTALL,;t t
+ " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+   rm -f $tmp/stdin
+   if test x"$ac_file" != x-; then
+     mv $tmp/out $ac_file
+   else
+     cat $tmp/out
+     rm -f $tmp/out
+   fi
+ 
+ done
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+ #
+ # CONFIG_HEADER section.
+ #
  
  # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
  # NAME is the cpp macro being defined and VALUE is the value it is being given.
@@@ -2840,65 -5900,298 +6192,311 @@@ rm -f confdef2sed.se
  # This sed command replaces #undef with comments.  This is necessary, for
  # example, in the case of _POSIX_SOURCE, which is predefined and required
  # on some systems where configure will not decide to define it.
- cat >> conftest.vals <<\EOF
- s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
- EOF
- 
- # Break up conftest.vals because some shells have a limit on
- # the size of here documents, and old seds have small limits too.
+ cat >>conftest.undefs <<\_ACEOF
+ s,^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+ _ACEOF
+ 
+ # Break up conftest.defines because some shells have a limit on the size
+ # of here documents, and old seds have small limits too (100 cmds).
+ echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
 -echo '  if egrep "^[ 	]*#[ 	]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
++echo '  if grep "^[ 	]*#[ 	]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+ echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+ echo '  :' >>$CONFIG_STATUS
+ rm -f conftest.tail
+ while grep . conftest.defines >/dev/null
+ do
+   # Write a limited-size here document to $tmp/defines.sed.
+   echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+   # Speed up: don't consider the non `#define' lines.
+   echo '/^[ 	]*#[ 	]*define/!b' >>$CONFIG_STATUS
+   # Work around the forget-to-reset-the-flag bug.
+   echo 't clr' >>$CONFIG_STATUS
+   echo ': clr' >>$CONFIG_STATUS
+   sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
+   echo 'CEOF
+   sed -f $tmp/defines.sed $tmp/in >$tmp/out
+   rm -f $tmp/in
+   mv $tmp/out $tmp/in
+ ' >>$CONFIG_STATUS
+   sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
+   rm -f conftest.defines
+   mv conftest.tail conftest.defines
+ done
+ rm -f conftest.defines
 -echo '  fi # egrep' >>$CONFIG_STATUS
++echo '  fi # grep' >>$CONFIG_STATUS
+ echo >>$CONFIG_STATUS
  
+ # Break up conftest.undefs because some shells have a limit on the size
+ # of here documents, and old seds have small limits too (100 cmds).
+ echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
  rm -f conftest.tail
- while :
+ while grep . conftest.undefs >/dev/null
  do
-   ac_lines=`grep -c . conftest.vals`
-   # grep -c gives empty output for an empty file on some AIX systems.
-   if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-   # Write a limited-size here document to conftest.frag.
-   echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-   sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
+   # Write a limited-size here document to $tmp/undefs.sed.
+   echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
+   # Speed up: don't consider the non `#undef'
+   echo '/^[ 	]*#[ 	]*undef/!b' >>$CONFIG_STATUS
+   # Work around the forget-to-reset-the-flag bug.
+   echo 't clr' >>$CONFIG_STATUS
+   echo ': clr' >>$CONFIG_STATUS
+   sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
    echo 'CEOF
-   sed -f conftest.frag conftest.in > conftest.out
-   rm -f conftest.in
-   mv conftest.out conftest.in
- ' >> $CONFIG_STATUS
-   sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-   rm -f conftest.vals
-   mv conftest.tail conftest.vals
- done
- rm -f conftest.vals
- 
- cat >> $CONFIG_STATUS <<\EOF
-   rm -f conftest.frag conftest.h
-   echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
-   cat conftest.in >> conftest.h
-   rm -f conftest.in
-   if cmp -s $ac_file conftest.h 2>/dev/null; then
-     echo "$ac_file is unchanged"
-     rm -f conftest.h
+   sed -f $tmp/undefs.sed $tmp/in >$tmp/out
+   rm -f $tmp/in
+   mv $tmp/out $tmp/in
+ ' >>$CONFIG_STATUS
+   sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
+   rm -f conftest.undefs
+   mv conftest.tail conftest.undefs
+ done
+ rm -f conftest.undefs
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   # Let's still pretend it is `configure' which instantiates (i.e., don't
+   # use $as_me), people would be surprised to read:
+   #    /* config.h.  Generated by config.status.  */
+   if test x"$ac_file" = x-; then
+     echo "/* Generated by configure.  */" >$tmp/config.h
+   else
+     echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
+   fi
+   cat $tmp/in >>$tmp/config.h
+   rm -f $tmp/in
+   if test x"$ac_file" != x-; then
 -    if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
++    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+       { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$ac_file" : 'X\(//\)[^/]' \| \
+          X"$ac_file" : 'X\(//\)$' \| \
+          X"$ac_file" : 'X\(/\)' \| \
+          .     : '\(.\)' 2>/dev/null ||
+ echo X"$ac_file" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
 -      { case "$ac_dir" in
 -  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
 -  *)                      as_incr_dir=.;;
 -esac
 -as_dummy="$ac_dir"
 -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
 -  case $as_mkdir_dir in
 -    # Skip DOS drivespec
 -    ?:) as_incr_dir=$as_mkdir_dir ;;
 -    *)
 -      as_incr_dir=$as_incr_dir/$as_mkdir_dir
 -      test -d "$as_incr_dir" ||
 -        mkdir "$as_incr_dir" ||
 -	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
 -echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
 -   { (exit 1); exit 1; }; }
 -    ;;
 -  esac
 -done; }
++      { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
 +  else
-     # Remove last slash and all that follows it.  Not all systems have dirname.
-       ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-       if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-       # The file is in a subdirectory.
-       test ! -d "$ac_dir" && mkdir "$ac_dir"
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++         X"$as_dir" : 'X\(//\)[^/]' \| \
++         X"$as_dir" : 'X\(//\)$' \| \
++         X"$as_dir" : 'X\(/\)' \| \
++         .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
+ 
+       rm -f $ac_file
+       mv $tmp/config.h $ac_file
      fi
-     rm -f $ac_file
-     mv conftest.h $ac_file
+   else
+     cat $tmp/config.h
+     rm -f $tmp/config.h
    fi
- fi; done
+   # Run the commands associated with the file.
+   case $ac_file in
+     config.h ) # update the timestamp
+ echo 'timestamp for config.h' >"./stamp-h1"
+  ;;
+   esac
+ done
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
  
- EOF
- cat >> $CONFIG_STATUS <<EOF
+ #
+ # CONFIG_COMMANDS section.
+ #
+ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+   ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+   ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+ $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$ac_dest" : 'X\(//\)[^/]' \| \
+          X"$ac_dest" : 'X\(//\)$' \| \
+          X"$ac_dest" : 'X\(/\)' \| \
+          .     : '\(.\)' 2>/dev/null ||
+ echo X"$ac_dest" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+   ac_builddir=.
+ 
+ if test "$ac_dir" != .; then
+   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+   # A "../" for each directory in $ac_dir_suffix.
+   ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+ else
+   ac_dir_suffix= ac_top_builddir=
+ fi
+ 
+ case $srcdir in
+   .)  # No --srcdir option.  We are building in place.
+     ac_srcdir=.
+     if test -z "$ac_top_builddir"; then
+        ac_top_srcdir=.
+     else
+        ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+     fi ;;
+   [\\/]* | ?:[\\/]* )  # Absolute path.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+     ac_top_srcdir=$srcdir ;;
+   *) # Relative path.
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+ # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+ # absolute.
+ ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
 -ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
++ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+ 
+ 
+   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+ echo "$as_me: executing $ac_dest commands" >&6;}
+   case $ac_dest in
+     depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+   # Strip MF so we end up with the name of the file.
+   mf=`echo "$mf" | sed -e 's/:.*$//'`
+   # Check whether this is an Automake generated Makefile or not.
+   # We used to match only the files named `Makefile.in', but
+   # some people rename them; so instead we look at the file content.
+   # Grep'ing the first line is not enough: some people post-process
+   # each Makefile.in and add a new line on top of each file to say so.
+   # So let's grep whole file.
+   if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+     dirpart=`(dirname "$mf") 2>/dev/null ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$mf" : 'X\(//\)[^/]' \| \
+          X"$mf" : 'X\(//\)$' \| \
+          X"$mf" : 'X\(/\)' \| \
+          .     : '\(.\)' 2>/dev/null ||
+ echo X"$mf" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+   else
+     continue
+   fi
+   grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
+   # Extract the definition of DEP_FILES from the Makefile without
+   # running `make'.
+   DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+   test -z "$DEPDIR" && continue
+   # When using ansi2knr, U may be empty or an underscore; expand it
+   U=`sed -n -e '/^U = / s///p' < "$mf"`
+   test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+   # We invoke sed twice because it is the simplest approach to
+   # changing $(DEPDIR) to its actual value in the expansion.
+   for file in `sed -n -e '
+     /^DEP_FILES = .*\\\\$/ {
+       s/^DEP_FILES = //
+       :loop
+ 	s/\\\\$//
+ 	p
+ 	n
+ 	/\\\\$/ b loop
+       p
+     }
+     /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+     # Make sure the directory exists.
+     test -f "$dirpart/$file" && continue
+     fdir=`(dirname "$file") 2>/dev/null ||
+ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+          X"$file" : 'X\(//\)[^/]' \| \
+          X"$file" : 'X\(//\)$' \| \
+          X"$file" : 'X\(/\)' \| \
+          .     : '\(.\)' 2>/dev/null ||
+ echo X"$file" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
 -    { case $dirpart/$fdir in
 -  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
 -  *)                      as_incr_dir=.;;
 -esac
 -as_dummy=$dirpart/$fdir
 -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
 -  case $as_mkdir_dir in
 -    # Skip DOS drivespec
 -    ?:) as_incr_dir=$as_mkdir_dir ;;
 -    *)
 -      as_incr_dir=$as_incr_dir/$as_mkdir_dir
 -      test -d "$as_incr_dir" ||
 -        mkdir "$as_incr_dir" ||
 -	{ { echo "$as_me:$LINENO: error: cannot create $dirpart/$fdir" >&5
 -echo "$as_me: error: cannot create $dirpart/$fdir" >&2;}
 -   { (exit 1); exit 1; }; }
 -    ;;
 -  esac
 -done; }
++    { if $as_mkdir_p; then
++    mkdir -p $dirpart/$fdir
++  else
++    as_dir=$dirpart/$fdir
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++         X"$as_dir" : 'X\(//\)[^/]' \| \
++         X"$as_dir" : 'X\(//\)$' \| \
++         X"$as_dir" : 'X\(/\)' \| \
++         .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
++echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
++   { (exit 1); exit 1; }; }; }
  
+     # echo "creating $dirpart/$file"
+     echo '# dummy' > "$dirpart/$file"
+   done
+ done
+  ;;
+   esac
+ done
+ _ACEOF
  
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
+ cat >>$CONFIG_STATUS <<\_ACEOF
  
- exit 0
- EOF
+ { (exit 0); exit 0; }
+ _ACEOF
  chmod +x $CONFIG_STATUS
- rm -fr confdefs* $ac_clean_files
- test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+ ac_clean_files=$ac_clean_files_save
+ 
+ 
+ # configure is writing to config.log, and then calls config.status.
+ # config.status does its own redirection, appending to config.log.
+ # Unfortunately, on DOS this fails, as config.log is still kept open
+ # by configure, so config.status won't be able to write to it; its
+ # output is simply discarded.  So we exec the FD to /dev/null,
+ # effectively closing config.log, so it can be properly (re)opened and
+ # appended to by config.status.  When coming back to configure, we
+ # need to make the FD available again.
+ if test "$no_create" != yes; then
+   ac_cs_success=:
++  ac_config_status_args=
++  test "$silent" = yes &&
++    ac_config_status_args="$ac_config_status_args --quiet"
+   exec 5>/dev/null
 -  $SHELL $CONFIG_STATUS || ac_cs_success=false
++  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+   exec 5>>config.log
+   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+   # would make configure fail if this is the last instruction.
+   $ac_cs_success || { (exit 1); exit 1; }
+ fi
  
  
diff --cc debian/changelog
index 10a464f,0000000..30cb755
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,76 -1,0 +1,128 @@@
++wmfsm (0.34-6) unstable; urgency=low
++
++  * Fixed filesystem name corruption, thanks to Ralf Horstmann and Cristian
++    Ionescu-Idbohrn for the patch.
++
++ -- Arthur Korn <arthur at korn.ch>  Wed, 25 Aug 2004 01:29:58 +0200
++
++wmfsm (0.34-5) unstable; urgency=low
++
++  * wmfsm.sample: adapted to the wealth of pseudo-fs in current linux
++    systems. closes: #226298
++  * debian/watch removed, upstream's dead.
++  * wmfsm.1: made a point on the strictness of wmfsmrc format, closes: #226274
++  * memleak news: avoid it if there are more than 9 filesystems too.
++  * Standards-Version 3.6.1.0 without changes.
++
++ -- Arthur Korn <arthur at korn.ch>  Wed, 17 Mar 2004 13:04:33 +0100
++
++wmfsm (0.34-4) unstable; urgency=low
++
++  * fixed memleak introduced in 0.34-2 with the patch by Timo Benk.
++    global char *mp[] was assigned the result of stdup() repeatedly
++    without free. My ugly fix is to free it all up at the beginning of
++    readFileSystems(). Now I'm a proud Perl coder ... closes: #196057
++
++ -- Arthur Korn <arthur at korn.ch>  Wed,  2 Jul 2003 23:05:21 +0200
++
++wmfsm (0.34-3) unstable; urgency=low
++
++  * ran aclocal and updated config.sub and config.guess
++    closes: #174686, #187602
++
++ -- Arthur Korn <arthur at korn.ch>  Wed,  2 Jul 2003 23:04:55 +0200
++
++wmfsm (0.34-2) unstable; urgency=low
++
++  * Added Build-Depends on automake1.6, closes: #175082
++  * updated config.{sub,guess} from autotools-dev.
++  * Applied patch by Timo Benk that makes wmfsm reread the filesystems list
++    during it's life, closes: #186826
++
++ -- Arthur Korn <arthur at korn.ch>  Tue,  1 Apr 2003 11:25:11 +0200
++
++wmfsm (0.34-1) unstable; urgency=low
++
++  * New upstream release
++  * rules: new DEB_BUILD_OPTIONS syntax
++  * Standards-Version: 3.5.8
++  * building upstream changelog by concatenating Changelog{,.old}
++
++ -- Arthur Korn <arthur at korn.ch>  Tue, 17 Dec 2002 11:10:00 +0100
++
 +wmfsm (0.33-2) unstable; urgency=low
 +
 +  * corrected speling error in description, closes: Bug#125491
 +
 + -- Arthur Korn <arthur at korn.ch>  Tue, 18 Dec 2001 22:13:56 +0100
 +
 +wmfsm (0.33-1) unstable; urgency=low
 +
 +  * New upstream release
 +    - autoconf
 +
 + -- Arthur Korn <arthur at korn.ch>  Sat, 20 Jan 2001 16:06:04 +0100
 +
 +wmfsm (0.31-9) unstable; urgency=low
 +
 +  * Added menu hints
 +
 + -- Arthur Korn <arthur at korn.ch>  Sun, 14 Jan 2001 17:06:04 +0100
 +
 +wmfsm (0.31-8) unstable; urgency=low
 +
 +  * Adapted Build-Depends to new libs (see changelog of last version).
 +
 + -- Arthur Korn <arthur at korn.ch>  Sat, 18 Nov 2000 21:42:29 +0100
 +
 +wmfsm (0.31-7) unstable; urgency=low
 +
 +  * recompile without libc5 dependency (libxpm4.7) (Closes: Bug#77277).
 +
 + -- Arthur Korn <arthur at korn.ch>  Fri, 17 Nov 2000 22:25:44 +0100
 +
 +wmfsm (0.31-6) unstable; urgency=low
 +
 +  * control: changed maintainer address to arthur at debian.org.
 +  * This time including full source in upload.
 +
 + -- Arthur Korn <arthur at korn.ch>  Wed, 15 Nov 2000 20:36:47 +0100
 +
 +wmfsm (0.31-5) unstable; urgency=low
 +
 +  * wmfsm.1: wrote a manpage.
 +  * control: changed section to utils.
 +
 + -- Arthur Korn <arthur at korn.ch>  Sun,  8 Oct 2000 10:43:21 +0200
 +
 +wmfsm (0.31-4) unstable; urgency=low
 +
 +  * rules: evaluating DEB_BUILD_OPTIONS now.
 +  * rules: installing into /usr/bin, not /usr/X11R6/bin.
 +  * undocumented: changed section from 1x to 1.
 +  * menu: /usr/bin/X11/wmnd -> /usr/bin/wmnd.
 +
 + -- Arthur Korn <arthur at korn.ch>  Wed,  4 Oct 2000 13:24:02 +0200
 +
 +wmfsm (0.31-3) unstable; urgency=low
 +
 +  * rules: now building with -Wall -g -O2
 +
 + -- Arthur Korn <arthur at korn.ch>  Sat, 29 Jul 2000 17:11:56 +0200
 +
 +wmfsm (0.31-2) unstable; urgency=low
 +
 +  * Make the debianisation diff only contain debian/*
 +  * control: made the description more verbose
 +
 + -- Arthur Korn <arthur at korn.ch>  Fri, 14 Jul 2000 22:40:09 +0200
 +
 +wmfsm (0.31-1) unstable; urgency=low
 +
 +  * Initial Release.
 +
 + -- Arthur Korn <arthur at korn.ch>  Tue, 11 Jul 2000 22:58:37 +0200
 +
 +Local variables:
 +mode: debian-changelog
 +End:
diff --cc debian/compat
index 0000000,0000000..d00491f
new file mode 100644
--- /dev/null
+++ b/debian/compat
@@@ -1,0 -1,0 +1,1 @@@
++1
diff --cc debian/control
index dbe6df7,0000000..1eefda7
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,16 -1,0 +1,16 @@@
 +Source: wmfsm
 +Section: utils
 +Priority: optional
 +Maintainer: Arthur Korn <arthur at debian.org>
- Standards-Version: 3.0.1
- Build-Depends: debhelper, xlibs-dev
++Standards-Version: 3.6.1.0
++Build-Depends: debhelper, xlibs-dev, automake1.6
 +
 +Package: wmfsm
 +Architecture: any
 +Depends: ${shlibs:Depends}
 +Description: WindowMaker dock app for monitoring filesystem usage
 + Nice graphical 'df', showing you to what degree the mounted
 + filesystems are used.
 + .
 + Another X11 dockable application designed for WindowMaker.
 + It works with other window managers as well.
diff --cc debian/copyright
index 2d69ef8,0000000..82b99a8
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,14 -1,0 +1,14 @@@
 +This package was debianized by Arthur Korn <arthur at korn.ch> on
 +Tue, 11 Jul 2000 22:58:37 +0200.
 +
 +It was downloaded from http://www.cs.mcgill.ca/~cgray4/
 +
- Upstream Author(s):
++Upstream Authors:
 +Chris Gray <cgray at tribsoft.com>
 +originally written by Stefan Eilemann <Stefan.Eilemann at sgi.com>
 +
 +Copyright:
 +
 +GNU GPL version 2.
 +
- See /usr/share/common-licenses/GPL.
++See /usr/share/common-licenses/GPL2 for full licence text.
diff --cc debian/menu
index 2859724,0000000..0afdeb0
mode 100644,000000..100644
--- a/debian/menu
+++ b/debian/menu
@@@ -1,6 -1,0 +1,6 @@@
 +?package(wmfsm):\
-   needs=X11\
-   section=Apps/System\
++  needs="X11"\
++  section="Apps/System"\
 +  title="WMfsm"\
 +  hints="Monitoring,Dockapp"\
 +  command="/usr/bin/wmfsm"
diff --cc debian/rules
index 545b4b4,0000000..b079738
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,72 -1,0 +1,80 @@@
 +#!/usr/bin/make -f
 +# Sample debian/rules that uses debhelper.
 +# GNU copyright 1997 to 1999 by Joey Hess.
 +
 +# Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
 +# This is the debhelper compatability version to use.
 +export DH_COMPAT=1
 +
 +dest = $(shell pwd)/debian/tmp/usr/
 +
- cflags="-Wall -O2"
++CFLAGS=-Wall -g
 +
- ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-   cflags +=" -g"
++ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
++  CFLAGS+=-O0
++else
++  CFLAGS+=-O2
 +endif
 +ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-   stripargs =" --no-act"
++  STRIPARGS= --no-act
 +endif
 +
 +build: build-stamp
 +build-stamp:
 +	dh_testdir
 +
++	echo $$DH_COMPAT > debian/compat
++
 +	./configure --prefix=/usr --mandir=\$${prefix}/share/man \
 +	    --host=$(DEB_HOST_GNU_TYPE) --target=$(DEB_BUILD_GNU_TYPE)
- 	$(MAKE) CFLAGS=$(cflags)
++	$(MAKE) CFLAGS="$(CFLAGS)"
++
++	cat ChangeLog ChangeLog.old > debian/upstreamchangelog
 +
 +	touch build-stamp
 +
 +clean:
 +	dh_testdir
 +	dh_testroot
 +	rm -f build-stamp
 +
- 	-make distclean
++	rm -f debian/upstreamchangelog
 +
++	-make distclean
++	
 +	dh_clean
 +
 +install: build
 +	dh_testdir
 +	dh_testroot
 +	dh_clean -k
 +	dh_installdirs
 +
 +	make install prefix=$(dest)
 +
 +binary-indep: build install
 +
 +binary-arch: build install
 +	dh_testdir
 +	dh_testroot
 +	dh_installdocs
 +	dh_installexamples
 +	dh_installmenu
 +	dh_installmanpages
- 	dh_installchangelogs ChangeLog
++	dh_installchangelogs debian/upstreamchangelog
 +	dh_link
- 	dh_strip $(stripargs)
++	dh_strip $(STRIPARGS)
 +	dh_compress
 +	dh_fixperms
 +	dh_installdeb
 +	dh_shlibdeps
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
 +binary: binary-indep binary-arch
 +.PHONY: build clean binary-indep binary-arch binary install
 +
 +# vim:nosta
diff --cc wmfsm/wmfsm.1
index 28d2866,8e4b45e..d0598e4
--- a/wmfsm/wmfsm.1
+++ b/wmfsm/wmfsm.1
@@@ -1,61 -1,106 +1,106 @@@
- .\"                                      Hey, EMACS: -*- nroff -*-
- .TH WMFSM 1 "Jan 13, 2001"
- .\" Please adjust this date whenever revising the manpage.
- .\"
- .\" Some roff macros, for reference:
- .\" .nh        disable hyphenation
- .\" .hy        enable hyphenation
- .\" .ad l      left justify
- .\" .ad b      justify to both left and right margins
- .\" .nf        disable filling
- .\" .fi        enable filling
- .\" .br        insert line break
- .\" .sp <n>    insert n+1 empty lines
- .\" for manpage-specific macros, see man(7)
- .SH NAME
- wmfsm \- shows the amount of disk space available
- .SH SYNOPSIS
- .BR wmfsm " [ " -bhfn " | " --help " | [ " --normal " | " --fire " ] [ " --blink " | " --noblink " ] [ " -display
- .IR display " ]"
- .RB " [ " --delay " | " -d
- .IR delay " ] ]"
- .SH DESCRIPTION
- \fBWmfsm\fP is a WindowMaker dock application that shows the amount of disc
- space available on mounted filesystems with coloured bars.
- .SH OPTIONS
- .TP
- .B \-\-normal, \-n
- Show the entire bars in the same colour.
- .TP
- .B \-\-fire, \-f
- Render the bars as gradients. You may switch between the normal and fire modes
- by mouse clicks anywhere on \fBwmfsm\fP.
- .TP
- .BR \-\-blink, \-b " | " \-\-noblink
- Do / do not blink if a filesystem is 95% full.
- .TP
- .BI \-display \ display
- Draw to
- .BR X (1)
- display \fIdisplay\fP.
- .TP
- .B \-d, \-\-delay \ \fIdelay\fP
- Wait \fIdelay\fP milliseconds to redraw the window.
- .TP
- .B \-h, \-\-help
- Show summary of options.
- .SH FILES
- You may exclude filesystems from being shown by \fBwmfsm\fP by listing them
- in the ~/.wmfsmrc file. This file has to look like this:
- .IP
- .nf
- [exclude]
- /dev/pts
- .fi
- .SH SEE ALSO
- .BR X (1x),
- .BR wmaker (1),
- .BR df (1).
- .SH AUTHOR
- This manual page was written by Arthur Korn <arthur at korn.ch> and
- modified by Chris Gray <cgray at tribsoft.com>
+ .\" This -*- nroff -*- file has been generated from
+ .\" DocBook SGML with docbook-to-man on Debian GNU/Linux.
+ ...\"
+ ...\"	transcript compatibility for postscript use.
+ ...\"
+ ...\"	synopsis:  .P! <file.ps>
+ ...\"
+ .de P!
+ \\&.
+ .fl			\" force out current output buffer
+ \\!%PB
+ \\!/showpage{}def
+ ...\" the following is from Ken Flowers -- it prevents dictionary overflows
+ \\!/tempdict 200 dict def tempdict begin
+ .fl			\" prolog
+ .sy cat \\$1\" bring in postscript file
+ ...\" the following line matches the tempdict above
+ \\!end % tempdict %
+ \\!PE
+ \\!.
+ .sp \\$2u	\" move below the image
+ ..
+ .de pF
+ .ie     \\*(f1 .ds f1 \\n(.f
+ .el .ie \\*(f2 .ds f2 \\n(.f
+ .el .ie \\*(f3 .ds f3 \\n(.f
+ .el .ie \\*(f4 .ds f4 \\n(.f
+ .el .tm ? font overflow
+ .ft \\$1
+ ..
+ .de fP
+ .ie     !\\*(f4 \{\
+ .	ft \\*(f4
+ .	ds f4\"
+ '	br \}
+ .el .ie !\\*(f3 \{\
+ .	ft \\*(f3
+ .	ds f3\"
+ '	br \}
+ .el .ie !\\*(f2 \{\
+ .	ft \\*(f2
+ .	ds f2\"
+ '	br \}
+ .el .ie !\\*(f1 \{\
+ .	ft \\*(f1
+ .	ds f1\"
+ '	br \}
+ .el .tm ? font underflow
+ ..
+ .ds f1\"
+ .ds f2\"
+ .ds f3\"
+ .ds f4\"
+ '\" t 
+ .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n  
+ .TH "WMFSM" "1" 
+ .SH "NAME" 
+ wmfsm \(em shows the amount of disk space available 
+ .SH "SYNOPSIS" 
+ .PP 
+ \fBwmfsm\fP [\fB--normal, -n  \fP]  [\fB--fire, -f \fP]  [\fB--blink, -b \fP]  [\fB--noblink \fP]  [\fB-display \fP]  [\fB-d, --delay \fP]  [\fB-h, --help \fP]  
+ .SH "DESCRIPTION" 
+ .PP 
+ \fBwmfsm\fP is a WindowMaker dock 
+ application that shows the amount of disk space available on mounted 
+ file systems with colored bars. 
+ .SH "OPTIONS" 
+ .PP 
+ This program follows the usual GNU command line syntax, 
+ with long options starting with two dashes (`-').  A summary of 
+ options is included below.  
+  
+ .IP "\fB-h\fP \fB--help\fP         " 10 
+ Show summary of options. 
+ .IP "\fB-v\fP \fB--version\fP         " 10 
+ Show version of program. 
+ .IP "\fB-n\fP \fB--normal\fP 	" 10 
+ Show the entire bars in the same color. 
+ .IP "\fB-f\fP \fB--fire\fP 	" 10 
+ Render the bars as gradients.  You may switch between 
+ the normal and fire modes by mouse clicks anywhere on 
+ wmfsm. 
+ .IP "\fB-b\fP \fB--blink\fP 	" 10 
+ Blink the bars if the filesystem is 95% full. 
+ .IP "\fB--noblink\fP 	" 10 
+ Do not blink if the filesystem is 95% full. 
+ .IP "\fB-display\fP 	" 10 
+ Draw on the specified display. 
+ .IP "\fB-d\fP \fB--delay\fP 	" 10 
+ Wait the specified number of milliseconds to redraw 
+ the window. 
+ .SH "FILES" 
+ .PP 
+ You may exclude filesystems from being show by wmfsm 
+ by listing them in the ~/.wmfsmrc file.  It should have as its 
+ first line either [include] or [exclude]. 
+ The next lines are filesystems that are either explicitly included 
 -or excluded respectively. 
++or excluded respectively. No comments, leading or trailing whitespace allowed.
+ .SH "SEE ALSO" 
+ .PP 
+ X (1x), wmaker (1), df (1). 
+ .SH "AUTHOR" 
+ .PP 
+ This manual page was written by Chris Gray 
+ <cgray4 at po-box.mcgill.ca>. 
+ ...\" created by instant / docbook-to-man, Fri 12 Jul 2002, 22:38 
diff --cc wmfsm/wmfsm.c
index 221b25b,36fa906..c5cecbd
--- a/wmfsm/wmfsm.c
+++ b/wmfsm/wmfsm.c
@@@ -38,6 -38,6 +38,7 @@@
  #include <stdio.h>
  #include <unistd.h>
  #include <stdlib.h>
++#include <ctype.h>
  #include <string.h>
  #include <X11/X.h>
  #include <X11/xpm.h>
@@@ -75,24 -75,24 +76,23 @@@
  #elif defined STATFS_4_ARGUMENTS
  # define STATFS(a,b) statfs(a,b,sizeof(struct statfs),0)
  #else
- # define STATFS(a,b) statfs(a,b) /* Maybe configure got messed up */
+ # define STATFS(a,b) statfs(a,b)	/* Maybe configure got messed up */
  #endif
  
--
  /*
- #if defined IRIX64
- # include <sys/types.h>
- # define STATFS(a,b) statfs(a,b,sizeof(struct statfs),0)
- #elif defined linux 
- # define STATFS(a,b) statfs(a,b)
- #elif  defined(SunOS)
- # define STATFS(a,b) statfs(a,b,sizeof(struct statfs),0)
- #elif defined(__OpenBSD__) || defined(__FreeBSD__)
- # define STATFS(a,b) statfs(a,b)
- # include <sys/param.h>
- #endif		
+   #if defined IRIX64
+   # include <sys/types.h>
+   # define STATFS(a,b) statfs(a,b,sizeof(struct statfs),0)
+   #elif defined linux 
+   # define STATFS(a,b) statfs(a,b)
+   #elif  defined(SunOS)
+   # define STATFS(a,b) statfs(a,b,sizeof(struct statfs),0)
+   #elif defined(__OpenBSD__) || defined(__FreeBSD__)
+   # define STATFS(a,b) statfs(a,b)
+   # include <sys/param.h>
+   #endif		
  */
-  
+ 
  #define _GNU_SOURCE
  #include <getopt.h>
  /* 
@@@ -152,184 -154,231 +154,234 @@@ int ypos[] = { 4, 4, 4, 4, 4, 4
  /*  
   *   main  
   */
- int main(int argc, char *argv[]) 
+ int
+ main(int argc, char *argv[])
  {
  
-     XEvent  event;
-     int     dx,dy;
-     char    hostname[100];
-     int		i,j,k;
-     int     c,on[9]={1,1,1,1,1,1,1,1,1};
-     struct statfs buffer;
+ 	XEvent event;
+ 	int dx, dy;
+ 	char hostname[100];
+ 	int i, j, k;
+ 	int c, on[9] = { 1, 1, 1, 1, 1, 1, 1, 1, 1 };
+ 	struct statfs buffer;
+ 
+ 	/*
+ 	 *  Parse any command line arguments.
+ 	 */
+ 	myName = strdup(argv[0]);
+ 	ParseCMDLine(argc, argv);
 -	readFileSystems();
  
-     /*
-      *  Parse any command line arguments.
-      */
-     myName=strdup(argv[0]);
-     ParseCMDLine(argc, argv);
-     readFileSystems();   
-     
- 	   
-     openXwindow(argc, argv, wmfsm_master_xpm, wmfsm_mask_bits, wmfsm_mask_width, wmfsm_mask_height);
+ 
+ 	openXwindow(argc, argv, wmfsm_master_xpm, wmfsm_mask_bits, wmfsm_mask_width, wmfsm_mask_height);
  
  
  #ifndef SVR4
-     if (gethostname(hostname, 100) != 0) {
-         perror("gethostname");
- 	exit(10);
-     }
+ 	if (gethostname(hostname, 100) != 0) {
+ 		perror("gethostname");
+ 		exit(10);
+ 	}
  #else
-     if (sysinfo(SI_HOSTNAME, hostname, 100) < 0) {
- 	perror("sysinfo(SI_HOSTNAME)");
- 	exit(20);
-     }
+ 	if (sysinfo(SI_HOSTNAME, hostname, 100) < 0) {
+ 		perror("sysinfo(SI_HOSTNAME)");
+ 		exit(20);
+ 	}
  #endif
-     while(1) {
- 	    /* 
- 	     *   Process any pending X events.
- 	     */
-         while(XPending(display)){
-             XNextEvent(display, &event);
-             switch(event.type){
-                 case Expose:
-                         RedrawWindow();
-                         break;
-                 case ButtonPress:
-                         pressEvent(&event.xbutton);
-                         mode = (mode+1)%2;
-                         break;
-                 case ButtonRelease:
-                         break;
-             }
-         }
- 	    /*! Here read data
- 	     */
-         for (i=0;i<numberfs;i++){
-             if (STATFS(mp[i],&buffer)!=-1){
-                 per[i]=100-(int)((float)buffer.f_bfree/(float)buffer.f_blocks*100.0);
-             }
-         }
- 	    /*!
- 	     *  Draw window.
- 	     */
- 	    /*
- 	     * Clear window.
- 	     */
- 	    copyXPMArea(5, 69, 54, 54, 5, 5);
- 	    /*! here draw values
- 	     * void copyXPMArea(int x, int y, int sx, int sy, int dx, int dy)
- 	     */
-          
- 		 if (numberfs>4){
- 	    	for (i=0,dy=0;i<numberfs;i++){
-             	for (j=0,dx=0;j<LENMP && j<strlen(mp[i]); j++){
-                     k = j+(strlen(mp[i])>LENMP ? strlen(mp[i])-LENMP  : 0);
-                     c = (int)mp[i][k];
-                 	switch(c){
-             	    	case '/': 
-                 	    	c=123;break;
-             	    	case '_': 
-                 	    	c=124;break;
-                     	case '0':case '1':case '2':case '3':case '4':
-                     	case '5':case '6':case '7':case '8':case '9':
-                     		c+=79;break;
-             	    	default:
- 				/* All _tolower()s are now tolower()
- 				 * -- tschroed */
-                 	    	c=tolower(c);break;
-                 	}
-                 	copyXPMArea(xpos[c-97], ypos[c-97], 5, 5, 6+dx, 5+dy);dx+=5;
- 		    	}
-             	c = (int)((float)per[i]*0.52+66.0);
-             	k = (10-LENMP)*5+2;
-             	k = (float)per[i]/100.0*k;
-             	k = LENMP*5+k;
-             	k = k < LENMP*5+1 ? LENMP*5+1 : k;
-             	c = c > 66 ? c : 66;
-             	c = c > 117 ? 117 : c;
-                 if( blink ){
-                     if ( (int)per[i] >= blinkper )
-                         on[i] = !on[i];
-                     else 
-                         on[i] = 1;
-                 } else
-                     on[i] = 1;
-                 
-             	for(j=LENMP*5;j<k;j++){
-                     if (mode==FIRE && on[i])
-         	    	    copyXPMArea(66+(float)(j-LENMP*5)*52.0/(float)((10-LENMP)*5),29,1,5,6+j,5+dy);
-                     else if (mode==NORMAL && on[i])
-         	    	    copyXPMArea(c,29,1,5,6+j,5+dy);
-                 }
-             	dy+=6;
- 	    	}
- 		}else{ /*one fs in two lines*/
- 	    	for (i=0,dy=0;i<numberfs;i++){
-             	for (j=0,dx=0;j<10 && j<strlen(mp[i]); j++){
-         	    	c = (int)mp[i][j+(strlen(mp[i])>10 ? strlen(mp[i])-10 : 0)];
-                 	switch(c){
-             	    	case '/': 
-                 	    	c=123;break;
-             	    	case '_': 
-                 	    	c=124;break;
-                     	case '0':case '1':case '2':case '3':case '4':
-                     	case '5':case '6':case '7':case '8':case '9':
-                     		c+=79;break;
-             	    	default:
-                 	    	c=tolower(c);break;
-                 	}
-                 	copyXPMArea(xpos[c-97], ypos[c-97], 5, 5, 6+dx, 5+dy);dx+=5;
- 		    	}
-             	dy+=6;
-             	c = (int)((float)per[i]*0.52+66.0);
-             	k = (float)per[i]/100.0*52;
-             	k = k < 1 ? 1 : k;
-             	c = c > 66 ? c : 66;
-             	c = c > 117 ? 117 : c;
-                 if( blink ){
-                     if ( (int)per[i] >= blinkper )
-                         on[i] = !on[i];
-                     else 
-                         on[i] = 1;
-                 } else
-                     on[i] = 1;
- 
-             	for(j=0;j<k;j++){
-                 	if (mode==FIRE && on[i])
-         	    		copyXPMArea(66+(float)(j)*52.0/50.0,29,1,5,6+j,5+dy);
-                     else if (mode==NORMAL && on[i])
-         	    		copyXPMArea(c,29,1,5,6+j,5+dy);
-                 }
-             	dy+=6;
- 	    	}
+ 	while (1) {
++
++		readFileSystems ();
++		usleep (100);
++
+ 		/* 
+ 		 *   Process any pending X events.
+ 		 */
+ 		while (XPending(display)) {
+ 			XNextEvent(display, &event);
+ 			switch (event.type) {
+ 			case Expose:
+ 				RedrawWindow();
+ 				break;
+ 			case ButtonPress:
+ 				pressEvent(&event.xbutton);
+ 				mode = (mode + 1) % 2;
+ 				break;
+ 			case ButtonRelease:
+ 				break;
+ 			}
+ 		}
+ 		/*! Here read data
+ 		 */
+ 		for (i = 0; i < numberfs; i++) {
+ 			if (STATFS(mp[i], &buffer) != -1) {
+ 				per[i] = 100 - (int) ((float) buffer.f_bfree / (float) buffer.f_blocks * 100.0);
+ 			}
+ 		}
+ 		/*!
+ 		 *  Draw window.
+ 		 */
+ 		/*
+ 		 * Clear window.
+ 		 */
+ 		copyXPMArea(5, 69, 54, 54, 5, 5);
+ 		/*! here draw values
+ 		 * void copyXPMArea(int x, int y, int sx, int sy, int dx, int dy)
+ 		 */
+ 
+ 		if (numberfs > 4) {
+ 			for (i = 0, dy = 0; i < numberfs; i++) {
 -				for (j = 0, dx = 0; j < LENMP && j < strlen(mp[i]); j++) {
++				for (j = 0, dx = 0; j < LENMP && (unsigned int)j < strlen(mp[i]); j++) {
+ 					k = j + (strlen(mp[i]) > LENMP ? strlen(mp[i]) - LENMP : 0);
+ 					c = (int) mp[i][k];
+ 					switch (c) {
+ 					case '/':
+ 						c = 123;
+ 						break;
+ 					case '_':
+ 						c = 124;
+ 						break;
+ 					case '0':
+ 					case '1':
+ 					case '2':
+ 					case '3':
+ 					case '4':
+ 					case '5':
+ 					case '6':
+ 					case '7':
+ 					case '8':
+ 					case '9':
+ 						c += 79;
+ 						break;
+ 					default:
+ 						c = tolower(c);
+ 						break;
+ 					}
+ 					copyXPMArea(xpos[c - 97], ypos[c - 97], 5, 5, 6 + dx, 5 + dy);
+ 					dx += 5;
+ 				}
+ 				c = (int) ((float) per[i] * 0.52 + 66.0);
+ 				k = (10 - LENMP) * 5 + 2;
+ 				k = (float) per[i] / 100.0 * k;
+ 				k = LENMP * 5 + k;
+ 				k = k < LENMP * 5 + 1 ? LENMP * 5 + 1 : k;
+ 				c = c > 66 ? c : 66;
+ 				c = c > 117 ? 117 : c;
+ 				if (blink) {
+ 					if ((int) per[i] >= blinkper)
+ 						on[i] = !on[i];
+ 					else
+ 						on[i] = 1;
+ 				}
+ 				else
+ 					on[i] = 1;
+ 
+ 				for (j = LENMP * 5; j < k; j++) {
+ 					if (mode == FIRE && on[i])
+ 						copyXPMArea(66 + (float) (j - LENMP * 5) * 52.0 / (float) ((10 - LENMP) * 5), 29, 1, 5, 6 + j, 5 + dy);
+ 					else if (mode == NORMAL && on[i])
+ 						copyXPMArea(c, 29, 1, 5, 6 + j, 5 + dy);
+ 				}
+ 				dy += 6;
+ 			}
+ 		}
+ 		else {		/*one fs in two lines */
+ 			for (i = 0, dy = 0; i < numberfs; i++) {
 -				for (j = 0, dx = 0; j < 10 && j < strlen(mp[i]); j++) {
++				for (j = 0, dx = 0; j < 10 && (unsigned int)j < strlen(mp[i]); j++) {
+ 					c = (int) mp[i][j + (strlen(mp[i]) > 10 ? strlen(mp[i]) - 10 : 0)];
+ 					switch (c) {
+ 					case '/':
+ 						c = 123;
+ 						break;
+ 					case '_':
+ 						c = 124;
+ 						break;
+ 					case '0':
+ 					case '1':
+ 					case '2':
+ 					case '3':
+ 					case '4':
+ 					case '5':
+ 					case '6':
+ 					case '7':
+ 					case '8':
+ 					case '9':
+ 						c += 79;
+ 						break;
+ 					default:
+ 						c = tolower(c);
+ 						break;
+ 					}
+ 					copyXPMArea(xpos[c - 97], ypos[c - 97], 5, 5, 6 + dx, 5 + dy);
+ 					dx += 5;
+ 				}
+ 				dy += 6;
+ 				c = (int) ((float) per[i] * 0.52 + 66.0);
+ 				k = (float) per[i] / 100.0 * 52;
+ 				k = k < 1 ? 1 : k;
+ 				c = c > 66 ? c : 66;
+ 				c = c > 117 ? 117 : c;
+ 				if (blink) {
+ 					if ((int) per[i] >= blinkper)
+ 						on[i] = !on[i];
+ 					else
+ 						on[i] = 1;
+ 				}
+ 				else
+ 					on[i] = 1;
+ 
+ 				for (j = 0; j < k; j++) {
+ 					if (mode == FIRE && on[i])
+ 						copyXPMArea(66 + (float) (j) * 52.0 / 50.0, 29, 1, 5, 6 + j, 5 + dy);
+ 					else if (mode == NORMAL && on[i])
+ 						copyXPMArea(c, 29, 1, 5, 6 + j, 5 + dy);
+ 				}
+ 				dy += 6;
+ 			}
+ 		}
+ 		if (numberfs < 9) {
 -			for (j = 0, dx = 0, dy = 47; j < 10 && j < strlen(hostname); j++) {
++			for (j = 0, dx = 0, dy = 47; j < 10 && (unsigned int)j < strlen(hostname); j++) {
+ 				c = (int) hostname[j];
+ 				switch (c) {
+ 				case '/':
+ 					c = 123;
+ 					break;
+ 				case '_':
+ 					c = 124;
+ 					break;
+ 				case '-':
+ 					c = 125;
+ 					break;
+ 				case '.':
+ 					c = 126;
+ 					break;
+ 				case '0':
+ 				case '1':
+ 				case '2':
+ 				case '3':
+ 				case '4':
+ 				case '5':
+ 				case '6':
+ 				case '7':
+ 				case '8':
+ 				case '9':
+ 					c += 79;
+ 					break;
+ 				default:
+ 					c = tolower(c);
+ 					break;
+ 				}
+ 				copyXPMArea(xpos[c - 97], ypos[c - 97], 5, 5, 6 + dx, 6 + dy);
+ 				dx += 5;
+ 			}
+ 		}
+ 
+ 		RedrawWindow();
+ 		/* 
+ 		 *  Wait for next update 
+ 		 */
+ 		i = 0;
+ 		while (i < 10) {
+ 			usleep(delay);
+ 			i++;
  		}
-         if (numberfs<9)
-             for (j=0,dx=0,dy=47;j<10 && j<strlen(hostname); j++){
-                 c = (int)hostname[j];
-                 switch(c){
-         	        case '/': 
-             	        c=123;break;
-         	        case '_': 
-             	        c=124;break;
-         	        case '-': 
-             	        c=125;break;
-         	        case '.': 
-             	        c=126;break;
-                     case '0':case '1':case '2':case '3':case '4':
-                     case '5':case '6':case '7':case '8':case '9':
-                 	    c+=79;break;
-         	        default:
-             	        c=tolower(c);break;
-                 }
-                 copyXPMArea(xpos[c-97], ypos[c-97], 5, 5, 6+dx, 6+dy);dx+=5;
- 		    }
-         	
- 	    RedrawWindow();
- 	    /* 
- 	     *  Wait for next update 
- 	     */
- 	    i=0;
- 	    while(i++<10) usleep(delay);
  	}
  }
  
@@@ -338,12 -387,12 +390,12 @@@
  /*
   *   ParseCMDLine()
   */
- void ParseCMDLine(int argc, char *argv[]) 
+ void
+ ParseCMDLine(int argc, char *argv[])
  {
  
--	int c, option_index, arg;
- 	static struct option long_options[] =
- 	{
++	int c, option_index;
+ 	static struct option long_options[] = {
  		{"fire", no_argument, 0, 'f'},
  		{"normal", no_argument, 0, 'n'},
  		{"blink", no_argument, &blink, 1},
@@@ -384,143 -433,159 +436,180 @@@
  }
  
  
- void print_usage()
+ void
+ print_usage()
  {
  
-     printf("\nwmfsm version: %s\n", WMFSM_VERSION);
-     printf("\nusage: wmfsm \n");
-     printf("\t--normal, -n\t\tDraw bars in normal mode.\n");
-     printf("\t--fire, -f\t\t\tDraw bars in fire mode.\n");
-     printf("\t--[no]blink\t\tBlinks if a filesystem is 95 percent full.\n");
-     printf("\t-display <Display>\tUse alternate X display.\n");
-     printf("\t--delay <number>, -d\tUse a delay that is not the default.\n");
-     printf("\t-h\t\t\tDisplay help screen.\n");
+ 	printf("\nwmfsm version: %s\n", WMFSM_VERSION);
+ 	printf("\nusage: wmfsm \n");
+ 	printf("\t--normal, -n\t\tDraw bars in normal mode.\n");
+ 	printf("\t--fire, -f\t\t\tDraw bars in fire mode.\n");
+ 	printf("\t--[no]blink\t\tBlinks if a filesystem is 95 percent full.\n");
+ 	printf("\t-display <Display>\tUse alternate X display.\n");
+ 	printf("\t--delay <number>, -d\tUse a delay that is not the default.\n");
+ 	printf("\t-h\t\t\tDisplay help screen.\n");
  }
  
- void pressEvent(XButtonEvent *xev)
+ void
+ pressEvent(XButtonEvent * xev)
  {
-    ForceUpdate = 1;
-    return;
++	(void)xev;
+ 	ForceUpdate = 1;
+ 	return;
  }
  
- void readFileSystems()
+ void
+ readFileSystems()
  {
- /* Look for the goods between #if defined(__OpenBSD__) -- tschroed */
++	/* Wipe mp[] */
++	int i;
++	for (i = 0; i < 100; i++)
++	    if (mp[i]) {
++		free(mp[i]);
++		mp[i]=0;
++	    }
++
+ 	/* Look for the goods between #if defined(__OpenBSD__) -- tschroed */
  #if defined(__OpenBSD__) || defined(__FreeBSD__)
  #define MAXMOUNT	32
-     struct statfs sfs[MAXMOUNT];
-     int fscount;
-     
- /* OpenBSD has no /etc/mtab, we use getfsstat instead -- tschroed */
-     if((fscount=getfsstat(sfs,sizeof(sfs),0))==-1)
-     {
- 	    perror("getfsstat");
- 	    exit(1);
-     }
-     for(numberfs=0;numberfs<fscount;numberfs++)
- 	/* We won't watch RO mounts. */
- 	if(sfs[numberfs].f_flags & MNT_RDONLY)
- 	    { numberfs--; fscount--; }
- 	else
- 	    mp[numberfs]=strdup(sfs[numberfs].f_mntonname);
+ 	struct statfs sfs[MAXMOUNT];
+ 	int fscount;
+ 
+ 	/* OpenBSD has no /etc/mtab, we use getfsstat instead -- tschroed */
+ 	if ((fscount = getfsstat(sfs, sizeof(sfs), 0)) == -1) {
+ 		perror("getfsstat");
+ 		exit(1);
+ 	}
+ 	for (numberfs = 0; numberfs < fscount; numberfs++)
+ 		/* We won't watch RO mounts. */
+ 		if (sfs[numberfs].f_flags & MNT_RDONLY) {
+ 			numberfs--;
+ 			fscount--;
+ 		}
+ 		else
+ 			mp[numberfs] = strdup(sfs[numberfs].f_mntonname);
  #else /* __OpenBSD__ || __FreeBSD__ */
  
-     FILE    *fp;
-     char    mountPoint[255],dummy[255],fstype[255],options[255];
-     
+ 	FILE *fp;
+ 	char mountPoint[255], dummy[255], fstype[255], options[255];
+ 
  #if defined(SunOS)
-         /* Solaris uses /etc/mnttab */
-     fp=fopen("/etc/mnttab","r");
-     if (!fp){
-         fprintf(stderr,"%s:Can't open /etc/mnttab for reading\n",myName);
-         exit (1);
-     }
+ 	/* Solaris uses /etc/mnttab */
+ 	fp = fopen("/etc/mnttab", "r");
+ 	if (!fp) {
+ 		fprintf(stderr, "%s:Can't open /etc/mnttab for reading\n", myName);
+ 		exit(1);
+ 	}
  #else
-     fp=fopen("/etc/mtab","r");
-     if (!fp){
-         fprintf(stderr,"%s:Can't open /etc/mtab for reading\n",myName);
-         exit (1);
-     }
- #endif    
-     
-     numberfs = 0;
-     while (!feof(fp) && numberfs<100){
+ 	fp = fopen("/etc/mtab", "r");
+ 	if (!fp) {
+ 		fprintf(stderr, "%s:Can't open /etc/mtab for reading\n", myName);
+ 		exit(1);
+ 	}
+ #endif
+ 
+ 	numberfs = 0;
+ 	while (!feof(fp) && numberfs < 100) {
  #if defined(SunOS)
-           /* only five entries per row in /etc/mnttab */
-         fscanf(fp,"%s %s %s %s %s\n",dummy,mountPoint,fstype,options,dummy);
+ 		/* only five entries per row in /etc/mnttab */
+ 		fscanf(fp, "%s %s %s %s %s\n", dummy, mountPoint, fstype, options, dummy);
  #else
-         fscanf(fp,"%s %s %s %s %s %s\n",dummy,mountPoint,fstype,options,dummy,dummy);
- #endif    
-         
-         if (
+ 		fscanf(fp, "%s %s %s %s %s %s\n", dummy, mountPoint, fstype, options, dummy, dummy);
+ #endif
+ 
+ 		if (
  #if defined IRIX64 || defined(SunOS)
-             strcmp(fstype,"hwgfs") && 
-             strcmp(fstype,"autofs") && 
-             strcmp(fstype,"proc") && 
-             strcmp(fstype,"fd") && 
-             !strstr(options,"ignore")
+ 			   strcmp(fstype, "hwgfs") && strcmp(fstype, "autofs") && strcmp(fstype, "proc") && strcmp(fstype, "fd") && !strstr(options, "ignore")
  #elif defined linux
-             strcmp(fstype,"proc") &&
- 	    strcmp(fstype, "shm")
+ 			   strcmp(fstype, "proc") && strcmp(fstype, "shm")
  #else
-             1
- #endif		
-         ){
-             mp[numberfs++]=strdup(mountPoint);
-         }
-     }
+ 			   1
+ #endif
+ 			) {
++			if (mp[numberfs]) free(mp[numberfs]);
+ 			mp[numberfs++] = strdup(mountPoint);
+ 		}
+ 	}
  #endif /* __OpenBSD__ || __FreeBSD__ */
-     excludeFileSystems();
++
++	fclose (fp);
+ 	excludeFileSystems();
  }
- void excludeFileSystems()
+ 
+ void
+ excludeFileSystems()
  {
-     char confFileName[255];
-     char workString[255];
-     int  i,j,exnumberfs=0;
-     int  start = 0, excluded, finalnumberfs=0;
-     char *exmp[100];
-     FILE *confFile;
- 
- 	strncpy ( confFileName , (char *)getenv("HOME"),245 );
- 	strcat ( confFileName , "/.wmfsmrc" );
-     confFile = fopen(confFileName, "r");
-     if (confFile){
-         while (!feof(confFile)){
-             if (!fgets(workString,255,confFile)) break;
-             if (workString[strlen(workString)-1] == '\n')
-                 workString[strlen(workString)-1] = '\0';
-             /* convert all chars readed to lower , for case insensitive strcmp() */
-             /* look for start block token [xxx] */
-             if ( workString[0] == '[' )
-                 /* look for starting license block in .simpackrc */
-                 if ( !strcmp(workString,"[exclude]") )  start = 1;
-                 else                                    start = 0;
-             /* look for feature sring in license block */
-             if ( start && strcmp(workString,"[exclude]") ){
-                 exmp[exnumberfs++]=strdup(workString);
-             }
-         }
-     }else{
-         numberfs=numberfs >9 ? 9 : numberfs;
-         return;
-     }
-     fclose(confFile);
-     /* in exmp are now all filesystems to exclude, now do it */
-     if (!exnumberfs){
-         numberfs=numberfs >9 ? 9 : numberfs;
-         return;
-     }
-     for (i=0;i<numberfs;i++){
-         for (j=0,excluded=0;j<exnumberfs;j++){
-             if (!strcmp(mp[i],exmp[j]))
-                 excluded=1;
-         }
-         if (!excluded)
-             mp[finalnumberfs++]=strdup(mp[i]);
-     }
-     for (j=0;j<exnumberfs;j++)
-         free(exmp[j]);
-     for (j=finalnumberfs;j<numberfs;j++)
-         free(mp[j]);
-     numberfs= finalnumberfs>9 ? 9 : finalnumberfs;
+ 	char confFileName[255];
+ 	char workString[255];
+ 	int i, j, exnumberfs = 0;
 -	int start = 0, excluded, finalnumberfs = 0;
++	int excluded, finalnumberfs = 0;
+ 	char *mount_points[100];
+ 	FILE *confFile;
+ 	int include = -1;
+ 	int included = 0;
+ 
+ 	strncpy(confFileName, (char *) getenv("HOME"), 245);
+ 	strcat(confFileName, "/.wmfsmrc");
+ 	confFile = fopen(confFileName, "r");
+ 	if (confFile) {
+ 		while (!feof(confFile)) {
+ 			if (fgets(workString, 255, confFile)) {
+ 				if(strstr(workString, "\n")){
+ 					/* This is probably dangerous, but easy */
+ 					*(strstr(workString, "\n")) = '\0';
+ 				}
+ 				if (!strcmp(workString, "[include]")) {
+ 					include = 1;
+ 				}
+ 				else if (!strcmp(workString, "[exclude]")) {
+ 					include = 0;
+ 				}
+ 				else {
+ 					mount_points[exnumberfs] = strdup(workString);
+ 					exnumberfs++;
+ 				}
+ 			}
+ 
+ 		}
+ 		if (include < 0) {
+ 			printf("wmfsm: Please specify either to include or exclude filesystems.\n");
+ 			exit(1);
+ 		}
+ 		fclose(confFile);
+ 	}
+ 	else {
+ 		numberfs = numberfs > 9 ? 9 : numberfs;
 -		return;
++		goto CLEANUP;
+ 	}
+ 	if (!exnumberfs) {
+ 		numberfs = numberfs > 9 ? 9 : numberfs;
 -		return;
++		goto CLEANUP;
+ 	}
+ 	excluded = 0;
+ 	for (i = 0; i < numberfs; i++) {
+ 		for (j = 0, excluded = 0; j < exnumberfs; j++) {
+ 			if (!strcmp(mp[i], mount_points[j]) && !include) {
+ 				excluded = 1;
+ 			} else if (!strcmp(mp[i], mount_points[j]) && include) {
+ 				included = 1;
+ 			}
+ 		}
 -		if ((!excluded && !include) || (included && include))
 -			mp[finalnumberfs++] = strdup(mp[i]);
++		if ((!excluded && !include) || (included && include)) {
++			if (finalnumberfs == i) {
++				finalnumberfs++;
++			} else {
++		    if (mp[finalnumberfs]) free(mp[finalnumberfs]);
++		    mp[finalnumberfs++] = strdup(mp[i]);
++		}
++		}
+ 		included = excluded = 0;
+ 	}
++	numberfs = finalnumberfs > 9 ? 9 : finalnumberfs;
++
++CLEANUP:
+ 	for (j = 0; j < exnumberfs; j++)
++	    if (mount_points[j]) {
+ 		free(mount_points[j]);
 -	for (j = finalnumberfs; j < numberfs; j++)
 -		free(mp[j]);
 -	numberfs = finalnumberfs > 9 ? 9 : finalnumberfs;
++		mount_points[j]=0;
++	    }
  }
diff --cc wmfsm/wmfsmrc.sample
index c468f2e,c468f2e..02a98c5
--- a/wmfsm/wmfsmrc.sample
+++ b/wmfsm/wmfsmrc.sample
@@@ -1,4 -1,4 +1,9 @@@
  [exclude]
--/home/cdserver
--/Backup_User
--/Backup_System
++/dev/pts
++/dev/shm
++/sys
++/proc/bus/usb
++/proc/sys/fs/binfmt_misc
++/cdrom
++/var/autofs/net
++/var/autofs/misc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmfsm.git



More information about the Pkg-wmaker-commits mailing list