diff configure @ 149:538048ae2ab8 r20-3b1

Import from CVS: tag r20-3b1
author cvs
date Mon, 13 Aug 2007 09:36:16 +0200
parents 318232e2a3f0
children 59463afc5666
line wrap: on
line diff
--- a/configure	Mon Aug 13 09:35:15 2007 +0200
+++ b/configure	Mon Aug 13 09:36:16 2007 +0200
@@ -1,7 +1,11 @@
-#!/bin/sh
-#### Configuration script for XEmacs.
-#### Copyright (C) 1994 Free Software Foundation, Inc.
+#! /bin/sh
+
+#### Configuration script for XEmacs.  Largely divergent from FSF.
+#### Guess values for system-dependent variables and create Makefiles.
+#### Generated automatically using autoconf version 2.12 
+#### Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #### Copyright (C) 1993-1995 Board of Trustees, University of Illinois.
+#### Copyright (C) 1996, 1997 Sun Microsystems, Inc.
 #### Copyright (C) 1995, 1996 Ben Wing.
 
 ### Don't edit this script!
@@ -9,7 +13,7 @@
 ### from the file `./configure.in'.
 ### To rebuild it, execute the command
 ###	autoconf
-### in the this directory.  You must have autoconf version 1.9 or later.
+### in the this directory.  You must have autoconf version 2.12 or later.
 
 ### This file is part of XEmacs.
 
@@ -28,48 +32,181 @@
 ### Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ### 02111-1307, USA.
 
-### Since XEmacs has configuration requirements that autoconf can't
-### meet, this file is an unholy marriage of custom-baked
-### configuration code and autoconf macros.
-###
-### We use the m4 quoting characters [ ] (as established by the
-### autoconf system) to include large sections of raw sewage - Oops, I
-### mean, shell code - in the final configuration script.
-###
-### Usage: configure config_name
+### For usage, run `./configure --help'
+### For more detailed information on building and installing XEmacs,
+### read the file `INSTALL'.
 ###
 ### If configure succeeds, it leaves its status in config.status.
+### A log of configuration tests can be found in config.log.
 ### If configure fails after disturbing the status quo,
 ### 	config.status is removed.
 
-### Remove any more than one leading "." element from the path name.
-### If we don't remove them, then another "./" will be prepended to
-### the file name each time we use config.status, and the program name
-### will get larger and larger.  This wouldn't be a problem, except
-### that since progname gets recorded in all the Makefiles this script
-### produces, move-if-change thinks they're different when they're
-### not.
-###
-### It would be nice if we could put the ./ in a \( \) group and then
-### apply the * operator to that, so we remove as many leading ./././'s
-### as are present, but some seds (like Ultrix's sed) don't allow you to
-### apply * to a \( \) group.  Bleah.
+ac_help="$ac_help
+  --with-x                use the X Window System"
+
+build=NONE
+cache_file=/dev/null
+exec_prefix=NONE
+host=NONE
+no_create=
+nonopt=NONE
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+target=NONE
+verbose=
+x_includes=NONE
+x_libraries=NONE
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${{exec_prefix}}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
+
+subdirs=
+MFLAGS= MAKEFLAGS=
+ac_max_here_lines=12
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+# File descriptor usage:
+# 0 standard input
+# 1 file creation
+# 2 errors and warnings
+# 3 some systems may open it to /dev/tty
+# 4 used on the Kubota Titan
+# 6 checking for... messages and results
+# 5 compiler messages saved in config.log
+if test "$silent" = yes; then
+  exec 6>/dev/null
+else
+  exec 6>&1
+fi
+exec 5>./config.log
+
+echo "\
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+" 1>&5
+
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell metacharacters.
+ac_configure_args=
+for ac_arg
+do
+  case "$ac_arg" in
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c) ;;
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
+  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+  esac
+done
+
+# NLS nuisances.
+# Only set these to C if already set.  These must not be set unconditionally
+# because not all systems understand e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+# Non-C LC_CTYPE values break the ctype check.
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+
+# 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
+
+# A filename unique to this package, relative to the directory that
+# configure is in, which we can look for to find out if srcdir is correct.
+ac_unique_file=src/lisp.h
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then its parent.
+  ac_prog=$0
+  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
+  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
+  srcdir=$ac_confdir
+  if test ! -r $srcdir/$ac_unique_file; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+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; }
+  else
+    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+  fi
+fi
+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+  if test "x$prefix" != xNONE; then
+    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+  else
+    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  fi
+fi
+for ac_site_file in $CONFIG_SITE; do
+  if test -r "$ac_site_file"; then
+    echo "loading site script $ac_site_file"
+    . "$ac_site_file"
+  fi
+done
+
+
+ac_ext=c
+xe_cppflags='$c_switch_site  $c_switch_machine  $c_switch_system  $c_switch_x_site $X_CFLAGS $CPPFLAGS' # $c_switch_x_machine  $c_switch_x_system'
+xe_ldflags='$ld_switch_site  $ld_switch_machine $ld_switch_system $ld_switch_x_site' # $ld_switch_x_machine $ld_switch_x_system'
+xe_libs='$xe_check_libs $X_PRE_LIBS $libs_x $X_EXTRA_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='${CC-cc} -c '"$CFLAGS $xe_cppflags"' conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest '"$CFLAGS $xe_cppflags $LDFLAGS $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
+cross_compiling=no
+
+if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+  # Stardent Vistra SVR4 grep lacks -e, says ghazi@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
+
+
 progname="`echo $0 | sed 's:^\./\./:\./:'`"
 
-############################################################################
-#									   #
-#                     Establish some default values                        #
-#									   #
-############################################################################
-
-#run_in_place='no'
+
+cache_file=/dev/null
+
+MAKE_SUBDIR="src lib-src"
+
 prefix='/usr/local'
 exec_prefix='${prefix}'
 bindir='${exec_prefix}/bin'
-# FSF 19.29 changes to:
-# datadir='${prefix}/share'
-# sharedstatedir='${prefix}/com'
-# libexecdir='${exec_prefix}/libexec'
 datadir='${prefix}/lib'
 statedir='${prefix}/lib'
 libdir='${exec_prefix}/lib'
@@ -95,55 +232,24 @@
 with_x11=''
 rel_alloc='default'
 use_system_malloc='default'
-internal_makefile_list='Makefile lib-src/Makefile.in src/Makefile.in lwlib/Makefile.in dynodump/Makefile.in'
-energize_version='no'
+energize_version=''
 native_sound_lib=''
-# make normal error-checking be the default in alpha and beta versions, so
-# that bugs get noticed.  Change this for released versions.
 error_check_default='no'
 error_check_extents=$error_check_default
 error_check_typecheck=$error_check_default
 error_check_bufpos=$error_check_default
 error_check_gc=$error_check_default
 error_check_malloc=$error_check_default
-# debug=yes must be set when error checking is present.  This should be
-# fixed up.
 debug=$error_check_default
-quantify='no'
-# use-assertions should be 'yes' by default.  Too many people in this
-# world have core dumps turned off by default or "can't find where the
-# core file went".  At least we should get some useful output ...
 use_assertions='yes'
-# the following is set to yes or no later.
 with_gif=''
-# the following is set to yes or no later.
 with_toolbars=''
-with_tty='yes'
 use_union_type='no'
 with_dnet=''
 
-# # gnu echo silently eats `--help', `--version', `-n', `-e', `-E', `-n'.
-# # other versions of echo eat any strings beginning with `-n'.
-# # when parsing arguments, special case these strings and don't
-# # pass them through echo
-# echo=/bin/echo
-#
-# this approach abandoned in favor of
-#
-#   echo "" ${stuff_to_filter} | sed -e 's:^ ::'
-
-# On Sun systems, people sometimes set up the variable CPP
-# with a value that is a directory, not an executable at all.
-# Detect that case, and ignore that value.
 test -n "$CPP" -a -d "$CPP" && CPP=
 
-############################################################################
-#									   #
-#                             Usage messages                               #
-#									   #
-############################################################################
-
-short_usage="Usage: ${progname} CONFIGURATION [-OPTION[=VALUE] ...]
+usage="Usage: $progname CONFIGURATION [-OPTION[=VALUE] ...]
 
 Set compilation and installation parameters for XEmacs, and report.
 CONFIGURATION specifies the machine and operating system to build for.
@@ -154,27 +260,25 @@
 
 Options marked with a (*) are autodetected.
 
-  
+
 General options:
 
 --help			Issue this usage message.
 --verbose		Display the results of configure tests.
---extra-verbose		Also display the output of any compiler invocation.
-			(Useful when feature tests are coming out wrong.)
-
-
-Compiler options:
-
---compiler=XXXX		Specify compiler.
+--extra-verbose		Display even more information, useful for debugging.
+
+
+Compilation options:
+
+--compiler=XXXX		Specify compiler.  Overrides environment variable CC.
 --with-gcc (*)		Use GCC to compile XEmacs.
---with-lcc		Use Lucid's LCC to compile XEmacs.
 --with-gcc=no		Don't use GCC to compile XEmacs.
 --with-gnu-make		Write the Makefiles to take advantage of
 			special features of GNU Make. (GNU Make
 			works fine on the Makefiles even without this
 			option.  This just allows for simultaneous
 			in-place and --srcdir building.)
---cflags=FLAGS		Override the default values for CFLAGS.
+--cflags=FLAGS		Compiler flags. Overrides environment variable CFLAGS.
 --site-includes=DIR	Other header file directories.  Separate multiple
 			dirs with spaces and use quotes to enclose.
 --site-libraries=DIR	Other library directories.
@@ -189,8 +293,8 @@
 
 
 Installation options:
-  
---prefix=DIR		Install files below DIR.  Defaults to \`${prefix}'.
+
+--prefix=DIR		Install files below DIR.  Defaults to \`$prefix'.
 
 
 Window-system options:
@@ -199,29 +303,49 @@
 --with-x=no		Don't support X.
 --x-includes=DIR 	Search for X header files in DIR.
 --x-libraries=DIR	Search for X libraries in DIR.
+--with-toolbars=no	Don't compile with any toolbar support.
 --with-menubars=TYPE	Use TYPE menubars (lucid, motif, or no).  The Lucid
 			widgets emulate Motif (mostly) but are faster.
 			*WARNING*  The Motif menubar is currently broken.
---with-scrollbars=TYPE	Use TYPE scrollbars (lucid, motif, athena, 
-			athena3d, or no).
+--with-scrollbars=TYPE	Use TYPE scrollbars
+			(lucid, motif, athena, athena3d, or no).
 --with-dialogs=TYPE	Use TYPE dialog boxes (motif, athena, athena3d, or no).
 			(Lucid menubars and scrollbars are the default.
 			 Motif dialog boxes will be used if Motif can be
 			 found.)
 --with-cde (*)		Compile in support for CDE drag and drop.
 --with-offix (*)	Compile in support for OffiX drag and drop.
+--with-xmu=no (*)	For those unfortunates whose vendors don't ship Xmu.
+--external-widget	Compile with external widget support.
+--with-gif		Compile with support for GIF image conversion.
+			This support is built-in and defaults to \`yes'.
 --with-xpm (*)		Compile with support for XPM files.
 			It is highly recommended that you obtain XPM
-			(version 3.4g or better) if you don't already
+			(version 3.4h or better) if you don't already
 			have it.  Get it from the XEmacs FTP site.
---with-xmu=no (*)	For those unfortunates whose vendors don't ship Xmu.
+--with-xface (*)	Compile with support for X-Face mail header
+	  		conversion.  Requires the compface library.
+			Get it from the XEmacs FTP site.
+--with-jpeg (*)		Compile with support for JPEG image conversion.
+			Requires libjpeg from the Independent JPEG Group.
+			Get it from the XEmacs FTP site.
+--with-png (*)		Compile with support for PNG image conversion.
+			Requires libpng.  Get it from the XEmacs FTP site.
+--with-tiff		Compile with support for TIFF image conversion
+			(not yet implemented).
+
+
+TTY options:
+
+--with-ncurses (*)	Use the ncurses library for tty support.
+--with-gpm (*)		Compile in support for General Purpose Mouse.
 
 
 Additional features:
 
---with-toolbars=no	Don't compile with any toolbar support.
---with-tooltalk		Support the ToolTalk IPC protocol.
---with-sparcworks	Support the Sun Sparcworks development environment.
+--with-tooltalk (*)	Support the ToolTalk IPC protocol.
+--with-workshop		Support the Sun WorkShop (formerly Sparcworks)
+			development environment.
 --with-energize		Support the Lucid Energize development environment.
 			This doesn't currently work.
 --with-socks		Compile with support for SOCKS (an Internet proxy).
@@ -231,25 +355,9 @@
 			used on Linux and other systems.  NOTE: We can't
 			guarantee that our TERM support coexists well
 			with standard Internet connections).
---with-xface (*)	Compile with support for X-Face mail header
-	  		conversion.  Requires the compface library.
-			Get it from the XEmacs FTP site.
---with-gif		Compile with support for GIF image conversion.
-			This requires no special support and defaults to
-			\`yes'.
---with-jpeg (*)		Compile with support for JPEG image conversion.
-			Requires libjpeg from the Independent JPEG Group.
-			Get it from the XEmacs FTP site.
---with-png (*)		Compile with support for PNG image conversion.
-			Requires libpng.  Get it from the XEmacs FTP site.
-			Accepted values are \`yes', \`no', and \`gnuz'
-			if you want to use -lgz instead of -lz.
---with-tiff		Compile with support for TIFF image conversion
-			(not yet implemented).
 --with-database=type (*) Compile with database support.  Valid types are
 			\`no' or a comma-separated list of one or more
 			of \`dbm', \`gnudbm', or \`berkdb'.
---external-widget	Compile with external widget support.
 --with-sound=native (*)	Compile with native sound support.
 --with-sound=nas	Compile with network sound support.
 --with-sound=both	Compile with native and network sound support.
@@ -259,12 +367,13 @@
 --with-mocklisp		Compile with Mocklisp support.  Don't do this
 			unless you have a Mocklisp program that you need
 			to run.
---usage-tracking	Enable some Sun-internal code.  If you don't
-			know what this is, you don't want it.
 --with-pop		support POP for mail retrieval
 --with-kerberos		support Kerberos-authenticated POP
 --with-hesiod		support Hesiod to get the POP server host
 --with-dnet (*)		Compile with support for DECnet.
+--mail-locking=TYPE (*)	Specify the locking to be used by movemail to prevent
+			concurrent updates of mail spool files. Valid types
+			are \`lockf', \`flock', and \`lock-file'.
 
 Internationalization options:
 
@@ -278,19 +387,15 @@
 			then the default is --with-xim=motif, else --with-xim=no.
 			NOTE:  On some systems like SunOS4 use of this option
 			will cause XEmacs to crash at startup.
---with-canna		Compile with support for Canna (a Japanese input method
+--with-canna (*)	Compile with support for Canna (a Japanese input method
 			used in conjunction with Mule support).
---with-wnn		Compile with support for WNN (a multi-language input method
+--with-wnn (*)		Compile with support for WNN (a multi-language input method
 			used in conjunction with Mule support).
 			This is beta level code.
---with-wnn6		Compile with support for WNN version 6
+--with-wnn6 (*)		Compile with support for WNN version 6
 			This is alpha level code.
---wnn-includes=DIR 	Search for WNN header files in DIR.
---wnn-libraries=DIR	Search for WNN libraries in DIR.
 --with-i18n3		Compile with I18N level 3 (support for message
 			translation).  This doesn't currently work.
---canna-includes=DIR 	Search for Canna header files in DIR.
---canna-libraries=DIR	Search for Canna libraries in DIR.
 
 
 Debugging options:
@@ -314,7 +419,7 @@
 			int, for the fundamental Lisp_Object type; this
 			provides stricter type-checking.  Only works with
 			some systems and compilers.
-			
+
 
 Other options:
 
@@ -330,24 +435,23 @@
 variables.  See the INSTALL file for a complete list plus the reasons
 we advise not changing them.
 
-If successful, ${progname} leaves its status in config.status.  If
-unsuccessful after disturbing the status quo, it removes config.status."
-
-############################################################################
-#									   #
-#                           Options processing                             #
-#									   #
-############################################################################
-
-
-
-### Record all the arguments, so we can save them in config.status.
+If successful, $progname leaves its status in config.status.  If
+unsuccessful after disturbing the status quo, it removes config.status.
+
+The configure build process also used the following environment variables:
+CC        C compiler to use (but configure flags take precedence)
+CFLAGS    C compiler compilation flags (such as -O)
+CPPFLAGS  Additional compilation flags (sucha s -I) used only by the preprocessor
+LDFLAGS   Additional linker flags
+
+For more details on the install process, consult the INSTALL file.
+"
+
+
+
+
 arguments="$@"
 
-### Shell Magic: Quote the quoted arguments in ARGUMENTS.  At a later date,
-### in order to get the arguments back in $@, we have to do an
-###  `eval set x "$quoted_arguments"; shift'.
-### We use sed to turn embedded ' into '"'"'.  I truly hate sh's quoting.
 quoted_sed_magic=s/"'"/"'"'"'"'"'"'"'"/g
 quoted_arguments=
 for i in "$@"; do
@@ -362,68 +466,50 @@
    esac
 done
 
-### Don't use shift -- that destroys the argument list, which autoconf needs
-### to produce config.status.  It turns out that "set - ${arguments}" doesn't
-### work portably.
-### However, it also turns out that many shells cannot expand ${10} at all.
-### So using an index variable doesn't work either.  It is possible to use
-### some shell magic to make 'set x "$arguments"; shift' work portably.
 while test $# != 0; do
   arg="$1"; shift
-  case "${arg}" in
-
-    ## Anything starting with a hyphen we assume is an option.
-    -* )
-      ## Separate the switch name from the value it's being given.
-      case "${arg}" in
+  case "$arg" in
+
+        -* )
+            case "$arg" in
         -*=*)
-	  opt=`echo '' ${arg} | sed -e 's:^ ::' -e 's:^-*\([^=]*\)=.*$:\1:'`
-	  val=`echo '' ${arg} | sed -e 's:^ ::' -e 's:^-*[^=]*=\(.*\)$:\1:'`
+	  opt=`echo '' $arg | sed -e 's:^ ::' -e 's:^-*\([^=]*\)=.*$:\1:'`
+	  val=`echo '' $arg | sed -e 's:^ ::' -e 's:^-*[^=]*=\(.*\)$:\1:'`
 	  valomitted=no
 	;;
-#         ## special case these strings since echo may
-#         ## silently eat them.
-#         --help ) opt=help val=yes valomitted=yes ;;
-#         --version ) opt=version val=yes valomitted=yes ;;
-#         -e ) opt=e val=yes valomitted=yes ;;
-#         -E ) opt=E val=yes valomitted=yes ;;
-#         -n ) opt=n val=yes valomitted=yes ;;
-        -*)
-          ## If FOO is a boolean argument, --FOO is equivalent to
-          ## --FOO=yes.  Otherwise, the value comes from the next
-          ## argument - see below.
-	  opt=`echo '' ${arg} | sed -e 's:^ ::' -e 's:^-*\(.*\)$:\1:'`
+                                                                          -*)
+                                 	  opt=`echo '' $arg | sed -e 's:^ ::' -e 's:^-*\(.*\)$:\1:'`
           val="yes"
           valomitted=yes
         ;;
       esac
 
-      ## Change `-' in the option name to `_'.
-      optname="${opt}"
-      opt="`echo '' ${opt} | sed -e 's:^ ::' | tr - _`"
-
-      ## Process the option.
-      case "${opt}" in
-
-      ## Process (many) boolean options
-	run_in_place	| \
+            optname="$opt"
+      opt="`echo '' $opt | sed -e 's:^ ::' | tr - _`"
+
+            case "$opt" in
+
+      	run_in_place	| \
 	with_x		| \
 	with_x11	| \
 	with_gcc	| \
-	with_lcc	| \
 	with_gnu_make	| \
 	dynamic		| \
+	with_ncurses	| \
+	with_dnet	| \
 	with_term	| \
+	with_socks	| \
 	with_cde	| \
 	with_offix	| \
-	with_xpm	| \
+	with_gpm	| \
 	with_gif	| \
+	with_xpm	| \
+	with_xface	| \
 	with_jpeg	| \
+	with_png	| \
 	with_tiff	| \
-	with_socks	| \
-	with_xface	| \
 	with_xmu	| \
-	quantify	| \
+	with_quantify	| \
 	with_toolbars	| \
 	with_tty	| \
 	with_i18n3	| \
@@ -433,6 +519,7 @@
 	with_wnn6	| \
 	with_mocklisp	| \
 	with_energize	| \
+	with_workshop	| \
 	with_sparcworks | \
 	with_tooltalk   | \
 	with_pop	| \
@@ -448,148 +535,125 @@
 	debug		| \
 	use_assertions	| \
 	memory_usage_stats | \
-	no_doc_file )	
-	  ## Make sure the value given was either "yes" or "no".
-	  case "${val}" in
+	no_doc_file )
+	  	  case "$val" in
 	    y | ye | yes )	val=yes ;;
 	    n | no )		val=no  ;;
-	    * ) (echo "${progname}: Usage error:"
-echo " " "The \`--${optname}' option requires a boolean value: \`yes' or \`no'."
-echo "  Use \`${progname} --help' for more details.") >&2 && exit 1 ;;
+	    * ) (echo "$progname: Usage error:"
+echo " " "The \`--$optname' option requires a boolean value: \`yes' or \`no'."
+echo "  Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
 	  esac
-          eval "${opt}=\"${val}\"" ;;
-
-    
-	## Options that take a user-supplied value, as in --puresize=8000000
-	srcdir		| \
+          eval "$opt=\"$val\"" ;;
+
+
+		srcdir		| \
 	compiler	| \
 	puresize	| \
 	native_sound_lib | \
 	x_includes	| \
 	x_libraries	| \
-        wnn_includes    | \
-        wnn_libraries   | \
-        canna_includes  | \
-        canna_libraries | \
 	site_includes	| \
 	site_libraries	| \
-	site_runtime_libraries  )
-	  ## If the value was omitted, get it from the next argument.
-	  if test "${valomitted}" = "yes" ; then
-	    ## Get the next argument from the argument list, if there is one.
-            if test "$#" = 0 ; then
-	      (echo "${progname}: Usage error:"
-echo " " "The \`--${optname}' option requires a value."
-echo "  Use \`${progname} --help' for more details.") >&2 && exit 1;
+	site_runtime_libraries )
+	  	  if test "$valomitted" = "yes" ; then
+	    	    if test "$#" = 0 ; then
+	      (echo "$progname: Usage error:"
+echo " " "The \`--$optname' option requires a value."
+echo "  Use \`$progname --help' to show usage.") >&2 && exit 1;
 	    fi
 	    val="$1"; shift
 	  fi
-          eval "${opt}=\"${val}\""
+          eval "$opt=\"$val\""
 	;;
 
-	### Options that take "yes", "no", or "default" values
-	rel_alloc | \
+		rel_alloc | \
 	use_system_malloc )
-	  case "${val}" in
+	  case "$val" in
 	    y | ye | yes )	val=yes ;;
 	    n | no )		val=no  ;;
 	    d | de | def | defa | defau | defaul | default )
 				val=default ;;
-	    * ) (echo "${progname}: Usage error:"
-echo " " "The \`--${optname}' option requires one of these values:
+	    * ) (echo "$progname: Usage error:"
+echo " " "The \`--$optname' option requires one of these values:
   \`yes', \`no', or \`default'."
-echo "  Use \`${progname} --help' for more details.") >&2 && exit 1 ;;
+echo "  Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
 	  esac
-          eval "${opt}=\"${val}\""
+          eval "$opt=\"$val\""
         ;;
 
-        ## Has the user requested database support?
-        "with_database" )
+                "with_database" )
 	  with_database_berkdb=no
 	  with_database_dbm=no
 	  with_database_gnudbm=no
-          ## Make sure the value given was `no' or a list of berkdb, dbm, gnudbm
-	  for x in `echo "${val}" | sed 's/,/ /'` ; do
-	    case "${x}" in
+	  for x in `echo "$val" | sed 's/,/ /'` ; do
+	    case "$x" in
 		no ) : ;;
 		b | be | ber | berk | berkd | berkdb )  with_database_berkdb=yes ;;
 		d | db | dbm )				with_database_dbm=yes    ;;
 		g | gn | gnu | gnud | gnudb | gnudbm )  with_database_gnudbm=yes ;;
-		* ) (echo "${progname}: Usage error:"
-echo " " "The \`--${optname}' option value
+		* ) (echo "$progname: Usage error:"
+echo " " "The \`--$optname' option value
   must be either \`no' or a comma-separated list
   of one or more of \`berkdb', \`dbm', or \`gnudbm'."
-echo "  Use \`${progname} --help' for more details.") >&2 && exit 1 ;;
+echo "  Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
             esac
 	  done
-	  if test "${with_database_dbm}"    = "yes" -a \
-	          "${with_database_gnudbm}" = "yes" ; then
-	  (echo "${progname}: Usage error:"
+	  if test "$with_database_dbm"    = "yes" -a \
+	          "$with_database_gnudbm" = "yes" ; then
+	  (echo "$progname: Usage error:"
 echo " " "Only one of \`dbm' and \`gnudbm' may be specified
-  with the \`--${optname}' option."
-echo "  Use \`${progname} --help' for more details.") >&2 && exit 1
+  with the \`--$optname' option."
+echo "  Use \`$progname --help' to show usage.") >&2 && exit 1
 	  fi
         ;;
 
-        ## Has the user requested sound support?
-	"with_sound" )
-	  ## value can be native, nas or both. yes is allowed 
-	  ## as a backwards compatible synonym for native
-	  case "${val}" in
+        	"with_sound" )
+	  	  	  case "$val" in
 	    y | ye | yes )			val=native ;;
 	    n | no | non | none )		val=no;;
 	    na | nat | nati | nativ | native )	val=native  ;;
-	    ne | net | neta | netau | netaud | netaudi | netaudio | nas )	val=nas  ;;
+	    ne | net | neta | netau | netaud | netaudi | netaudio | nas ) val=nas  ;;
 	    b | bo | bot | both )		val=both;;
-	    * ) (echo "${progname}: Usage error:"
-echo " " "The \`--${optname}' option must have one of these values:
+	    * ) (echo "$progname: Usage error:"
+echo " " "The \`--$optname' option must have one of these values:
   \`native', \`nas', \`both', or \`none'."
-echo "  Use \`${progname} --help' for more details.") >&2 && exit 1 ;;
+echo "  Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
 	  esac
-          eval "${opt}=\"${val}\""
-        ;;
-
-        ## Has the user requested XIM support?
-	"with_xim" )
-	  ## value can be xlib or motif
-	  case "${val}" in
-	    y | ye | yes )			val=yes   ;;
-	    n | no | non | none )		val=no    ;;
-	    x | xl | xli | xlib )		val=xlib  ;;
-	    m | mo | mot | moti | motif )	val=motif ;;
-	    * ) (echo "${progname}: Usage error:"
-echo " " "The \`--${optname}' option must have one of these values:
-  \`motif', \`xlib', \`yes', or \`no'."
-echo "  Use \`${progname} --help' for more details.") >&2 && exit 1 ;;
-	  esac
-          eval "${opt}=\"${val}\""
+          eval "$opt=\"$val\""
         ;;
 
-        ## Has the user requested PNG support?
-	"with_png" )
-	  ## Make sure the value given was either "yes", "no", or "gnuz".
-	  case "${val}" in
-	    y | ye | yes )	  val=yes  ;;
-	    n | no )		  val=no   ;;
-	    g | gn | gnu | gnuz ) val=gnuz ;;
-	    * ) (echo "${progname}: Usage error:"
-echo " " "The \`--${optname}' option must have one of these values:
-  \`yes', \`no', or \`gnuz'."
-echo "  Use \`${progname} --help' for more details.") >&2 && exit 1 ;;
+        	"with_xim" )
+	  case "$val" in
+	    y | ye | yes )		  val=yes   ;;
+	    n | no | non | none )	  val=no    ;;
+	    x | xl | xli | xlib )	  val=xlib  ;;
+	    m | mo | mot | moti | motif ) val=motif ;;
+	    * ) (echo "$progname: Usage error:"
+echo " " "The \`--$optname' option must have one of these values:
+  \`motif', \`xlib', \`yes', or \`no'."
+echo "  Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
 	  esac
-          eval "${opt}=\"${val}\""
+          eval "$opt=\"$val\""
         ;;
 
-        ## Has the user requested error-checking?
-	"error_checking" )
-	  ## value can be all, none, and/or a list of categories to check.
-	  ## Example: --error-checking=all,noextents,nobufpos
-	  ## Example: --error-checking=none,malloc,gc
-	  
-	  for x in `echo "${val}" | sed 's/,/ /'` ; do
-	    case "${x}" in
-	      # all and none are only permitted as the first in the list.
-	      n | no | non | none ) new_default=no ;;
+        	"mail_locking" )
+	  case "$val" in
+	    lockf )	val=lockf ;;
+	    flock )	val=flock ;;
+	    file  )	val=file  ;;
+	    * ) (echo "$progname: Usage error:"
+echo " " "The \`--$optname' option must have one of these values:
+  \`lockf', \`flock', or \`file'."
+echo "  Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
+	  esac
+          eval "$opt=\"$val\""
+        ;;
+
+        	"error_checking" )
+	  	  	  
+	  for x in `echo "$val" | sed 's/,/ /'` ; do
+	    case "$x" in
+	      	      n | no | non | none ) new_default=no ;;
 	      a | al | all )	    new_default=yes ;;
 
 	      extents )       error_check_extents=yes ;;
@@ -606,7 +670,7 @@
 
 	      malloc )	      error_check_malloc=yes ;;
 	      nomalloc )      error_check_malloc=no ;;
-	      
+
 	      * ) bogus_error_check=yes ;;
 	    esac
 	    if test "$bogus_error_check" -o \
@@ -616,10 +680,10 @@
 		else
 		  types="\`all', \`none' (default), \`extents', \`typecheck', \`bufpos', \`gc', and \`malloc'."
 		fi
-		(echo "${progname}: Usage error:"
-echo " " "Valid types for the \`--${optname}' option are:
+		(echo "$progname: Usage error:"
+echo " " "Valid types for the \`--$optname' option are:
   $types."
-echo "  Use \`${progname} --help' for more details.") >&2 && exit 1
+echo "  Use \`$progname --help' to show usage.") >&2 && exit 1
 	    elif test "$new_default" ; then
 		error_check_extents=$new_default
 		error_check_typecheck=$new_default
@@ -632,253 +696,209 @@
 	  done
 	;;
 
-	## Has the user tried to tell us where the X files are?
-	## I think these are dopey, but no less than three alpha
-	## testers, at large sites, have said they have their X files
-	## installed in odd places.
-
-	## Has the user specified one of the path options?
-	prefix | exec_prefix | bindir | datadir | statedir | libdir | \
+				
+		prefix | exec_prefix | bindir | datadir | statedir | libdir | \
 	mandir | infodir | lispdir | etcdir | lockdir | archlibdir | \
 	sitelispdir | docdir )
-	   ## If the value was omitted, get it from the next argument.
-	   if test "${valomitted}" = "yes" ; then
+	   	   if test "$valomitted" = "yes" ; then
 	     if test "$#" = 0 ; then
-		 (echo "${progname}: Usage error:"
-echo " " "The \`--${optname}' option requires a value."
-echo "  Use \`${progname} --help' for more details.") >&2 && exit 1;
+		 (echo "$progname: Usage error:"
+echo " " "The \`--$optname' option requires a value."
+echo "  Use \`$progname --help' to show usage.") >&2 && exit 1;
 	     fi
 	     val="$1"; shift
 	   fi
-	   eval "${opt}=\"${val}\""
-
-           ## Changing exec_prefix or libdir will change the default value
-           ## of archlibdir.  Changing datadir will change the default value
-           ## of etcdir and lispdir.  Changing statedir will change the
-           ## default value of lockdir.
-           if   test "${opt}" = exec_prefix; then archlibdir_user_defined=yes
-           elif test "${opt}" = libdir     ; then archlibdir_user_defined=yes
-           elif test "${opt}" = archlibdir ; then archlibdir_user_defined=yes
-           elif test "${opt}" = lispdir    ; then lispdir_user_defined=yes
-           elif test "${opt}" = etcdir     ; then etcdir_user_defined=yes
-           elif test "${opt}" = datadir    ; then
-              lispdir_user_defined=yes
-              etcdir_user_defined=yes
-           elif test "${opt}" = statedir   ; then lockdir_user_defined=yes
-           elif test "${opt}" = lockdir    ; then lockdir_user_defined=yes
-           elif test "${opt}" = infodir    ; then infodir_user_defined=yes
-           fi
+	   eval "$opt=\"$val\""
+
+                                                       case "$opt" in
+             lispdir ) lispdir_user_defined=yes ;;
+             etcdir  )  etcdir_user_defined=yes ;;
+             infodir ) infodir_user_defined=yes ;;
+             datadir ) lispdir_user_defined=yes etcdir_user_defined=yes ;;
+             statedir | lockdir ) lockdir_user_defined=yes ;;
+             exec_prefix | libdir | archlibdir ) archlibdir_user_defined=yes ;;
+           esac
 	;;
 
-	## Has the user specified values to override CFLAGS?
-	cflags )
-	   ## If the value was omitted, get it from the next argument.
-	   if test "${valomitted}" = "yes" ; then
-	      if test "$#" = 0 ; then
-	        (echo "${progname}: Usage error:"
-echo " " "The \`--${optname}' option requires a value."
-echo "  Use \`${progname} --help' for more details.") >&2 && exit 1;
+		cflags )
+	   	   if test "$valomitted" = "yes" ; then
+	      if test "$#" = 0; then
+                (echo "$progname: Usage error:"
+echo " " "The \`--$optname' option requires a value."
+echo "  Use \`$progname --help' to show usage.") >&2 && exit 1;
 	      fi
 	      val="$1"; shift
 	   fi
-	   eval "${opt}=\"${val}\""
+	   eval "$opt=\"$val\""
 	   eval "${opt}_specified=1"
 	;;
 
-	## --no-create added by autoconf for use by config.status
-	"no_create" )
-	;;
-
-	## Has the user asked for some help?
-	"usage" | "help" )
-	  echo "${short_usage}" | ${PAGER:-more}
-	  exit 0
-	;;
-
-	## Has the user specified what toolkit to use for the menubars,
-	## scrollbar or dialogs?
-	"with_menubars" | "with_scrollbars" | "with_dialogs" )
-	  ## value can be lucid, motif, or athena.
-	  case "${val}" in
+		"no_create" ) ;;
+
+		"usage" | "help" ) echo "$usage" | ${PAGER-more}; exit 0 ;;
+
+			"with_menubars" | "with_scrollbars" | "with_dialogs" )
+	  case "$val" in
 	    l | lu | luc | luci | lucid )		val=lucid  ;;
 	    m | mo | mot | moti | motif )		val=motif  ;;
 	    athena3d | athena-3d )			val=athena3d ;;
 	    a | at | ath | athe | athen | athena )	val=athena ;;
 	    n | no | non | none )			val=no ;;
-	    * ) (echo "${progname}: Usage error:"
-echo " " "The \`--${optname}' option must have one of these values:
-  \`lucid', \`motif', \`athena', or \`no'."
-echo "  Use \`${progname} --help' for more details.") >&2 && exit 1 ;;
+	    * ) (echo "$progname: Usage error:"
+echo " " "The \`--$optname' option must have one of these values:
+  \`lucid', \`motif', \`athena', \`athena3d', or \`no'."
+echo "  Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
 	  esac
-	  eval "${opt}=\"${val}\""
+	  eval "$opt=\"$val\""
 	;;
 
-        ## Fail on unrecognized arguments.
-	* ) (echo "${progname}: Usage error:"
-echo " " "Unrecognized option: ${arg}"
-echo "  Use \`${progname} --help' for more details.") >&2 && exit 1 ;;
+        	* ) (echo "$progname: Usage error:"
+echo " " "Unrecognized option: $arg"
+echo "  Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
 
       esac
     ;;
 
-    ## Anything not starting with a hyphen we assume is a
-    ## configuration name.
-    *)
-      configuration=${arg}
-    ;;
+            *) configuration="$arg" ;;
 
   esac
 done
 
-############################################################################
-#									   #
-#                          Finish options processing                       #
-#									   #
-############################################################################
-
-### Get the arguments back.  See the diatribe on Shell Magic above.
+
 eval set x "$quoted_arguments"; shift
 
-### Argument interdependencies
-if test "${with_energize}" = "yes" ; then
-  with_menubars="lucid"
-  with_scrollbars="motif"
-  with_dialogs="motif"
-  with_tooltalk="yes"
-  internal_makefile_list="$internal_makefile_list lwlib/energize/Makefile.in"
-fi
-
-### --extra-verbose implies --verbose
-test "${extra_verbose}" = yes && verbose=yes
-
-### Sparcworks requires tooltalk
-test "${with_sparcworks}" = yes && with_tooltalk=yes
-
-### debug implies other options
-test "${debug}" = "yes" && use_assertions=yes memory_usage_stats=yes
-
-### with_x is a synonym for with_x11
-test -n "${with_x}" && with_x11="${with_x}"
-
-### Can't specify 2 compilers
-if test "${with_gcc}" = "yes" -a "${with_lcc}" = "yes"; then
-  (echo "${progname}: Usage error:"
-echo " " "Only one of --with-gcc and --with-lcc may be specified."
-echo "  Use \`${progname} --help' for more details.") >&2 && exit 1
-fi
-
-### Ignore useless run-in-place flag
-if test "${run_in_place}" = "yes"; then
-  echo "configure: warning: The --run-in-place option is ignored because it is unnecessary." >&2
-fi
-
-###########################################################################
-if test "${configuration}" = "" ; then
+if test "$with_energize" = "yes" ; then
+  with_menubars=lucid with_scrollbars=motif with_dialogs=motif with_tooltalk=yes
+  MAKE_SUBDIR="$MAKE_SUBDIR lwlib/energize"
+fi
+
+test "$extra_verbose" = "yes" && verbose=yes
+
+test "$with_sparcworks" = "yes" && with_workshop=yes # compatibility alias
+if test "$with_workshop" = "yes"; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining SUNPRO
+EOF
+cat >> confdefs.h <<\EOF
+#define SUNPRO 1
+EOF
+}
+
+  extra_objs="$extra_objs sunpro.o"
+  with_tooltalk=yes
+fi
+
+case "site_includes" in *:* ) site_includes="`echo $site_includes | sed 's/:/ /g'`";; esac
+case "site_libraries" in *:* ) site_libraries="`echo $site_libraries | sed 's/:/ /g'`";; esac
+case "site_runtime_libraries" in *:* ) site_runtime_libraries="`echo $site_runtime_libraries | sed 's/:/ /g'`";; esac
+
+if test "$debug" = "yes"; then
+  use_assertions=yes memory_usage_stats=yes
+  extra_objs="$extra_objs debug.o"
+fi
+
+test -n "$with_x" && with_x11="$with_x"
+
+if test "$run_in_place" = "yes"; then
+  echo "configure: warning: "The --run-in-place option is ignored because it is unnecessary."" 1>&2
+fi
+
+if test "$configuration" = "" ; then
   echo '- You did not tell me what kind of host system you want to configure.
 - I will attempt to guess the kind of system this is.' 1>&2
-  guesssys=`echo ${progname} | sed 's/configure$/config.guess/'`
-  if configuration=`${CONFIG_SHELL-/bin/sh} ${guesssys}` ; then
-    echo "- Looks like this is a ${configuration}" 1>&2
+  guesssys=`echo $progname | sed 's/configure$/config.guess/'`
+    if configuration=`${CONFIG_SHELL-/bin/sh} $guesssys | \
+      sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'` ; then
+    echo "- Looks like this is a $configuration" 1>&2
   else
-    (echo "${progname}: Usage error:"
+    (echo "$progname: Usage error:"
 echo " " "Failed to guess the system type.  You need to tell me."
-echo "  Use \`${progname} --help' for more details.") >&2 && exit 1
+echo "  Use \`$progname --help' to show usage.") >&2 && exit 1
   fi
 fi
 
-### Find the source directory.
-case "${srcdir}" in
-
-  ## If it's not specified, see if  `.' or `..' might work.
-  "" )
+case "$srcdir" in
+
+    "" )
     for dir in "`echo $0 | sed 's|//|/|' | sed 's|/[^/]*$||'`" "." ".." ; do
       if test -f "$dir/src/lisp.h" -a \
 	      -f "$dir/lisp/version.el" ; then
-        srcdir="${dir}"
+        srcdir="$dir"
         break
       fi
     done
-    if test -z "${srcdir}" ; then
-      (echo "${progname}: Usage error:"
+    if test -z "$srcdir" ; then
+      (echo "$progname: Usage error:"
 echo " " "Neither the current directory nor its parent seem to
   contain the XEmacs sources.  If you do not want to build XEmacs in its
-  source tree, you should run \`${progname}' in the directory in which
+  source tree, you should run \`$progname' in the directory in which
   you wish to build XEmacs, using the \`--srcdir' option to say where the
   sources may be found."
-echo "  Use \`${progname} --help' for more details.") >&2 && exit 1
+echo "  Use \`$progname --help' to show usage.") >&2 && exit 1
     fi
   ;;
 
-  ## Otherwise, check if the directory they specified is okay.
-  * )
-    if test ! -d "${srcdir}" -o \
-	    ! -f "${srcdir}/src/lisp.h" -o \
-	    ! -f "${srcdir}/lisp/version.el" ; then
-      (echo "${progname}: Usage error:"
+    * )
+    if test ! -d "$srcdir" -o \
+	    ! -f "$srcdir/src/lisp.h" -o \
+	    ! -f "$srcdir/lisp/version.el" ; then
+      (echo "$progname: Usage error:"
 echo " " "The directory specified with the \`--srcdir' option,
-  \`${srcdir}', doesn't seem to contain the XEmacs sources.  You should
-  either run the \`${progname}' script at the top of the XEmacs source
+  \`$srcdir', doesn't seem to contain the XEmacs sources.  You should
+  either run the \`$progname' script at the top of the XEmacs source
   tree, or use the \`--srcdir' option to specify the XEmacs source directory."
-echo "  Use \`${progname} --help' for more details.") >&2 && exit 1
+echo "  Use \`$progname --help' to show usage.") >&2 && exit 1
     fi
   ;;
 esac
 
-## We check for this now instead of later when we check for other
-## programs because we need to use its return value now.
-test -n "$silent" || echo "checking for ln -s"
+echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+echo "configure:857: checking whether ln -s works" >&5
+
 rm -f conftestdata
 if ln -s X conftestdata 2>/dev/null
 then
   rm -f conftestdata
-  LN_S="ln -s"
-else
-  LN_S=ln
-fi
-
-
-
-test -n "$verbose" && echo "	"setting LN_S to ${LN_S}""
-
-#### Make symlinks for etc, lisp, and info directories while the path
-#### is still relative.  We don't symlink lock because someone may
-#### have stuck the source on a read-only partition.  Instead we'll
-#### create it as an actual directory later on if it doesn't already
-#### exist.
+  ac_cv_prog_LN_S="ln -s"
+else
+  ac_cv_prog_LN_S=ln
+fi
+LN_S="$ac_cv_prog_LN_S"
+if test "$ac_cv_prog_LN_S" = "ln -s"; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
 for dir in lisp etc man info site-lisp
 do
-  if test ! -d $dir ; then
-    echo Making symbolic link to ${srcdir}/$dir
-    ${LN_S} ${srcdir}/$dir .
+  if test ! -d "$dir" ; then
+    echo Making symbolic link to "$srcdir/$dir"
+    ${LN_S} "$srcdir/$dir" .
   fi
 done
 
-#### Make srcdir absolute, if it isn't already.  It's important to
-#### avoid running the path through pwd unnecessary, since pwd can
-#### give you automounter prefixes, which can go away.
-case "${srcdir}" in
+case "$srcdir" in
   /* ) ;;
   . )
-    ## We may be able to use the $PWD environment variable to make this
-    ## absolute.  But sometimes PWD is inaccurate.
-    if test "${PWD}" != "" -a "`(cd ${PWD} ; sh -c pwd)`" = "`pwd`"; then
+            if test "$PWD" != "" -a "`(cd $PWD ; sh -c pwd)`" = "`pwd`"; then
       srcdir="$PWD"
     else
-      srcdir="`(cd ${srcdir}; pwd)`"
+      srcdir="`(cd $srcdir && pwd)`"
     fi
   ;;
-  *  ) srcdir="`(cd ${srcdir}; pwd)`" ;;
+  *  ) srcdir="`(cd $srcdir && pwd)`" ;;
 esac
 
-#### Check if the source directory already has a configured system in it.
-if test `pwd` != `sh -c cd ${srcdir} && pwd`  \
-   && test -f "${srcdir}/src/config.h"; then
-  (echo "${progname}: WARNING: The directory tree \`${srcdir}' is being used"
+if test `pwd` != `sh -c cd $srcdir && pwd`  \
+   && test -f "$srcdir/src/config.h"; then
+  (echo "$progname: WARNING: The directory tree \`$srcdir' is being used"
    echo "   as a build directory right now; it has been configured in its own"
    echo "   right.  To configure in another directory as well, you MUST"
    echo "   use GNU make.  If you do not have GNU make, then you must"
-   echo "   now do \`make distclean' in ${srcdir},"
-   echo "   and then run ${progname} again.") >&2
+   echo "   now do \`make distclean' in $srcdir,"
+   echo "   and then run $progname again.") >&2
   extrasub='/^VPATH[	 ]*=/c\
 vpath %.c $(srcdir)\
 vpath %.h $(srcdir)\
@@ -888,256 +908,183 @@
 vpath %.in $(srcdir)'
 fi
 
-### Make the necessary directories, if they don't exist.
 for dir in ./src ./lib-src ./dynodump ./lwlib ./lock ; do
-  if test ! -d ${dir} ; then
-    mkdir ${dir}
-  fi
+  test ! -d "$dir" && mkdir "$dir"
 done
-if test "${with_energize}" = "yes" -a ! -d ./lwlib/energize; then
+if test "$with_energize" = "yes" -a ! -d ./lwlib/energize; then
   mkdir ./lwlib/energize
 fi
 
-############################################################################
-#									   #
-#                       Determine the s&m files to use                     #
-#									   #
-############################################################################
-
-#### Given the configuration name, set machfile and opsysfile to the
-#### names of the m/*.h and s/*.h files we should use.
-
-### Canonicalize the configuration name.
-echo "checking the configuration name"
-# allow -energize prefix on configuration name
-internal_configuration=`echo ${configuration} | sed 's/-energize//'`
-# allow --sparcworks prefix on configuration name
-internal_configuration=`echo ${configuration} | sed 's/-sparcworks//'`
-if canonical=`${srcdir}/config.sub "${internal_configuration}"` ; then : ; else
+
+echo "checking "the configuration name"" 1>&6
+echo "configure:921: checking "the configuration name"" >&5
+internal_configuration=`echo $configuration | sed 's/-\(energize\|workshop\)//'`
+if canonical=`$srcdir/config.sub "$internal_configuration"` ; then : ; else
   exit $?
 fi
 
-### If you add support for a new configuration, add code to this
-### switch statement to recognize your configuration name and select
-### the appropriate operating system and machine description files.
-
-### You would hope that you could choose an m/*.h file pretty much
-### based on the machine portion of the configuration name, and an s-
-### file based on the operating system portion.  However, it turns out
-### that each m/*.h file is pretty manufacturer-specific - for
-### example, apollo.h, hp9000s300.h, mega68k, news.h, and tad68k are
-### all 68000 machines; mips.h, pmax.h, and news-risc are all MIPS
-### machines.  So we basically have to have a special case for each
-### configuration name.
-###
-### As far as handling version numbers on operating systems is
-### concerned, make sure things will fail in a fixable way.  If
-### /etc/MACHINES doesn't say anything about version numbers, be
-### prepared to handle anything reasonably.  If version numbers
-### matter, be sure /etc/MACHINES says something about it.
-###
-### Eric Raymond says we should accept strings like "sysvr4" to mean
-### "System V Release 4"; he writes, "The old convention encouraged
-### confusion between `system' and `release' levels'."
-
-machine='' opsys='' unported=no need_dynodump=no
-case "${canonical}" in
-
-  ## NetBSD ports
-  *-*-netbsd* )
-    opsys=netbsd
-    case "${canonical}" in
-      sparc-*-netbsd*)    machine=sparc ;;
+
+
+
+
+machine='' opsys='' need_dynodump=no
+
+case "$canonical" in
+  sparc-*-*        ) machine=sparc ;;
+  alpha-*-*        ) machine=alpha ;;
+  vax-*-*          ) machine=vax ;;
+  mips-dec-*       ) machine=pmax ;;
+  mips-sgi-*       ) machine=iris4d ;;
+  romp-ibm-*       ) machine=ibmrt ;;
+  rs6000-ibm-aix*  ) machine=ibmrs6000 ;;
+  powerpc-ibm-aix* ) machine=ibmrs6000 ;;
+  powerpc-*-*      ) machine=powerpc ;;
+  hppa-*-*         ) machine=hp800 ;;
+  m88k-dg-*        ) machine=aviion ;;
+  m68*-sony-*      ) machine=news ;;
+  mips-sony-*      ) machine=news-risc ;;
+  clipper-*        ) machine=clipper ;;
+esac
+
+case "$canonical" in
+  *-*-linux*    ) opsys=linux ;;
+  *-*-netbsd*   ) opsys=netbsd ;;
+  *-*-nextstep* ) opsys=nextstep ;;
+  *-*-vms       ) opsys=vms ;;
+
+    *-dec-osf1.3 | *-dec-osf2* ) opsys=decosf1-3 ;;
+  *-dec-osf1.2 | *-dec-osf1* ) opsys=decosf1-2 ;;
+  *-dec-osf3.[2-9]         ) opsys=decosf3-2 ;;
+  *-dec-osf3*                ) opsys=decosf3-1 ;;
+  *-dec-osf4*                ) opsys=decosf4-0 ;;
+
+    *-*-ultrix[0-3].* | *-*-ultrix4.0* ) opsys=bsd4-2 ;;
+  *-*-ultrix4.[12]* ) opsys=bsd4-3 ;;
+  *-*-ultrix* )         opsys=ultrix4-3 ;;
+
+    *-*-aix3.1*  ) opsys=aix3-1	;;
+  *-*-aix3.2.5 ) opsys=aix3-2-5	;;
+  *-*-aix3*    ) opsys=aix3-2	;;
+  *-*-aix4.2*  ) opsys=aix4-2	;;
+  *-*-aix4.1*  ) opsys=aix4-1	;;
+  *-*-aix4*    ) opsys=aix4	;;
+
+    *-gnu* )			opsys=gnu    ;;
+  *-*-bsd4.[01] )		opsys=bsd4-1 ;;
+  *-*-bsd4.2 )			opsys=bsd4-2 ;;
+  *-*-bsd4.3 )			opsys=bsd4-3 ;;
+  *-*-aos4.2 )			opsys=bsd4-2 ;;
+  *-*-aos*   )			opsys=bsd4-3 ;;
+  *-*-sysv0    | *-*-sysvr0 )	opsys=usg5-0 ;;
+  *-*-sysv2    | *-*-sysvr2 )	opsys=usg5-2 ;;
+  *-*-sysv2.2  | *-*-sysvr2.2 )	opsys=usg5-2-2 ;;
+  *-*-sysv3*   | *-*-sysvr3* )	opsys=usg5-3 ;;
+  *-*-sysv4.1* | *-*-sysvr4.1* )opsys=usg5-4 NON_GNU_CPP=/usr/lib/cpp ;;
+  *-*-sysv4.[2-9]* | *-sysvr4.[2-9]* )
+	if test -z "$NON_GNU_CPP" ; then
+	  if test -f /usr/ccs/lib/cpp
+	  then NON_GNU_CPP=/usr/ccs/lib/cpp
+	  else NON_GNU_CPP=/lib/cpp
+	  fi
+	fi
+	opsys=usg5-4-2 ;;
+    *-sysv4* | *-sysvr4* )	opsys=usg5-4 ;;
+    *-*-mach_bsd4.3* )          opsys=mach-bsd4-3 ;;
+esac
+
+case "$canonical" in
+
+    *-*-netbsd* )
+    case "$canonical" in
       i[3-9]86-*-netbsd*) machine=intel386 ;;
       hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd* | m68k-*-netbsd* )
-                      # Yes, this is somewhat bogus.
-                      machine=hp9000s300 ;;
+                                            machine=hp9000s300 ;;
       pc532-*-netbsd* | ns32k-*-netbsd* )  machine=ns32000 ;;
       pmax-*-netbsd*  | mips-*-netbsd*  )  machine=pmax ;;
     esac
   ;;
 
-  ## Acorn RISCiX:
-  arm-acorn-riscix1.1* ) machine=acorn opsys=riscix1-1 ;;
+    arm-acorn-riscix1.1* ) machine=acorn opsys=riscix1-1 ;;
   arm-acorn-riscix1.2* | arm-acorn-riscix ) machine=acorn opsys=riscix1-2 ;;
 
-  ## Alliant machines
-  ## Strictly speaking, we need the version of the alliant operating
-  ## system to choose the right machine file, but currently the
-  ## configuration name doesn't tell us enough to choose the right
-  ## one; we need to give alliants their own operating system name to
-  ## do this right.  When someone cares, they can help us.
-  fx80-alliant-* ) machine=alliant4     opsys=bsd4-2 ;;
+    fx80-alliant-* ) machine=alliant4     opsys=bsd4-2 ;;
   i860-alliant-* ) machine=alliant-2800 opsys=bsd4-3 ;;
 
-  ## Alpha (DEC) machines.
-  ## XEmacs change: split apart into numerous files.
-  alpha-*-* )
-    machine=alpha
-    case "${canonical}" in
-      *-dec-osf1.3 | *-dec-osf2* ) opsys=decosf1-3 ;;
-      *-dec-osf1.2 | *-dec-osf1* ) opsys=decosf1-2 ;;
-
-      ## XEmacs: Add switch for OSF 1 version 3 (roth@cse.ucsc.edu)
-      ## XEmacs: Add switch for Digital Unix version 4 (srivasta@pilgrim.umass.edu)
-      *-dec-osf3.[2-9] ) opsys=decosf3-2 ;;
-      *-dec-osf3* )        opsys=decosf3-1 ;;
-      *-dec-osf4* )        opsys=decosf4-0 ;;
-      *-*-linux*  )        opsys=linux ;;
-    esac
-  ;;
-
-  ## Altos 3068
-  m68*-altos-sysv* ) machine=altos opsys=usg5-2 ;;
-
-  ## Amdahl UTS
-  580-amdahl-sysv* ) machine=amdahl opsys=usg5-2-2 ;;
-
-  ## Apollo, Domain/OS
-  m68*-apollo-* ) machine=apollo opsys=bsd4-3 ;;
-  
-  ## AT&T 3b2, 3b5, 3b15, 3b20
-  we32k-att-sysv* ) machine=att3b opsys=usg5-2-2 ;;
-
-  ## AT&T 3b1 - The Mighty Unix PC!
-  m68*-att-sysv* ) machine=7300 opsys=usg5-2-2 ;;
-
-  ## Bull machines
-  rs6000-bull-bosx* ) machine=ibmrs6000 opsys=aix3-2 ;; # dpx20
+    m68*-altos-sysv* ) machine=altos opsys=usg5-2 ;;
+
+    580-amdahl-sysv* ) machine=amdahl opsys=usg5-2-2 ;;
+
+    m68*-apollo-* ) machine=apollo opsys=bsd4-3 ;;
+
+    we32k-att-sysv* ) machine=att3b opsys=usg5-2-2 ;;
+
+    m68*-att-sysv* ) machine=7300 opsys=usg5-2-2 ;;
+
+    rs6000-bull-bosx* ) machine=ibmrs6000 opsys=aix3-2 ;; # dpx20
   m68*-bull-sysv3*  ) machine=dpx2      opsys=usg5-3 ;; # dpx2
   m68*-bull-sysv2*  ) machine=sps7      opsys=usg5-2 ;; # sps7
 
-  ## CCI 5/32, 6/32 -- see "Tahoe".
-
-  ## Celerity
-  ## I don't know what configuration name to use for this; config.sub
-  ## doesn't seem to know anything about it.  Hey, Celerity users, get
-  ## in touch with us!
-  celerity-celerity-bsd* ) machine=celerity opsys=bsd4-2 ;;
-
-  ## Clipper
-  ## What operating systems does this chip run that XEmacs has been
-  ## tested on?
-  clipper-* ) machine=clipper
-    ## We'll use the catch-all code at the bottom to guess the
-    ## operating system.
-  ;;
-
-  ## Convex
-  *-convex-bsd* | *-convex-convexos* )
+  
+    celerity-celerity-bsd* ) machine=celerity opsys=bsd4-2 ;;
+
+    *-convex-bsd* | *-convex-convexos* )
     machine=convex opsys=bsd4-3
-    ## Prevents spurious white space in makefiles - d.m.cooke@larc.nasa.gov
     NON_GNU_CPP="cc -E -P"
   ;;
 
-  ## Cubix QBx/386
-  i[3-9]86-cubix-sysv* ) machine=intel386 opsys=usg5-3 ;;
-
-  ## Cydra 5
-  cydra*-cydrome-sysv* ) machine=cydra5 opsys=usg5-3 ;;
-
-  ## Data General AViiON Machines
-  i586-dg-dgux*R4*   | i586-dg-dgux5.4.4* ) machine=aviion opsys=dgux5-4r4 ;;
-  m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* ) machine=aviion opsys=dgux5-4r3 ;;
-  m88k-dg-dgux5.4R2* | m88k-dg-dgux5.4.2* ) machine=aviion opsys=dgux5-4r2 ;;
-  m88k-dg-dgux* 			  ) machine=aviion opsys=dgux	   ;;
-
-  ## Dec Mips machines
-  mips-dec-* )
-    machine=pmax
-    case "${canonical}" in
-      *-*-ultrix[0-3].* | *-*-ultrix4.0* | *-*-bsd4.2* ) opsys=bsd4-2 ;;
-      *-*-ultrix4.[12]* | *-*-bsd* ) opsys=bsd4-3 ;;
-      *-*-ultrix* )                    opsys=ultrix4-3 ;;
-      *-*-osf* )                       opsys=osf1 ;;
-      *-*-mach_bsd4.3* )               opsys=mach-bsd4-3 ;;
-    esac
-  ;;
-
-  ## Motorola Delta machines
-  m68k-motorola-sysv* | m68000-motorola-sysv* )
-    machine=delta opsys=usg5-3
-    if test -z "`type gnucc | grep 'not found'`"
-    then
-      if test -s /etc/167config
-      then CC="gnucc -m68040"
-      else CC="gnucc -m68881"
-      fi
-    else
-      if test -z "`type gcc | grep 'not found'`"
-      then CC=gcc
-      else CC=cc
-      fi
-    fi
-  ;;
+    i[3-9]86-cubix-sysv* ) machine=intel386 opsys=usg5-3 ;;
+
+    cydra*-cydrome-sysv* ) machine=cydra5 opsys=usg5-3 ;;
+
+    i586-dg-dgux*R4*   | i586-dg-dgux5.4.4* ) machine=aviion opsys=dgux5-4r4 ;;
+  m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* ) opsys=dgux5-4r3 ;;
+  m88k-dg-dgux5.4R2* | m88k-dg-dgux5.4.2* ) opsys=dgux5-4r2 ;;
+  m88k-dg-dgux* 			  ) opsys=dgux	   ;;
+
+    m68k-motorola-sysv* | m68000-motorola-sysv* ) machine=delta opsys=usg5-3 ;;
   m88k-motorola-sysv4* )
-    # jbotte@bnr.ca says that UNIX_System_V <hostName> 4.0 R40V4.3 m88k mc88110
-    # needs POSIX_SIGNALS and therefore needs usg5-4-2.
-    # I hope there are not other 4.0 versions for this machine
-    # which really need usg5-4 instead.
-    machine=delta88k opsys=usg5-4-2
+                    machine=delta88k opsys=usg5-4-2
   ;;
   m88k-motorola-sysv* | m88k-motorola-m88kbcs* ) machine=delta88k opsys=usg5-3 ;;
 
-  ## Dual machines
-  m68*-dual-sysv*    ) machine=dual opsys=usg5-2   ;;
+    m68*-dual-sysv*    ) machine=dual opsys=usg5-2   ;;
   m68*-dual-uniplus* ) machine=dual opsys=unipl5-2 ;;
 
-  ## Elxsi 6400
-  elxsi-elxsi-sysv* ) machine=elxsi opsys=usg5-2 ;;
-
-  ## Encore machines
-  ns16k-encore-bsd* ) machine=ns16000 opsys=umax ;;
-
-  ## Gould Power Node and NP1
-  pn-gould-bsd4.2* ) machine=gould     opsys=bsd4-2 ;;
+    elxsi-elxsi-sysv* ) machine=elxsi opsys=usg5-2 ;;
+
+    ns16k-encore-bsd* ) machine=ns16000 opsys=umax ;;
+
+    pn-gould-bsd4.2* ) machine=gould     opsys=bsd4-2 ;;
   pn-gould-bsd4.3* ) machine=gould     opsys=bsd4-3 ;;
   np1-gould-bsd* )   machine=gould-np1 opsys=bsd4-3 ;;
 
-  ## Harris Night Hawk machines running CX/UX (a 5000 looks just like a 4000
-  ## as far as XEmacs is concerned).
-  m88k-harris-cxux* )
-    # Build needs to be different on 7.0 and later releases
-    case "`uname -r`" in
+      m88k-harris-cxux* )
+        case "`uname -r`" in
        [56].[0-9] ) machine=nh4000 opsys=cxux  ;;
        [7].[0-9]  ) machine=nh4000 opsys=cxux7 ;;
     esac
     NON_GNU_CPP="/lib/cpp"
   ;;
-  ## Harris ecx or gcx running CX/UX (Series 1200, Series 3000)
-  m68k-harris-cxux* ) machine=nh3000 opsys=cxux ;;
-  ## Harris power pc NightHawk running Power UNIX (Series 6000)
-  powerpc-harris-powerunix )
-    machine=nh6000 opsys=powerunix
-    NON_GNU_CPP="cc -Xo -E -P"
-  ;;
-
-  ## Honeywell XPS100
-  xps*-honeywell-sysv* ) machine=xps100 opsys=usg5-2 ;;
-
-  ## HP 9000 series 200 or 300
-  m68*-hp-bsd* ) machine=hp9000s300 opsys=bsd4-3 ;;
-
-  ## HP-UX on HP's
-  *-hp-hpux* )
-    NON_GNU_CC="cc -Aa"
-    NON_GNU_CPP="cc -Aa -E"
-
-    ### Figure out machine and opsys orthogonally
-    case "${canonical}" in
+    m68k-harris-cxux* ) machine=nh3000 opsys=cxux ;;
+    powerpc-harris-powerunix ) machine=nh6000 opsys=powerunix NON_GNU_CPP="cc -Xo -E -P" ;;
+
+    xps*-honeywell-sysv* ) machine=xps100 opsys=usg5-2 ;;
+
+    m68*-hp-bsd* ) machine=hp9000s300 opsys=bsd4-3 ;;
+
+    *-hp-hpux* )
+        case "$canonical" in
       m68*  ) machine=hp9000s300 ;;
       hppa* ) machine=hp800      ;;
     esac
 
-    case "${canonical}" in
-      *-hp-hpux7*     )  opsys=hpux       ;;
-      *-hp-hpux8*     )  opsys=hpux8      ;;
-      *-hp-hpux9*     )  opsys=hpux9      ;;
-      *-hp-hpux10*    )  opsys=hpux10     ;;
+    case "$canonical" in
+      *-hp-hpux7*  )  opsys=hpux   ;;
+      *-hp-hpux8*  )  opsys=hpux8  ;;
+      *-hp-hpux9*  )  opsys=hpux9  ;;
+      *-hp-hpux10* )  opsys=hpux10 ;;
       * )
         case "`uname -r`" in
-	  ## Someone's system reports A.B8.05 for this.
-	  ## I wonder what other possibilities there are.
 	  *.B8.* )  opsys=hpux8  ;;
 	  *.08.* )  opsys=hpux8  ;;
 	  *.09.* )  opsys=hpux9  ;;
@@ -1147,99 +1094,51 @@
       ;;
     esac
 
-    if test $opsys = hpux10 ; then
-      NON_GNU_CC="cc -Ae"
-      NON_GNU_CPP="cc -Ae -E"
-    fi
-
-    case "${canonical}" in *-hp-hpux*shr* ) opsys="${opsys}-shr" ;; esac
+        case "$opsys" in hpux9 | hpux10 ) extra_objs="$extra_objs strcat.o";; esac
+
+    if test "$opsys" = "hpux10"; then ansi_flag="-Ae"; else ansi_flag="-Aa"; fi
+    NON_GNU_CC="cc $ansi_flag" NON_GNU_CPP="cc $ansi_flag -E"
+
+    case "$canonical" in *-hp-hpux*shr* ) opsys="${opsys}-shr" ;; esac
   ;;
 
-  hppa-*-nextstep* ) machine=hp800 opsys=nextstep ;;
-
-  ## Orion machines
-  orion-orion-bsd*   ) machine=orion    opsys=bsd4-2 ;;
+    orion-orion-bsd*   ) machine=orion    opsys=bsd4-2 ;;
   clipper-orion-bsd* ) machine=orion105 opsys=bsd4-2 ;;
 
-  ## IBM machines
-  i[3-9]86-ibm-aix1.1* ) machine=ibmps2-aix opsys=usg5-2-2 ;;
+    i[3-9]86-ibm-aix1.1* ) machine=ibmps2-aix opsys=usg5-2-2 ;;
   i[3-9]86-ibm-aix1.[23]* | i[3-9]86-ibm-aix* ) machine=ibmps2-aix opsys=usg5-3 ;;
   i370-ibm-aix*) machine=ibm370aix opsys=usg5-3 ;;
-  rs6000-ibm-aix3.1*  | powerpc-ibm-aix3.1*  ) machine=ibmrs6000 opsys=aix3-1	;;
-  rs6000-ibm-aix3.2.5 | powerpc-ibm-aix3.2.5 ) machine=ibmrs6000 opsys=aix3-2-5	;;
-  rs6000-ibm-aix4.2*  | powerpc-ibm-aix4.2*  ) machine=ibmrs6000 opsys=aix4-2	;;
-  rs6000-ibm-aix4.1*  | powerpc-ibm-aix4.1*  ) machine=ibmrs6000 opsys=aix4-1	;;
-  rs6000-ibm-aix4*    | powerpc-ibm-aix4*    ) machine=ibmrs6000 opsys=aix4	;;
-  rs6000-ibm-aix*     | powerpc-ibm-aix*     ) machine=ibmrs6000 opsys=aix3-2	;;
-  romp-ibm-bsd4.3* ) machine=ibmrt opsys=bsd4-3 ;;
-  romp-ibm-bsd4.2* ) machine=ibmrt opsys=bsd4-2 ;;
-  romp-ibm-aos4.3* ) machine=ibmrt opsys=bsd4-3 ;;
-  romp-ibm-aos4.2* ) machine=ibmrt opsys=bsd4-2 ;;
-  romp-ibm-aos*    ) machine=ibmrt opsys=bsd4-3 ;;
-  romp-ibm-bsd*    ) machine=ibmrt opsys=bsd4-3 ;;
-  romp-ibm-aix*    ) machine=ibmrt-aix opsys=usg5-2-2 ;;
-  romp-ibm-mach*   ) machine=ibmrt opsys=mach-bsd4-3 ;;
-
-  ## Integrated Solutions `Optimum V'
-  m68*-isi-bsd4.2* ) machine=isi-ov opsys=bsd4-2 ;;
+  romp-ibm-aos*    ) opsys=bsd4-3 ;;
+  romp-ibm-bsd*    ) opsys=bsd4-3 ;;
+  romp-ibm-mach*   ) opsys=mach-bsd4-3 ;;
+
+    m68*-isi-bsd4.2* ) machine=isi-ov opsys=bsd4-2 ;;
   m68*-isi-bsd4.3* ) machine=isi-ov opsys=bsd4-3 ;;
 
-  ## Intel 386 machines where we do care about the manufacturer
-  i[3-9]86-intsys-sysv* ) machine=is386 opsys=usg5-2-2 ;;
-
-  ## Prime EXL
-  i[3-9]86-prime-sysv* ) machine=i386 opsys=usg5-3 ;;
-
-  ## Sequent Symmetry running Dynix
-  i[3-9]86-sequent-bsd* ) machine=symmetry opsys=bsd4-3 ;;
-
-  ## Sequent Symmetry running DYNIX/ptx
-  ## Use the old cpp rather than the newer ANSI one.
-  i[3-9]86-sequent-ptx* )
-    machine=sequent-ptx opsys=ptx
-    NON_GNU_CPP="/lib/cpp"
-  ;;
-
-  ## Unspecified sysv on an ncr machine defaults to svr4.2.
-  ## (Plain usg5-4 doesn't turn on POSIX signals, which we need.)
-  i[3-9]86-ncr-sysv* ) machine=ncr386 opsys=usg5-4-2 ;;
-
-  ## Intel Paragon OSF/1
-  i860-intel-osf1* ) machine=paragon opsys=osf1 NON_GNU_CPP=/usr/mach/lib/cpp ;;
-
-  ## Intel 860
-  i860-*-sysv4* )
-    machine=i860 opsys=usg5-4
-    NON_GNU_CC="/bin/cc" # Ie, not the one in /usr/ucb/cc.
-    NON_GNU_CPP="/usr/ccs/lib/cpp" # cc -E tokenizes macro expansion.
-  ;;
-
-  ## Masscomp machines
-  m68*-masscomp-rtu* ) machine=masscomp opsys=rtu ;;
-
-  ## Megatest machines
-  m68*-megatest-bsd* ) machine=mega68 opsys=bsd4-2 ;;
-
-  ## Workstations sold by MIPS
-  ## This is not necessarily all workstations using the MIPS processor -
-  ## Irises are produced by SGI, and DECstations by DEC.
-
-  ## etc/MACHINES lists mips.h and mips4.h as possible machine files,
-  ## and usg5-2-2 and bsd4-3 as possible OS files.  The only guidance
-  ## it gives for choosing between the alternatives seems to be "Use
-  ## -machine=mips4 for RISCOS version 4; use -opsystem=bsd4-3 with
-  ## the BSD world."  I'll assume that these are instructions for
-  ## handling two odd situations, and that every other situation
-  ## should use mips.h and usg5-2-2, they being listed first.
-  mips-mips-usg* )
-    machine=mips4
-    ## Fall through to the general code at the bottom to decide on the OS.
-  ;;
+    i[3-9]86-intsys-sysv* ) machine=is386 opsys=usg5-2-2 ;;
+
+    i[3-9]86-prime-sysv* ) machine=i386 opsys=usg5-3 ;;
+
+    i[3-9]86-sequent-bsd* ) machine=symmetry opsys=bsd4-3 ;;
+
+    i[3-9]86-sequent-ptx* ) machine=sequent-ptx opsys=ptx NON_GNU_CPP="/lib/cpp" ;;
+
+      i[3-9]86-ncr-sysv* ) machine=ncr386 opsys=usg5-4-2 ;;
+
+    i860-intel-osf1* ) machine=paragon opsys=osf1 NON_GNU_CPP=/usr/mach/lib/cpp ;;
+
+    i860-*-sysv4* ) machine=i860 opsys=usg5-4 NON_GNU_CC="/bin/cc" NON_GNU_CPP="/usr/ccs/lib/cpp" ;;
+
+    m68*-masscomp-rtu* ) machine=masscomp opsys=rtu ;;
+
+    m68*-megatest-bsd* ) machine=mega68 opsys=bsd4-2 ;;
+
+        mips-mips-usg* ) machine=mips4 ;;
   mips-mips-riscos4 )
     machine=mips4
     NON_GNU_CC="cc -systype bsd43"
     NON_GNU_CPP="cc -systype bsd43 -E"
-    case "${canonical}" in
+    case "$canonical" in
       mips-mips-riscos4* ) opsys=bsd4-3  ;;
       mips-mips-riscos5* ) opsys=riscos5 ;;
     esac
@@ -1247,105 +1146,70 @@
   mips-mips-bsd* ) machine=mips opsys=bsd4-3 ;;
   mips-mips-*    ) machine=mips opsys=usg5-2-2 ;;
 
-  ## NeXT
-  m68*-next-* | m68k-*-nextstep* ) machine=m68k opsys=nextstep ;;
-
-  ## The complete machine from National Semiconductor
-  ns32k-ns-genix* ) machine=ns32000 opsys=usg5-2 ;;
-
-  ## NCR machines
-  m68*-ncr-sysv2* | m68*-ncr-sysvr2* ) machine=tower32   opsys=usg5-2-2 ;;
+    m68*-next-* | m68k-*-nextstep* ) machine=m68k opsys=nextstep ;;
+
+    ns32k-ns-genix* ) machine=ns32000 opsys=usg5-2 ;;
+
+    m68*-ncr-sysv2* | m68*-ncr-sysvr2* ) machine=tower32   opsys=usg5-2-2 ;;
   m68*-ncr-sysv3* | m68*-ncr-sysvr3* ) machine=tower32v3 opsys=usg5-3 ;;
 
-  ## Nixdorf Targon 31
-  m68*-nixdorf-sysv* ) machine=targon31 opsys=usg5-2-2 ;;
-
-  ## Nu (TI or LMI)
-  m68*-nu-sysv* ) machine=nu opsys=usg5-2 ;;
-
-  ## Plexus
-  m68*-plexus-sysv* ) machine=plexus opsys=usg5-2 ;;
-
-  ## Pyramid machines
-  ## I don't really have any idea what sort of processor the Pyramid has,
-  ## so I'm assuming it is its own architecture.
-  pyramid-pyramid-bsd* ) machine=pyramid opsys=bsd4-2 ;;
-
-  ## Sequent Balance
-  ns32k-sequent-bsd4.2* ) machine=sequent opsys=bsd4-2 ;;
+    m68*-nixdorf-sysv* ) machine=targon31 opsys=usg5-2-2 ;;
+
+    m68*-nu-sysv* ) machine=nu opsys=usg5-2 ;;
+
+    m68*-plexus-sysv* ) machine=plexus opsys=usg5-2 ;;
+
+    pyramid-pyramid-bsd* ) machine=pyramid opsys=bsd4-2 ;;
+
+    ns32k-sequent-bsd4.2* ) machine=sequent opsys=bsd4-2 ;;
   ns32k-sequent-bsd4.3* ) machine=sequent opsys=bsd4-3 ;;
 
-  ## Siemens Nixdorf
-  mips-siemens-sysv* | mips-sni-sysv*)
+    mips-siemens-sysv* | mips-sni-sysv*)
     machine=mips-siemens opsys=usg5-4
     NON_GNU_CC=/usr/ccs/bin/cc
     NON_GNU_CPP=/usr/ccs/lib/cpp
   ;;
 
-  ## Silicon Graphics machines
-  ## Iris 2500 and Iris 2500 Turbo (aka the Iris 3030)
-  m68*-sgi-iris3.5* ) machine=irist opsys=iris3-5 ;;
+      m68*-sgi-iris3.5* ) machine=irist opsys=iris3-5 ;;
   m68*-sgi-iris3.6* | m68*-sgi-iris*) machine=irist opsys=iris3-6 ;;
-  ## Iris 4D
-  mips-sgi-irix3.*      ) machine=iris4d opsys=irix3-3 ;;
-  mips-sgi-irix4.*      ) machine=iris4d opsys=irix4-0 ;;
-  mips-sgi-irix6*       ) machine=iris4d opsys=irix6-0 NON_GNU_CC="cc -Olimit 2000" ;;
-  mips-sgi-irix5.[3-9]* ) machine=iris4d opsys=irix5-3 ;;
-  mips-sgi-irix5.2*     ) machine=iris4d opsys=irix5-2 ;;
-  mips-sgi-irix5.1*     ) machine=iris4d opsys=irix5-1 ;;
-  mips-sgi-irix*        ) machine=iris4d opsys=irix5-0 ;;
-
-  ## SONY machines
-  m68*-sony-bsd4.2* ) machine=news opsys=bsd4-2 ;;
-  m68*-sony-bsd4.3* ) machine=news opsys=bsd4-3 ;;
-  m68*-sony-newsos3* | m68*-sony-news3*) machine=news opsys=bsd4-3 ;;
-  mips-sony-bsd* | mips-sony-newsos4* | mips-sony-news4*) machine=news-risc opsys=bsd4-3 ;;
-  mips-sony-news* ) machine=news-risc opsys=newsos5 ;;
-
-  ## Stride
-  m68*-stride-sysv* ) machine=stride opsys=usg5-2 ;;
-
-  ## Suns
-  sparc-*-linux* ) machine=sparc opsys=linux ;;
-
-  *-*-solaris* | *-*-sunos* | *-sun-mach* | *-sun-bsd* )
-    # Hardware type
-    case "${canonical}" in
+    mips-sgi-irix3.*    ) opsys=irix3-3 ;;
+  mips-sgi-irix4.*    ) opsys=irix4-0 ;;
+  mips-sgi-irix6*     ) opsys=irix6-0 NON_GNU_CC="cc -Olimit 2000" ;;
+  mips-sgi-irix5.1*   ) opsys=irix5-1 ;;
+  mips-sgi-irix5.2*   ) opsys=irix5-2 ;;
+  mips-sgi-irix5.*    ) opsys=irix5-3 ;;
+  mips-sgi-irix*      ) opsys=irix5-0 ;;
+
+    *-sony-newsos[34]* | *-sony-news[34]* ) opsys=bsd4-3 ;;
+  *-sony-news* ) opsys=newsos5 ;;
+
+    m68*-stride-sysv* ) machine=stride opsys=usg5-2 ;;
+
+    *-*-solaris* | *-*-sunos* | *-sun-mach* | *-sun-bsd* )
+        case "$canonical" in
       m68*-sunos1* )	         machine=sun1     ;;
       m68*-sunos2* )	         machine=sun2     ;;
       m68* )		         machine=sun3     ;;
       i[3-9]86*-sun-sunos[34]* ) machine=sun386 ;;
       i[3-9]86-*-* )	         machine=intel386 ;;
       rs6000* )                  machine=rs6000   ;;
-      sparc* )		         machine=sparc    ;;
-      powerpc* )	         machine=powerpc  ;;
-      * )		         unported=yes     ;;
     esac
-    
-    # Make `canonical' even more so.
-    case "${canonical}" in *-sunos5*) 
-      canonical="`echo \"${canonical}\" | sed -e s/sunos5/solaris2/`";;
+
+        case "$canonical" in *-sunos5*)
+      canonical="`echo \"$canonical\" | sed -e s/sunos5/solaris2/`";;
     esac
 
-    # On SunOS 4, use /usr/lib/cpp,     sans dynodump, /bin/ranlib
-    # On SunOS 5, use /usr/ccs/lib/cpp, need dynodump, RANLIB not needed
-    # But, SunOS 5.6 no longer needs dynodump because it has a similar
-    # function integrated.
-    case "${canonical}" in
+                    case "$canonical" in
       *-sunos4* )
         test -f /usr/lib/cpp     && NON_GNU_CPP=/usr/lib/cpp ;;
       *-solaris2* )
         test -f /usr/ccs/lib/cpp && NON_GNU_CPP=/usr/ccs/lib/cpp
         RANLIB=':'
-	case "${canonical}" in
-	  *-solaris2.[6-9]* ) need_dynodump=no  ;;
-	  *-solaris2*       ) need_dynodump=yes ;;
+	case "$canonical" in *-solaris2.[0-5]* ) need_dynodump=yes ;; esac
 	esac
-    esac
-    
-    case "${canonical}" in
-      ## The Sun386 didn't get past 4.0.
-      i[3-9]86-*-sunos4*  ) opsys=sunos4-0	;;
+
+    case "$canonical" in
+            i[3-9]86-*-sunos4*) opsys=sunos4-0	;;
       *-sunos4.0*	  ) opsys=sunos4-0	;;
       *-sunos4.1.2*	  ) opsys=sunos4-1-2	;;
       *-sunos4.1.3*	  ) opsys=sunos4-1-3	;;
@@ -1362,69 +1226,44 @@
       *			  ) opsys=bsd4-2	;;
     esac
 
-    case "${canonical}" in *-sunos4*shr* ) opsys="${opsys}-shr" ;; esac
-
-    ## Watch out for a compiler that is guaranteed not to work.
-    case "${canonical}" in
-      *-solaris* ) test "$CC" = "/usr/ucb/cc" && unset CC ;;
+    case "$canonical" in *-sunos4*shr* ) opsys="${opsys}-shr" ;; esac
+
+        case "$canonical" in
+      *-solaris* ) case "$CC" in /usr/ucb/cc* ) CC="" ;; esac ;;
     esac
   ;;
 
-  sparc-*-nextstep* ) machine=sparc opsys=nextstep ;;
-
-  ## Tadpole 68k
-  m68*-tadpole-sysv* ) machine=tad68k opsys=usg5-3 ;;
-
-  ## Tahoe machines
-  tahoe-tahoe-bsd4.2* ) machine=tahoe opsys=bsd4-2 ;;
+    m68*-tadpole-sysv* ) machine=tad68k opsys=usg5-3 ;;
+
+    tahoe-tahoe-bsd4.2* ) machine=tahoe opsys=bsd4-2 ;;
   tahoe-tahoe-bsd4.3* ) machine=tahoe opsys=bsd4-3 ;;
 
-  ## Tandem Integrity S2
-  mips-tandem-sysv* ) machine=tandem-s2 opsys=usg5-3 ;;
-
-  ## Tektronix XD88
-  m88k-tektronix-sysv3* ) machine=tekxd88 opsys=usg5-3 ;;
-
-  ## Tektronix 16000 box (6130?)
-  ns16k-tektronix-bsd* ) machine=ns16000 opsys=bsd4-2 ;;
-  ## Tektronix 4300
-  ## src/m/tek4300.h hints that this is a m68k machine.
-  m68*-tektronix-bsd* ) machine=tek4300 opsys=bsd4-3 ;;
-
-  ## Titan P2 or P3
-  ## We seem to have lost the machine-description file titan.h!
-  titan-titan-sysv* ) machine=titan opsys=usg5-3 ;;
-
-  ## Ustation E30 (SS5E)
-  m68*-unisys-uniplus* ) machine=ustation opsystem=unipl5-2 ;;
-
-  ## Vaxen.
-  vax-dec-* )
-    machine=vax
-    case "${canonical}" in
-      *-bsd4.1* ) 					opsys=bsd4-1 ;;
-      *-bsd4.2* | *-ultrix[0-3].* | *-ultrix4.0* )	opsys=bsd4-2 ;;
-      *-bsd4.3* | *-ultrix* ) 				opsys=bsd4-3 ;;
-      *-sysv[01]* | *-sysvr[01]* ) 			opsys=usg5-0 ;;
-      *-sysv2* | *-sysvr2* )				opsys=usg5-2 ;;
-      *-vms* ) 						opsys=vms ;;
-      *-mach* )						opsys=mach-bsd4-3 ;;
-      * ) 						unported=yes
+    mips-tandem-sysv* ) machine=tandem-s2 opsys=usg5-3 ;;
+
+    m88k-tektronix-sysv3* ) machine=tekxd88 opsys=usg5-3 ;;
+
+    ns16k-tektronix-bsd* ) machine=ns16000 opsys=bsd4-2 ;;
+      m68*-tektronix-bsd* ) machine=tek4300 opsys=bsd4-3 ;;
+
+    titan-titan-sysv* ) machine=titan opsys=usg5-3 ;;
+
+    m68*-unisys-uniplus* ) machine=ustation opsystem=unipl5-2 ;;
+
+    vax-dec-* )
+    case "$canonical" in
+      *-sysv[01]* | *-sysvr[01]* ) 	opsys=usg5-0 ;;
+      *-sysv2* | *-sysvr2* )		opsys=usg5-2 ;;
+      *-mach* )				opsys=mach-bsd4-3 ;;
     esac
   ;;
 
-  ## Whitechapel MG1
-  ## We don't know what sort of OS runs on these; we'll let the
-  ## operating system guessing code below try.
-  ns16k-whitechapel-* ) machine=mg1 ;;
-
-  ## Wicat
-  m68*-wicat-sysv* ) machine=wicat opsys=usg5-2 ;;
-
-  ## Intel 386 machines where we don't care about the manufacturer
-  i[3-9]86-*-* )
+    ns16k-whitechapel-* ) machine=mg1 ;;
+
+    m68*-wicat-sysv* ) machine=wicat opsys=usg5-2 ;;
+
+    i[3-9]86-*-* )
     machine=intel386
-    case "${canonical}" in
+    case "$canonical" in
       *-isc1.* | *-isc2.[01]* ) opsys=386-ix ;;
       *-isc2.2* )		opsys=isc2-2 ;;
       *-isc4.0* )		opsys=isc4-0 ;;
@@ -1433,24 +1272,17 @@
 				NON_GCC_TEST_OPTIONS=-Xp
 				;;
       *-isc* )			opsys=isc3-0 ;;
-      *-esix5* )		opsys=esix5r4; NON_GNU_CPP=/usr/lib/cpp ;;
+      *-esix5* )		opsys=esix5r4 NON_GNU_CPP=/usr/lib/cpp ;;
       *-esix* )			opsys=esix ;;
       *-mach* )			opsys=mach-bsd4-3 ;;
       *-xenix* )		opsys=xenix ;;
-      *-linux* )		opsys=linux ;;
-      *-sco3.2v4* )		opsys=sco4 ; NON_GNU_CPP=/lib/cpp  ;;
+      *-sco3.2v4* )		opsys=sco4 NON_GNU_CPP=/lib/cpp  ;;
       *-bsd386* | *-bsdi1* )	opsys=bsd386 ;;
       *-bsdi3* )		opsys=bsdos3 ;;
       *-bsdi2.1* )		opsys=bsdos2-1 ;;
       *-bsdi2* )		opsys=bsdos2 ;;
-      *-sco3.2v5* )		opsys=sco5 ; 
-	## This is a pain.  Like the current USL cc, SCO's cc -E
-	## tokenizes as it preprocesses, making configure very 
-	## unhappy.  Unfortunately, /lib/cpp doesn't understand
-	## flags like "-b elf", so we have to cheat in order to
-	## pick up the right defines for UNEXEC from the s-file.
-	## 01/05/95 robertl@dgii.com
-	if test "${dynamic}" = "yes" ; then
+      *-sco3.2v5* )		opsys=sco5 ;
+							if test "$dynamic" = "yes" ; then
 		NON_GNU_CPP="/lib/cpp -D_XOPEN_SOURCE -D_SCO_ELF"  ;
 	else
 		NON_GNU_CPP="/lib/cpp -D_XOPEN_SOURCE"  ;
@@ -1458,350 +1290,827 @@
       *-386bsd* )	        opsys=386bsd ;;
       *-freebsd* )		opsys=freebsd ;;
       *-nextstep* )		opsys=nextstep ;;
-      ## Otherwise, we'll fall through to the generic opsys code at the bottom.
-    esac
+          esac
   ;;
 
-  ## Linux/68k
-  m68k-*-linux* ) machine=m68k opsys=linux ;;
-
-  * ) unported=yes ;;
+    m68k-*-linux* ) machine=m68k opsys=linux ;;
+
 esac
 
-### If the code above didn't choose an operating system, just choose
-### an operating system based on the configuration name.  You really
-### only want to use this when you have no idea what the right
-### operating system is; if you know what operating systems a machine
-### runs, it's cleaner to make it explicit in the case statement
-### above.
-if test -z "${opsys}" ; then
-  case "${canonical}" in
-    *-gnu* )			opsys=gnu    ;;
-    *-bsd4.[01] )		opsys=bsd4-1 ;;
-    *-bsd4.2 )			opsys=bsd4-2 ;;
-    *-bsd4.3 )			opsys=bsd4-3 ;;
-    *-sysv0    | *-sysvr0 )	opsys=usg5-0 ;;
-    *-sysv2    | *-sysvr2 )	opsys=usg5-2 ;;
-    *-sysv2.2  | *-sysvr2.2 )	opsys=usg5-2-2 ;;
-    *-sysv3*   | *-sysvr3* )	opsys=usg5-3 ;;
-    *-sysv4.1* | *-sysvr4.1* )	opsys=usg5-4 NON_GNU_CPP=/usr/lib/cpp ;;
-    *-sysv4.[2-9]* | *-sysvr4.[2-9]* )
-	if test -z "$NON_GNU_CPP" ; then
-	  if test -f /usr/ccs/lib/cpp
-	  then NON_GNU_CPP=/usr/ccs/lib/cpp
-	  else NON_GNU_CPP=/lib/cpp
-	  fi
-	fi
-	opsys=usg5-4-2 ;;
-    *-sysv4* | *-sysvr4* )	opsys=usg5-4 ;;
-    * )				unported=yes ;;
-  esac
-fi
-
-test -z "$RANLIB" && RANLIB=ranlib
-
-if test ${unported} = yes; then
-  (echo "${progname}: XEmacs hasn't been ported to \`${canonical}' systems."
-   echo "${progname}: Check \`etc/MACHINES' for recognized configuration names."
+if test -z "$machine" -o -z "$opsys"; then
+  (echo "$progname: XEmacs hasn't been ported to \`$canonical' systems."
+   echo "$progname: Check \`etc/MACHINES' for recognized configuration names."
   ) >&2
   exit 1
 fi
 
-if test "${dynamic}" = "yes" ; then
-  case "${opsys}" in
+if test "$dynamic" = "yes" ; then
+  case "$opsys" in
     hpux* | sunos4* | sco5 ) opsys="${opsys}-shr" ;;
   esac
-elif test "${dynamic}" = "no" ; then
-  case "${opsys}" in
+elif test "$dynamic" = "no" ; then
+  case "$opsys" in
     sol2* | decosf1-3 | decosf3-* | decosf4-* | linux ) opsys="${opsys}-static" ;;
   esac
 fi
 
-dynodump_arch=''
-if test "${need_dynodump}" = "yes" ; then
-  case "${canonical}" in
-    sparc*    ) dynodump_arch=sparc ;;
-    powerpc*  ) dynodump_arch=ppc   ;;
-    i[3-9]86* ) dynodump_arch=i386  ;;
-  esac
-fi
-
 machfile="m/${machine}.h"
 opsysfile="s/${opsys}.h"
 
 
-############################################################################
-#									   #
-#            Determine the compiler, set up for feature testing            #
-#									   #
-############################################################################
-
-
-
+test -n "$CC" && cc_specified=yes
+
+SPECIFIED_CFLAGS="$CFLAGS"
+
+if test -n "$compiler"; then CC="$compiler"; fi
+
+test -n "$NON_GNU_CC"  -a "$with_gcc" = "no" -a -z "$CC"  && CC="$NON_GNU_CC"
+# Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1332: checking for $ac_word" >&5
+
+if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="gcc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1358: checking for $ac_word" >&5
+
+if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  ac_prog_rejected=no
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+	continue
+      fi
+      ac_cv_prog_CC="cc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# -gt 0; then
+    # We chose a different compiler from the bogus one.
+    # 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" "$@"
+    shift
+    ac_cv_prog_CC="$@"
+  fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:1403: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='${CPP}'
-ac_compile='${CC-cc} $CFLAGS $LDFLAGS conftest.${ac_ext} -o conftest $LIBS >/dev/null 2>&1'
-
-trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
-trap 'rm -fr confdefs* $ac_clean_files' 0
-
-# Save the original args if we used an alternate arg parser.
-ac_configure_temp="${configure_args-$*}"
-# Strip out --no-create and --norecursion so they don't pile up.
-configure_args=
-for ac_arg in $ac_configure_temp; do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -norecursion | --norecursion | --norecursio | --norecursi \
-  | --norecurs | --norecur | --norecu | --norec | --nore | --nor) ;;
-  *) configure_args="$configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-if test "${LC_ALL+set}" = 'set'; then LC_ALL=C; export LC_ALL; fi
-if test "${LANG+set}"   = 'set'; then LANG=C;   export LANG;   fi
-
-# 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
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=lisp
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then `..'.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
+xe_cppflags='$c_switch_site  $c_switch_machine  $c_switch_system  $c_switch_x_site $X_CFLAGS $CPPFLAGS' # $c_switch_x_machine  $c_switch_x_system'
+xe_ldflags='$ld_switch_site  $ld_switch_machine $ld_switch_system $ld_switch_x_site' # $ld_switch_x_machine $ld_switch_x_system'
+xe_libs='$xe_check_libs $X_PRE_LIBS $libs_x $X_EXTRA_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='${CC-cc} -c '"$CFLAGS $xe_cppflags"' conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest '"$CFLAGS $xe_cppflags $LDFLAGS $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
+cross_compiling=no
+
+cat > conftest.$ac_ext <<EOF
+#line 1415 "configure"
+#include "confdefs.h"
+main(){return(0);}
+EOF
+if { (eval echo configure:1419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
+  else
+    ac_cv_prog_cc_cross=yes
   fi
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test x$ac_srcdir_defaulted = xyes; then
-    echo "configure: can not find sources in ${ac_confdir} or .." >&2; exit 1
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_prog_cc_works=no
+fi
+rm -fr conftest*
+
+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:1439: 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:1444: checking whether we are using GNU C" >&5
+
+cat > conftest.c <<EOF
+#ifdef __GNUC__
+  yes;
+#endif
+EOF
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+  ac_cv_prog_gcc=yes
+else
+  ac_cv_prog_gcc=no
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+
+if test $ac_cv_prog_gcc = yes; then
+  GCC=yes
+  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:1465: checking whether ${CC-cc} accepts -g" >&5
+
+echo 'void f(){}' > conftest.c
+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+  ac_cv_prog_cc_g=yes
+else
+  ac_cv_prog_cc_g=no
+fi
+rm -f conftest*
+
+
+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+  if test "$ac_test_CFLAGS" = set; then
+    CFLAGS="$ac_save_CFLAGS"
+  elif test $ac_cv_prog_cc_g = yes; then
+    CFLAGS="-g -O2"
   else
-    echo "configure: can not find sources in ${srcdir}" >&2; exit 1
+    CFLAGS="-O2"
   fi
-fi
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='${CPP}'
-ac_compile='${CC-cc} $CFLAGS $LDFLAGS conftest.${ac_ext} -o conftest $LIBS >/dev/null 2>&1'
-
-
-
-
-if test "${extra_verbose}" = "yes"  ; then
-#   This is identical to the version that A\C_LANG_C generates except that
-#   it omits the redirection of all output to /dev/null.
-  ac_compile='${CC-cc} $CFLAGS $LDFLAGS conftest.${ac_ext} -o conftest $LIBS'
-fi
-
-#### Choose a compiler.
-if test "x$CC" = x  ; then
-  cc_specified=1
-fi
-
-# Save the value of CFLAGS that the user specified.
-SPECIFIED_CFLAGS="$CFLAGS"
-
-if test "${with_gcc}" = "yes"  ; then
-  CC="${compiler-gcc}"
-  GCC=1
-elif test "${with_lcc}" = "yes"  ; then
-  CC="${compiler-lcc}"
-  dash_r_space=' '		# this bullshit is here because lcc for solaris
-				# will not accept -Rargument.
-				# It needs -R argument instead.  Yuck yuck yuck.
-  test -z "$NON_GNU_CPP" && NON_GNU_CPP="yes" # this is handled specially below...
-elif test "${compiler}" != ""   ; then CC="${compiler}"
-elif test "${with_gcc}" = "no"  ; then CC="cc"
-elif test "${with_lcc}" = "no"  ; then
-  test -z "$CC" && CC=cc
-else
-  case "${canonical}" in
-    * )
-      if test -z "$CC"; then
-  # Extract the first word of `gcc', so it can be a program name with args.
-  set ac_dummy gcc; ac_word=$2
-  test -n "$silent" || echo "checking for $ac_word"
+else
+  GCC=
+  test "${CFLAGS+set}" = set || CFLAGS="-g"
+fi
+
+
+if   test "$with_gcc" = "no"  -a "$ac_cv_prog_gcc" = "yes"; then 
+  CC=${NON_GNU_CC-cc}
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1495: checking for $ac_word" >&5
+
+if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      CC="gcc"
+      ac_cv_prog_CC="gcc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1521: checking for $ac_word" >&5
+
+if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  ac_prog_rejected=no
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+	continue
+      fi
+      ac_cv_prog_CC="cc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# -gt 0; then
+    # We chose a different compiler from the bogus one.
+    # 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" "$@"
+    shift
+    ac_cv_prog_CC="$@"
+  fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:1566: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+
+ac_ext=c
+xe_cppflags='$c_switch_site  $c_switch_machine  $c_switch_system  $c_switch_x_site $X_CFLAGS $CPPFLAGS' # $c_switch_x_machine  $c_switch_x_system'
+xe_ldflags='$ld_switch_site  $ld_switch_machine $ld_switch_system $ld_switch_x_site' # $ld_switch_x_machine $ld_switch_x_system'
+xe_libs='$xe_check_libs $X_PRE_LIBS $libs_x $X_EXTRA_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='${CC-cc} -c '"$CFLAGS $xe_cppflags"' conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest '"$CFLAGS $xe_cppflags $LDFLAGS $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
+cross_compiling=no
+
+cat > conftest.$ac_ext <<EOF
+#line 1578 "configure"
+#include "confdefs.h"
+main(){return(0);}
+EOF
+if { (eval echo configure:1582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
+  else
+    ac_cv_prog_cc_cross=yes
+  fi
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_prog_cc_works=no
+fi
+rm -fr conftest*
+
+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:1602: 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:1607: checking whether we are using GNU C" >&5
+
+cat > conftest.c <<EOF
+#ifdef __GNUC__
+  yes;
+#endif
+EOF
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+  ac_cv_prog_gcc=yes
+else
+  ac_cv_prog_gcc=no
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+
+if test $ac_cv_prog_gcc = yes; then
+  GCC=yes
+  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:1628: checking whether ${CC-cc} accepts -g" >&5
+
+echo 'void f(){}' > conftest.c
+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+  ac_cv_prog_cc_g=yes
+else
+  ac_cv_prog_cc_g=no
+fi
+rm -f conftest*
+
+
+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+  if test "$ac_test_CFLAGS" = set; then
+    CFLAGS="$ac_save_CFLAGS"
+  elif test $ac_cv_prog_cc_g = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-O2"
+  fi
+else
+  GCC=
+  test "${CFLAGS+set}" = set || CFLAGS="-g"
+fi
+
+elif test "$with_gcc" = "yes" -a "$ac_cv_prog_gcc" = "no" ; then 
+  CC=gcc
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1657: checking for $ac_word" >&5
+
+if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="gcc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1683: checking for $ac_word" >&5
+
+if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  ac_prog_rejected=no
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+	continue
+      fi
+      ac_cv_prog_CC="cc"
       break
     fi
   done
   IFS="$ac_save_ifs"
-fi
-test -z "$CC" && CC="cc"
-test -n "$CC" && test -n "$verbose" && echo "	setting CC to $CC"
-
-# Find out if we are using GNU C, under whatever name.
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# -gt 0; then
+    # We chose a different compiler from the bogus one.
+    # 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" "$@"
+    shift
+    ac_cv_prog_CC="$@"
+  fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:1728: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+
+ac_ext=c
+xe_cppflags='$c_switch_site  $c_switch_machine  $c_switch_system  $c_switch_x_site $X_CFLAGS $CPPFLAGS' # $c_switch_x_machine  $c_switch_x_system'
+xe_ldflags='$ld_switch_site  $ld_switch_machine $ld_switch_system $ld_switch_x_site' # $ld_switch_x_machine $ld_switch_x_system'
+xe_libs='$xe_check_libs $X_PRE_LIBS $libs_x $X_EXTRA_LIBS $LIBS $libs_machine $libs_system $libs_standard'
+ac_cpp='$CPP '"$xe_cppflags"
+ac_compile='${CC-cc} -c '"$CFLAGS $xe_cppflags"' conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest '"$CFLAGS $xe_cppflags $LDFLAGS $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
+cross_compiling=no
+
+cat > conftest.$ac_ext <<EOF
+#line 1740 "configure"
+#include "confdefs.h"
+main(){return(0);}
+EOF
+if { (eval echo configure:1744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
+  else
+    ac_cv_prog_cc_cross=yes
+  fi
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_prog_cc_works=no
+fi
+rm -fr conftest*
+
+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:1764: 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:1769: checking whether we are using GNU C" >&5
+
 cat > conftest.c <<EOF
 #ifdef __GNUC__
-  yes
+  yes;
 #endif
 EOF
-${CC-cc} -E conftest.c > conftest.out 2>&1
-if egrep yes conftest.out >/dev/null 2>&1; then
-  GCC=1 # For later tests.
-fi
-rm -f conftest*
-
-      if test "${CC}" = "gcc"  ; then
-        with_gcc="yes"
-        GCC=1
-      fi
-    ;;
-  esac
-fi
-
-#### Some systems specify a CPP to use unless we are using GCC.
-#### Now that we know whether we are using GCC, we can decide whether
-#### to use that one.
-if test "x$NON_GNU_CPP" = x -o x$GCC = x1
-then true
-else
-  if test "x$CPP" = x ; then
-    if test "${with_lcc}" = "yes" -a "${NON_GNU_CPP}" = "yes"; then
-      CPP='gcc -E -traditional' # cross fingers and hope it's there....
-    else
-      CPP="$NON_GNU_CPP"
-    fi
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1776: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+  ac_cv_prog_gcc=yes
+else
+  ac_cv_prog_gcc=no
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+
+if test $ac_cv_prog_gcc = yes; then
+  GCC=yes
+  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:1790: checking whether ${CC-cc} accepts -g" >&5
+
+echo 'void f(){}' > conftest.c
+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+  ac_cv_prog_cc_g=yes
+else
+  ac_cv_prog_cc_g=no
+fi
+rm -f conftest*
+
+
+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+  if test "$ac_test_CFLAGS" = set; then
+    CFLAGS="$ac_save_CFLAGS"
+  elif test $ac_cv_prog_cc_g = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-O2"
   fi
-fi
-
-#### Some systems specify a CC to use unless we are using GCC.
-#### Now that we know whether we are using GCC, we can decide whether
-#### to use that one.
-if test "x$NON_GNU_CC" = x -o x$GCC = x1 -o x$cc_specified = x1
-then true
-else
-  CC="$NON_GNU_CC"
-fi
-
-## Huh?  I commented out the following because it always enabled
-## the "test" options, whatever the hell those are supposed to be
-## for, and the result is that SunOS builds were always static.
-
-# test x$GCC = x1 -a "x$GCC_TEST_OPTIONS"     != x && CC="$CC $GCC_TEST_OPTIONS"
-# test x$GCC = x  -a "x$NON_GCC_TEST_OPTIONS" != x && CC="$CC $NON_GCC_TEST_OPTIONS"
-
-############################################################################
-#									   #
-#                    Do some misc autoconf-special tests                   #
-#									   #
-############################################################################
-
-#### Some other nice autoconf tests.  If you add a test here which
-#### should make an entry in src/config.h, don't forget to add an
-#### #undef clause to src/config.h.in for autoconf to modify.
-test -n "$silent" || echo "checking how to run the C preprocessor"
+else
+  GCC=
+  test "${CFLAGS+set}" = set || CFLAGS="-g"
+fi
+
+fi
+
+if test "$GCC" = "yes"; then with_gcc=yes; else with_gcc=no; fi
+test -n "$NON_GNU_CPP" -a "$with_gcc" = "no" -a -z "$CPP" && CPP="$NON_GNU_CPP"
+
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:1820: checking how to run the C preprocessor" >&5
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
 if test -z "$CPP"; then
+
   # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and ``${CC-cc}'' will simply confuse
-  # make.  It must be expanded now.
+  # substituted into the Makefile and "${CC-cc}" will confuse make.
   CPP="${CC-cc} -E"
-  cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <stdio.h>
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp.
+  cat > conftest.$ac_ext <<EOF
+#line 1833 "configure"
+#include "confdefs.h"
+#include <assert.h>
 Syntax Error
 EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+  :
+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 1850 "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:1856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
 else
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <stdio.h>
-Syntax Error
-EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
-if test -z "$ac_err"; then
-  :
-else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
   CPP=/lib/cpp
 fi
 rm -f conftest*
 fi
 rm -f conftest*
-fi
-test -n "$verbose" && echo "	setting CPP to $CPP"
-
-
-case "${canonical}" in
-  *-sun-sunos* )
-    if test "${CPP}" = "acc -E"  ; then
-      CPP="acc -E -Xs"
-    fi
-  ;;
+  ac_cv_prog_CPP="$CPP"
+  CPP="$ac_cv_prog_CPP"
+else
+  ac_cv_prog_CPP="$CPP"
+fi
+echo "$ac_t""$CPP" 1>&6
+
+
+case "$canonical" in
+  *-sun-sunos* ) test "$CPP" = "acc -E"  &&  CPP="acc -E -Xs" ;;
 esac
 
-if test -z "$RANLIB"; then
-  # Extract the first word of `ranlib', so it can be a program name with args.
-  set ac_dummy ranlib; ac_word=$2
-  test -n "$silent" || echo "checking for $ac_word"
+
+echo "Extracting information from the machine- and system-dependent headers..."
+
+
+
+tempcname="conftest.c"
+
+
+
+
+
+
+echo '
+#define NOT_C_CODE
+#define C_SWITCH_SITE
+#define C_SWITCH_X_SITE
+#define LD_SWITCH_SITE
+#define LD_SWITCH_X_SITE
+#define LD_SWITCH_X_SITE_AUX
+#include "'$srcdir'/src/'$opsysfile'"
+#include "'$srcdir'/src/'$machfile'"
+
+#ifndef LIBS_MACHINE
+#define LIBS_MACHINE 
+#endif
+configure___ libs_machine=LIBS_MACHINE
+
+#ifndef LIBS_SYSTEM
+#define LIBS_SYSTEM 
+#endif
+configure___ libs_system=LIBS_SYSTEM
+
+#ifndef LIBS_TERMCAP
+#define LIBS_TERMCAP 
+#endif
+configure___ libs_termcap=LIBS_TERMCAP
+
+#ifndef LIB_STANDARD
+#define LIB_STANDARD 
+#endif
+configure___ libs_standard=LIB_STANDARD
+
+#ifndef C_SWITCH_SYSTEM
+#define C_SWITCH_SYSTEM 
+#endif
+configure___ c_switch_system=C_SWITCH_SYSTEM
+
+#ifndef C_SWITCH_MACHINE
+#define C_SWITCH_MACHINE 
+#endif
+configure___ c_switch_machine=C_SWITCH_MACHINE
+
+#ifndef C_SWITCH_X_SYSTEM
+#define C_SWITCH_X_SYSTEM 
+#endif
+configure___ c_switch_x_system=C_SWITCH_X_SYSTEM
+
+#ifndef LD_SWITCH_X_SYSTEM
+#define LD_SWITCH_X_SYSTEM 
+#endif
+configure___ ld_switch_x_system=LD_SWITCH_X_SYSTEM
+
+#ifndef LD_SWITCH_SYSTEM
+#define LD_SWITCH_SYSTEM 
+#endif
+configure___ ld_switch_system=LD_SWITCH_SYSTEM
+
+#ifndef UNEXEC
+#define UNEXEC unexec.o
+#endif
+configure___ unexec=UNEXEC
+
+#ifndef C_DEBUG_SWITCH
+#define C_DEBUG_SWITCH -g
+#endif
+configure___ c_debug_switch=C_DEBUG_SWITCH
+
+#ifndef C_OPTIMIZE_SWITCH
+#define C_OPTIMIZE_SWITCH -O
+#endif
+configure___ c_optimize_switch=C_OPTIMIZE_SWITCH
+
+
+#ifdef SYSTEM_MALLOC
+configure___ system_malloc=yes
+#else
+configure___ system_malloc=no
+#endif
+
+#ifdef TERMINFO
+configure___ have_terminfo=yes
+#else
+configure___ have_terminfo=no
+#endif
+
+#ifdef MAIL_USE_FLOCK
+configure___ mail_use_flock=yes
+#else
+configure___ mail_use_flock=no
+#endif
+
+#ifdef MAIL_USE_LOCKF
+configure___ mail_use_lockf=yes
+#else
+configure___ mail_use_lockf=no
+#endif
+
+#ifdef __SUNPRO_C
+configure___ sunpro_c=yes
+#else
+configure___ sunpro_c=no
+#endif
+
+
+#ifdef THIS_IS_CONFIGURE
+
+/* Get the CFLAGS for tests in configure.  */
+#ifdef __GNUC__
+configure___ CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '$SPECIFIED_CFLAGS'
+#else
+configure___ CFLAGS=C_DEBUG_SWITCH '$SPECIFIED_CFLAGS'
+#endif
+
+#else /* not THIS_IS_CONFIGURE */
+
+/* Get the CFLAGS for real compilation.  */
+#ifdef __GNUC__
+configure___ REAL_CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '$SPECIFIED_CFLAGS'
+#else
+configure___ REAL_CFLAGS=C_DEBUG_SWITCH '$SPECIFIED_CFLAGS'
+#endif
+
+#endif /* not THIS_IS_CONFIGURE */
+' > $tempcname
+CPP=`eval "echo $CPP"`
+eval `$CPP -Isrc $tempcname \
+       | grep 'configure___' \
+       | sed -n -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/p'`
+if test -z "$SPECIFIED_CFLAGS"; then
+  eval `$CPP -Isrc -DTHIS_IS_CONFIGURE $tempcname \
+	 | grep 'configure___' \
+	 | sed -n -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/p'`
+else
+  REAL_CFLAGS="$CFLAGS"
+fi
+rm $tempcname
+
+if test "$cflags" != "NO_CFLAGS_DEFINED" ; then
+  REAL_CFLAGS=$cflags
+fi
+
+UNEXEC_SRC="`echo $unexec | sed 's/\.o/.c/'`"
+
+GNU_MALLOC=yes
+if test "$system_malloc" = "yes" ; then
+  GNU_MALLOC=no
+  GNU_MALLOC_reason="
+  (The GNU allocators don't work with this system configuration.)"
+elif test "$use_system_malloc" = "yes" ; then
+  GNU_MALLOC=no
+  GNU_MALLOC_reason="
+  (User chose not to use GNU allocators.)"
+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:2051: checking for $ac_word" >&5
+
+if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      RANLIB="ranlib"
+      ac_cv_prog_RANLIB="ranlib"
       break
     fi
   done
   IFS="$ac_save_ifs"
-fi
-test -z "$RANLIB" && RANLIB=":"
-test -n "$RANLIB" && test -n "$verbose" && echo "	setting RANLIB to $RANLIB"
-
-# Make sure to not get the incompatible SysV /etc/install and
-# /usr/sbin/install, which might be in PATH before a BSD-like install,
-# or the SunOS /usr/etc/install directory, or the AIX /bin/install,
-# or the AFS install, which mishandles nonexistent args, or
-# /usr/ucb/install on SVR4, which tries to use the nonexistent group
-# `staff', or /sbin/install on IRIX which has incompatible command-line
-# syntax.  Sigh.
-#
-#     On most BSDish systems install is in /usr/bin, not /usr/ucb
-#     anyway.
-# This turns out not to be true, so the mere pathname isn't an indication
-# of whether the program works.  What we really need is a set of tests for
-# the install program to see if it actually works in all the required ways.
-#
-# Avoid using ./install, which might have been erroneously created
-# by make from ./install.sh.
-if test -z "${INSTALL}"; then
-  test -n "$silent" || echo "checking for a BSD compatible install"
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  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; }
+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.
+
+# 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
+# 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:2104: checking for a BSD compatible install" >&5
+if test -z "$INSTALL"; then
+
+  IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
   for ac_dir in $PATH; do
-    case "$ac_dir" in
-    ''|.|/etc|/sbin|/usr/sbin|/usr/etc|/usr/afsws/bin|/usr/ucb) ;;
+    # 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.
-      for ac_prog in installbsd scoinst install; do
+      for ac_prog in ginstall installbsd 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
@@ -1809,7 +2118,7 @@
 	    # OSF/1 installbsd also uses dspmsg, but is usable.
 	    :
 	  else
-	    INSTALL="$ac_dir/$ac_prog -c"
+	    ac_cv_path_install="$ac_dir/$ac_prog -c"
 	    break 2
 	  fi
 	fi
@@ -1817,78 +2126,82 @@
       ;;
     esac
   done
-  IFS="$ac_save_ifs"
-fi
-
-if test -z "$INSTALL"; then
-  # As a last resort, use the slow shell script.
-  for ac_dir in ${srcdir} ${srcdir}/.. ${srcdir}/../..; do
-    if test -f $ac_dir/install.sh; then
-      INSTALL="$ac_dir/install.sh -c"; break
-    fi
-  done
-fi
-if test -z "$INSTALL"; then
-  echo "configure: can not find install.sh in ${srcdir} or ${srcdir}/.. or ${srcdir}/../.." >&2; exit 1
-fi
-test -n "$verbose" && echo "	setting INSTALL to $INSTALL"
-
-# Use test -z because SunOS4 sh mishandles ${INSTALL_PROGRAM-'${INSTALL}'}.
+  IFS="$ac_save_IFS"
+
+  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}'
-test -n "$verbose" && echo "	setting INSTALL_PROGRAM to $INSTALL_PROGRAM"
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-test -n "$verbose" && echo "	setting INSTALL_DATA to $INSTALL_DATA"
 
 for ac_prog in 'bison -y' byacc
 do
-if test -z "$YACC"; then
-  # Extract the first word of `$ac_prog', so it can be a program name with args.
-  set ac_dummy $ac_prog; ac_word=$2
-  test -n "$silent" || echo "checking for $ac_word"
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2155: checking for $ac_word" >&5
+
+if test -n "$YACC"; then
+  ac_cv_prog_YACC="$YACC" # Let the user override the test.
+else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      YACC="$ac_prog"
+      ac_cv_prog_YACC="$ac_prog"
       break
     fi
   done
   IFS="$ac_save_ifs"
 fi
-
-test -n "$YACC" && test -n "$verbose" && echo "	setting YACC to $YACC"
+YACC="$ac_cv_prog_YACC"
+if test -n "$YACC"; then
+  echo "$ac_t""$YACC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
 
 test -n "$YACC" && break
 done
 test -n "$YACC" || YACC="yacc"
 
 
-test -n "$silent" || echo "checking for AIX"
-cat > conftest.${ac_ext} <<EOF
+echo $ac_n "checking for AIX""... $ac_c" 1>&6
+echo "configure:2183: checking for AIX" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2185 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
 #endif
 
 EOF
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "yes" conftest.out >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining _ALL_SOURCE"
-echo "#define" _ALL_SOURCE "1" >> confdefs.h
-DEFS="$DEFS -D_ALL_SOURCE=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}_ALL_SOURCE\${ac_dB}_ALL_SOURCE\${ac_dC}1\${ac_dD}
-\${ac_uA}_ALL_SOURCE\${ac_uB}_ALL_SOURCE\${ac_uC}1\${ac_uD}
-\${ac_eA}_ALL_SOURCE\${ac_eB}_ALL_SOURCE\${ac_eC}1\${ac_eD}
-"
-}
-
-
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "yes" >/dev/null 2>&1; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining _ALL_SOURCE
+EOF
+cat >> confdefs.h <<\EOF
+#define _ALL_SOURCE 1
+EOF
+}
+
+else
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
 fi
 rm -f conftest*
 
@@ -1896,223 +2209,307 @@
 
 for ac_hdr in mach/mach.h sys/stropts.h sys/timeb.h sys/time.h unistd.h
 do
-ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./' '[A-Z]__'`
-test -n "$silent" || echo "checking for ${ac_hdr}"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <${ac_hdr}>
-EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2215: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2218 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining ${ac_tr_hdr}"
-echo "#define" ${ac_tr_hdr} "1" >> confdefs.h
-DEFS="$DEFS -D${ac_tr_hdr}=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}${ac_tr_hdr}\${ac_dB}${ac_tr_hdr}\${ac_dC}1\${ac_dD}
-\${ac_uA}${ac_tr_hdr}\${ac_uB}${ac_tr_hdr}\${ac_uC}1\${ac_uD}
-\${ac_eA}${ac_tr_hdr}\${ac_eB}${ac_tr_hdr}\${ac_eC}1\${ac_eD}
-"
-}
-
-
-fi
-rm -f 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"
+fi
+rm -f conftest*
+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___%'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_hdr
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+}
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
 done
 
 for ac_hdr in utime.h sys/wait.h libintl.h locale.h libgen.h
 do
-ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./' '[A-Z]__'`
-test -n "$silent" || echo "checking for ${ac_hdr}"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <${ac_hdr}>
-EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2256: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2259 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining ${ac_tr_hdr}"
-echo "#define" ${ac_tr_hdr} "1" >> confdefs.h
-DEFS="$DEFS -D${ac_tr_hdr}=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}${ac_tr_hdr}\${ac_dB}${ac_tr_hdr}\${ac_dC}1\${ac_dD}
-\${ac_uA}${ac_tr_hdr}\${ac_uB}${ac_tr_hdr}\${ac_uC}1\${ac_uD}
-\${ac_eA}${ac_tr_hdr}\${ac_eB}${ac_tr_hdr}\${ac_eC}1\${ac_eD}
-"
-}
-
-
-fi
-rm -f 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"
+fi
+rm -f conftest*
+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___%'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_hdr
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+}
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
 done
 
 for ac_hdr in linux/version.h kstat.h sys/pstat.h inttypes.h
 do
-ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./' '[A-Z]__'`
-test -n "$silent" || echo "checking for ${ac_hdr}"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <${ac_hdr}>
-EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:2297: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2300 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining ${ac_tr_hdr}"
-echo "#define" ${ac_tr_hdr} "1" >> confdefs.h
-DEFS="$DEFS -D${ac_tr_hdr}=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}${ac_tr_hdr}\${ac_dB}${ac_tr_hdr}\${ac_dC}1\${ac_dD}
-\${ac_uA}${ac_tr_hdr}\${ac_uB}${ac_tr_hdr}\${ac_uC}1\${ac_uD}
-\${ac_eA}${ac_tr_hdr}\${ac_eB}${ac_tr_hdr}\${ac_eC}1\${ac_eD}
-"
-}
-
-
-fi
-rm -f 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"
+fi
+rm -f conftest*
+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___%'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_hdr
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+}
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
 done
 
-test -n "$silent" || echo "checking for ANSI C header files"
-cat > conftest.${ac_ext} <<EOF
+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+echo "configure:2335: checking for ANSI C header files" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2338 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <float.h>
 EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
+  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
+fi
+rm -f conftest*
+
+if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-echo '#include "confdefs.h"
-#include <string.h>' > conftest.${ac_ext}
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "memchr" conftest.out >/dev/null 2>&1; then
-  rm -rf conftest*
-  # SGI's /bin/cc from Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-cat > conftest.${ac_ext} <<EOF
+cat > conftest.$ac_ext <<EOF
+#line 2363 "configure"
+#include "confdefs.h"
+#include <string.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "memchr" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 2381 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "free" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+cat > conftest.$ac_ext <<EOF
+#line 2399 "configure"
 #include "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)))
+#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); }
 
 EOF
-eval $ac_compile
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-echo '#include "confdefs.h"
-#include <stdlib.h>' > conftest.${ac_ext}
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "free" conftest.out >/dev/null 2>&1; then
-  rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining STDC_HEADERS"
-echo "#define" STDC_HEADERS "1" >> confdefs.h
-DEFS="$DEFS -DSTDC_HEADERS=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}STDC_HEADERS\${ac_dB}STDC_HEADERS\${ac_dC}1\${ac_dD}
-\${ac_uA}STDC_HEADERS\${ac_uB}STDC_HEADERS\${ac_uC}1\${ac_uD}
-\${ac_eA}STDC_HEADERS\${ac_eB}STDC_HEADERS\${ac_eC}1\${ac_eD}
-"
-}
-
-
-fi
-rm -f conftest*
-
-
+if { (eval echo configure:2410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_header_stdc=no
 fi
 rm -fr conftest*
-
-fi
-rm -f conftest*
-
-
-fi
-rm -f conftest*
-
-test -n "$silent" || echo "checking for whether time.h and sys/time.h may both be included"
-cat > conftest.${ac_ext} <<EOF
+fi
+
+echo "$ac_t""$ac_cv_header_stdc" 1>&6
+if test $ac_cv_header_stdc = yes; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining STDC_HEADERS
+EOF
+cat >> confdefs.h <<\EOF
+#define STDC_HEADERS 1
+EOF
+}
+
+fi
+
+echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
+echo "configure:2435: checking whether time.h and sys/time.h may both be included" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2438 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include <time.h>
-int main() { return 0; }
-int t() { struct tm *tp;; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining TIME_WITH_SYS_TIME"
-echo "#define" TIME_WITH_SYS_TIME "1" >> confdefs.h
-DEFS="$DEFS -DTIME_WITH_SYS_TIME=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}TIME_WITH_SYS_TIME\${ac_dB}TIME_WITH_SYS_TIME\${ac_dC}1\${ac_dD}
-\${ac_uA}TIME_WITH_SYS_TIME\${ac_uB}TIME_WITH_SYS_TIME\${ac_uC}1\${ac_uD}
-\${ac_eA}TIME_WITH_SYS_TIME\${ac_eB}TIME_WITH_SYS_TIME\${ac_eC}1\${ac_eD}
-"
-}
-
-
-fi
-rm -f conftest*
-
-test -n "$silent" || echo "checking for sys_siglist declaration in signal.h or unistd.h"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
+int main() {
+struct tm *tp;
+; return 0; }
+EOF
+if { (eval echo configure:2447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_header_time=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_time=no
+fi
+rm -f conftest*
+
+echo "$ac_t""$ac_cv_header_time" 1>&6
+if test $ac_cv_header_time = yes; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining TIME_WITH_SYS_TIME
+EOF
+cat >> confdefs.h <<\EOF
+#define TIME_WITH_SYS_TIME 1
+EOF
+}
+
+fi
+
+echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
+echo "configure:2471: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2474 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
 #include <signal.h>
-/* NetBSD declares sys_siglist in <unistd.h>.  */
+/* NetBSD declares sys_siglist in unistd.h.  */
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-int main() { return 0; }
-int t() { char *msg = *(sys_siglist + 1);; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining SYS_SIGLIST_DECLARED"
-echo "#define" SYS_SIGLIST_DECLARED "1" >> confdefs.h
-DEFS="$DEFS -DSYS_SIGLIST_DECLARED=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}SYS_SIGLIST_DECLARED\${ac_dB}SYS_SIGLIST_DECLARED\${ac_dC}1\${ac_dD}
-\${ac_uA}SYS_SIGLIST_DECLARED\${ac_uB}SYS_SIGLIST_DECLARED\${ac_uC}1\${ac_uD}
-\${ac_eA}SYS_SIGLIST_DECLARED\${ac_eB}SYS_SIGLIST_DECLARED\${ac_eC}1\${ac_eD}
-"
-}
-
-
-fi
-rm -f conftest*
-
-
-test -n "$silent" || echo "checking for struct utimbuf"
-cat > conftest.${ac_ext} <<EOF
+int main() {
+char *msg = *(sys_siglist + 1);
+; return 0; }
+EOF
+if { (eval echo configure:2486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_decl_sys_siglist=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_decl_sys_siglist=no
+fi
+rm -f conftest*
+
+echo "$ac_t""$ac_cv_decl_sys_siglist" 1>&6
+if test $ac_cv_decl_sys_siglist = yes; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining SYS_SIGLIST_DECLARED
+EOF
+cat >> confdefs.h <<\EOF
+#define SYS_SIGLIST_DECLARED 1
+EOF
+}
+
+fi
+
+
+echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
+echo "configure:2511: checking for struct utimbuf" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2513 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -2127,76 +2524,76 @@
 #ifdef HAVE_UTIME_H
 #include <utime.h>
 #endif
-int main() { return 0; }
-int t() { static struct utimbuf x; x.actime = x.modtime;; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining HAVE_STRUCT_UTIMBUF"
-echo "#define" HAVE_STRUCT_UTIMBUF "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_STRUCT_UTIMBUF=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_STRUCT_UTIMBUF\${ac_dB}HAVE_STRUCT_UTIMBUF\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_STRUCT_UTIMBUF\${ac_uB}HAVE_STRUCT_UTIMBUF\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_STRUCT_UTIMBUF\${ac_eB}HAVE_STRUCT_UTIMBUF\${ac_eC}1\${ac_eD}
-"
-}
-
-
-fi
-rm -f conftest*
-
-
-test -n "$silent" || echo "checking for return type of signal handlers"
-cat > conftest.${ac_ext} <<EOF
+int main() {
+static struct utimbuf x; x.actime = x.modtime;
+; return 0; }
+EOF
+if { (eval echo configure:2532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6
+   { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_STRUCT_UTIMBUF
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_STRUCT_UTIMBUF 1
+EOF
+}
+
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
+fi
+rm -f conftest*
+
+echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+echo "configure:2552: checking return type of signal handlers" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2555 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
 #ifdef signal
 #undef signal
 #endif
-extern void (*signal ()) ();
-int main() { return 0; }
-int t() { int i;; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining" RETSIGTYPE to be "void"
-echo "#define" RETSIGTYPE "void" >> confdefs.h
-DEFS="$DEFS -DRETSIGTYPE=void"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}RETSIGTYPE\${ac_dB}RETSIGTYPE\${ac_dC}void\${ac_dD}
-\${ac_uA}RETSIGTYPE\${ac_uB}RETSIGTYPE\${ac_uC}void\${ac_uD}
-\${ac_eA}RETSIGTYPE\${ac_eB}RETSIGTYPE\${ac_eC}void\${ac_eD}
-"
-}
-
-
-else
-  rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining" RETSIGTYPE to be "int"
-echo "#define" RETSIGTYPE "int" >> confdefs.h
-DEFS="$DEFS -DRETSIGTYPE=int"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}RETSIGTYPE\${ac_dB}RETSIGTYPE\${ac_dC}int\${ac_dD}
-\${ac_uA}RETSIGTYPE\${ac_uB}RETSIGTYPE\${ac_uC}int\${ac_uD}
-\${ac_eA}RETSIGTYPE\${ac_eB}RETSIGTYPE\${ac_eC}int\${ac_eD}
-"
-}
-
-fi
-rm -f conftest*
-
-
-
-test -n "$silent" || echo "checking for struct timeval"
-cat > conftest.${ac_ext} <<EOF
+#ifdef __cplusplus
+extern "C" void (*signal (int, void (*)(int)))(int);
+#else
+void (*signal ()) ();
+#endif
+
+int main() {
+int i;
+; return 0; }
+EOF
+if { (eval echo configure:2572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_type_signal=void
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_type_signal=int
+fi
+rm -f conftest*
+
+echo "$ac_t""$ac_cv_type_signal" 1>&6
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining RETSIGTYPE = $ac_cv_type_signal
+EOF
+cat >> confdefs.h <<EOF
+#define RETSIGTYPE $ac_cv_type_signal
+EOF
+}
+
+
+
+echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
+echo "configure:2595: checking for struct timeval" >&5
+cat > conftest.$ac_ext <<EOF
+#line 2597 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -2208,135 +2605,156 @@
 #include <time.h>
 #endif
 #endif
-int main() { return 0; }
-int t() { static struct timeval x; x.tv_sec = x.tv_usec;; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  
+int main() {
+static struct timeval x; x.tv_sec = x.tv_usec;
+; return 0; }
+EOF
+if { (eval echo configure:2613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6
   HAVE_TIMEVAL=yes
-  
-{
-test -n "$verbose" && \
-echo "	defining HAVE_TIMEVAL"
-echo "#define" HAVE_TIMEVAL "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_TIMEVAL=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_TIMEVAL\${ac_dB}HAVE_TIMEVAL\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_TIMEVAL\${ac_uB}HAVE_TIMEVAL\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_TIMEVAL\${ac_eB}HAVE_TIMEVAL\${ac_eC}1\${ac_eD}
-"
-}
-
-
-else
-  rm -rf conftest*
-  HAVE_TIMEVAL=no
-fi
-rm -f conftest*
-
-
-test -n "$silent" || echo "checking for struct tm in time.h"
-cat > conftest.${ac_ext} <<EOF
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_TIMEVAL
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_TIMEVAL 1
+EOF
+}
+
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
+   HAVE_TIMEVAL=no
+fi
+rm -f conftest*
+
+echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
+echo "configure:2635: checking whether struct tm is in sys/time.h or time.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2638 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
-int main() { return 0; }
-int t() { struct tm *tp; tp->tm_sec;; return 0; }
-EOF
-if eval $ac_compile; then
-  :
-else
-  rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining TM_IN_SYS_TIME"
-echo "#define" TM_IN_SYS_TIME "1" >> confdefs.h
-DEFS="$DEFS -DTM_IN_SYS_TIME=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}TM_IN_SYS_TIME\${ac_dB}TM_IN_SYS_TIME\${ac_dC}1\${ac_dD}
-\${ac_uA}TM_IN_SYS_TIME\${ac_uB}TM_IN_SYS_TIME\${ac_uC}1\${ac_uD}
-\${ac_eA}TM_IN_SYS_TIME\${ac_eB}TM_IN_SYS_TIME\${ac_eC}1\${ac_eD}
-"
-}
-
-fi
-rm -f conftest*
-
-ac_decl='#include <sys/types.h>
-'
-case "$DEFS" in
-  *TM_IN_SYS_TIME*) ac_decl="$ac_decl
-#include <sys/time.h>
-" ;;
-  *) ac_decl="$ac_decl
-#include <time.h>
-" ;;
-esac
-test -n "$silent" || echo "checking for tm_zone in struct tm"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-$ac_decl
-int main() { return 0; }
-int t() { struct tm tm; tm.tm_zone;; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining HAVE_TM_ZONE"
-echo "#define" HAVE_TM_ZONE "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_TM_ZONE=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_TM_ZONE\${ac_dB}HAVE_TM_ZONE\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_TM_ZONE\${ac_uB}HAVE_TM_ZONE\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_TM_ZONE\${ac_eB}HAVE_TM_ZONE\${ac_eC}1\${ac_eD}
-"
-}
-
-
-else
-  rm -rf conftest*
-  ac_no_tm_zone=1
-fi
-rm -f conftest*
-
-if test -n "$ac_no_tm_zone"; then
-test -n "$silent" || echo "checking for tzname"
-cat > conftest.${ac_ext} <<EOF
+int main() {
+struct tm *tp; tp->tm_sec;
+; return 0; }
+EOF
+if { (eval echo configure:2646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_struct_tm=time.h
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_struct_tm=sys/time.h
+fi
+rm -f conftest*
+
+echo "$ac_t""$ac_cv_struct_tm" 1>&6
+if test $ac_cv_struct_tm = sys/time.h; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining TM_IN_SYS_TIME
+EOF
+cat >> confdefs.h <<\EOF
+#define TM_IN_SYS_TIME 1
+EOF
+}
+
+fi
+
+echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
+echo "configure:2670: checking for tm_zone in struct tm" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2673 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <$ac_cv_struct_tm>
+int main() {
+struct tm tm; tm.tm_zone;
+; return 0; }
+EOF
+if { (eval echo configure:2681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_struct_tm_zone=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_struct_tm_zone=no
+fi
+rm -f conftest*
+
+echo "$ac_t""$ac_cv_struct_tm_zone" 1>&6
+if test "$ac_cv_struct_tm_zone" = yes; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_TM_ZONE
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_TM_ZONE 1
+EOF
+}
+
+else
+  echo $ac_n "checking for tzname""... $ac_c" 1>&6
+echo "configure:2704: checking for tzname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2707 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
-extern char *tzname[]; /* RS6000 and others want it this way.  */
+extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
 #endif
-int main() { return 0; }
-int t() { atoi(*tzname);; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining HAVE_TZNAME"
-echo "#define" HAVE_TZNAME "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_TZNAME=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_TZNAME\${ac_dB}HAVE_TZNAME\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_TZNAME\${ac_uB}HAVE_TZNAME\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_TZNAME\${ac_eB}HAVE_TZNAME\${ac_eC}1\${ac_eD}
-"
-}
-
-
-fi
-rm -f conftest*
-
-fi
-
-
-ac_prog='/* Ultrix mips cc rejects this.  */
+int main() {
+atoi(*tzname);
+; return 0; }
+EOF
+if { (eval echo configure:2717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_var_tzname=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_var_tzname=no
+fi
+rm -f conftest*
+
+echo "$ac_t""$ac_cv_var_tzname" 1>&6
+  if test $ac_cv_var_tzname = yes; then
+    { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_TZNAME
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_TZNAME 1
+EOF
+}
+
+  fi
+fi
+
+
+echo $ac_n "checking for working const""... $ac_c" 1>&6
+echo "configure:2743: checking for working const" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 2746 "configure"
+#include "confdefs.h"
+
+int main() {
+
+/* 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 */
@@ -2353,7 +2771,7 @@
   *t++ = 0;
 }
 { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-  int x[] = {25,17};
+  int x[] = {25, 17};
   const int *foo = &x[0];
   ++foo;
 }
@@ -2369,47 +2787,109 @@
 }
 { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
   const int foo = 10;
-}'
-test -n "$silent" || echo "checking for lack of working const"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { $ac_prog; return 0; }
-EOF
-if eval $ac_compile; then
-  :
-else
-  rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining" const to be empty
-echo "#define" const "" >> confdefs.h
-DEFS="$DEFS -Dconst="
-ac_sed_defs="${ac_sed_defs}\${ac_dA}const\${ac_dB}const\${ac_dC}\${ac_dD}
-\${ac_uA}const\${ac_uB}const\${ac_uC}\${ac_uD}
-\${ac_eA}const\${ac_eB}const\${ac_eC}\${ac_eD}
-"
-}
-
-fi
-rm -f conftest*
-
-
-cat > conftestmake <<'EOF'
+}
+
+; return 0; }
+EOF
+if { (eval echo configure:2795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_const=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_c_const=no
+fi
+rm -f conftest*
+
+echo "$ac_t""$ac_cv_c_const" 1>&6
+if test $ac_cv_c_const = no; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining const = 
+EOF
+cat >> confdefs.h <<\EOF
+#define const 
+EOF
+}
+
+fi
+
+
+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+echo "configure:2820: checking whether ${MAKE-make} sets \${MAKE}" >&5
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+
+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 SET_MAKE=
-else SET_MAKE="MAKE=${MAKE-make}"; fi
+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 conftestmake
-
-
-test -n "$silent" || echo "checking byte ordering"
-cat > conftest.${ac_ext} <<EOF
+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}"
+fi
+
+
+echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+echo "configure:2845: checking whether byte ordering is bigendian" >&5
+
+ac_cv_c_bigendian=unknown
+# See if sys/param.h defines the BYTE_ORDER macro.
+cat > conftest.$ac_ext <<EOF
+#line 2850 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/param.h>
+int main() {
+
+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+ bogus endian macros
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:2861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+cat > conftest.$ac_ext <<EOF
+#line 2865 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/param.h>
+int main() {
+
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:2876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_bigendian=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_c_bigendian=no
+fi
+rm -f conftest*
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+if test $ac_cv_c_bigendian = unknown; then
+cat > conftest.$ac_ext <<EOF
+#line 2893 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -2422,119 +2902,215 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-eval $ac_compile
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
-  :
-else
-  
-{
-test -n "$verbose" && \
-echo "	defining WORDS_BIGENDIAN"
-echo "#define" WORDS_BIGENDIAN "1" >> confdefs.h
-DEFS="$DEFS -DWORDS_BIGENDIAN=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}WORDS_BIGENDIAN\${ac_dB}WORDS_BIGENDIAN\${ac_dC}1\${ac_dD}
-\${ac_uA}WORDS_BIGENDIAN\${ac_uB}WORDS_BIGENDIAN\${ac_uC}1\${ac_uD}
-\${ac_eA}WORDS_BIGENDIAN\${ac_eB}WORDS_BIGENDIAN\${ac_eC}1\${ac_eD}
-"
-}
-
+if { (eval echo configure:2906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_c_bigendian=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_c_bigendian=yes
 fi
 rm -fr conftest*
-
-
-test -n "$silent" || echo "checking for long file names"
-ac_some_dir_failed=false
+fi
+
+echo "$ac_t""$ac_cv_c_bigendian" 1>&6
+if test $ac_cv_c_bigendian = yes; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining WORDS_BIGENDIAN
+EOF
+cat >> confdefs.h <<\EOF
+#define WORDS_BIGENDIAN 1
+EOF
+}
+
+fi
+
+
+echo $ac_n "checking for long file names""... $ac_c" 1>&6
+echo "configure:2932: checking for long file names" >&5
+
+ac_cv_sys_long_file_names=yes
 # Test for long file names in all the places we know might matter:
 #      .		the current directory, where building will happen
+#      $prefix/lib	where we will be installing things
+#      $exec_prefix/lib	likewise
+# eval it to expand exec_prefix.
+#      $TMPDIR		if set, where it might want to write temporary files
+# if $TMPDIR is not set:
 #      /tmp		where it might want to write temporary files
 #      /var/tmp		likewise
 #      /usr/tmp		likewise
-#      $prefix/lib	where we will be installing things
-#      $exec_prefix/lib	likewise
-# eval it to expand exec_prefix.
-for ac_dir in `eval echo . /tmp /var/tmp /usr/tmp $prefix/lib $exec_prefix/lib` ; do
+if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then
+  ac_tmpdirs="$TMPDIR"
+else
+  ac_tmpdirs='/tmp /var/tmp /usr/tmp'
+fi
+for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
   test -d $ac_dir || continue
-  test -w $ac_dir || continue # It's less confusing to not echo anything here.
+  test -w $ac_dir || continue # It is less confusing to not echo anything here.
   (echo 1 > $ac_dir/conftest9012345) 2>/dev/null
   (echo 2 > $ac_dir/conftest9012346) 2>/dev/null
   val=`cat $ac_dir/conftest9012345 2>/dev/null`
-  test -f $ac_dir/conftest9012345 && test "$val" = 1 || ac_some_dir_failed=true
-  rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2> /dev/null
-done
-$ac_some_dir_failed || 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_LONG_FILE_NAMES"
-echo "#define" HAVE_LONG_FILE_NAMES "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_LONG_FILE_NAMES=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_LONG_FILE_NAMES\${ac_dB}HAVE_LONG_FILE_NAMES\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_LONG_FILE_NAMES\${ac_uB}HAVE_LONG_FILE_NAMES\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_LONG_FILE_NAMES\${ac_eB}HAVE_LONG_FILE_NAMES\${ac_eC}1\${ac_eD}
-"
-}
-
-
-
-echo "checking for -xildoff compiler flag"
-if   ${CC-cc} '-###' -xildon  no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then
-  if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then
-    :
-  else
-    test -n "$verbose" && echo "	defining NEED_XILDOFF"
-    need_xildoff=yes 
+  if test ! -f $ac_dir/conftest9012345 || test "$val" != 1; then
+    ac_cv_sys_long_file_names=no
+    rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>/dev/null
+    break
   fi
-fi
-
-# What the hell was this doing here??????
-### echo > confdefs.h		# this gets nuked above...
-
-############################################################################
-#									   #
-#                         Choose a window system                           #
-#									   #
-############################################################################
-
-#### Choose a window system.
-echo "checking for specified window system"
-
-window_system=''
-case "${with_x11}" in 
-  yes ) window_system=${window_system}x11  ;;
-  no  ) window_system=${window_system}none ;;
-esac
-
-case "${window_system}" in
-  "none" | "x11" ) ;;
-  "" )
-    # --x-includes or --x-libraries implies --with-x11.
-    if test -n "${x_includes}" -o -n "${x_libraries}"; then
-      window_system=x11
-    else
-      echo "  No window system specified.  Looking for X11."
-      # If the user didn't specify a window system and we found X11, use it.
-      if test -r /usr/lib/libX11.a \
-         -o -d /usr/include/X11 \
-         -o -d /usr/X386/include \
-         -o -d /usr/X11R6/include \
-	 -o -d ${x_includes}/X11 ; then
-        window_system=x11
-      fi
-    fi
-  ;;
-  * )
-    echo "Don't specify a window system more than once." >&2
-    exit 1
-  ;;
-esac
-
-case "${window_system}" in "" | "x11" )
-    ### If the user hasn't specified where we should find X, try
-    ### letting autoconf figure that out.
-    if test -z "${x_includes}${x_libraries}" ; then 
-     # If we find X, set shell vars x_includes and x_libraries to the paths.
-no_x=true
-if test "x$with_x" != xno; then
-test -n "$silent" || echo "checking for X include and library files with xmkmf"
+  rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>/dev/null
+done
+
+echo "$ac_t""$ac_cv_sys_long_file_names" 1>&6
+if test $ac_cv_sys_long_file_names = yes; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_LONG_FILE_NAMES
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_LONG_FILE_NAMES 1
+EOF
+}
+
+fi
+
+
+
+
+echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
+echo "configure:2980: checking for sqrt in -lm" >&5
+ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lm "
+cat > conftest.$ac_ext <<EOF
+#line 2985 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char sqrt();
+
+int main() {
+sqrt()
+; return 0; }
+EOF
+if { (eval echo configure:2996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_lib
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+}
+
+  LIBS="-lm $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+echo "checking type of mail spool file locking" 1>&6
+echo "configure:3029: checking type of mail spool file locking" >&5
+test -z "$mail_locking" -a "$mail_use_flock" = "yes" && mail_locking=flock
+test -z "$mail_locking" -a "$mail_use_lockf" = "yes" && mail_locking=lockf
+if   test "$mail_locking" = "lockf"; then { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining REAL_MAIL_USE_LOCKF
+EOF
+cat >> confdefs.h <<\EOF
+#define REAL_MAIL_USE_LOCKF 1
+EOF
+}
+
+elif test "$mail_locking" = "flock"; then { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining REAL_MAIL_USE_FLOCK
+EOF
+cat >> confdefs.h <<\EOF
+#define REAL_MAIL_USE_FLOCK 1
+EOF
+}
+
+fi
+
+if test "$need_dynodump" = "yes" ; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining DYNODUMP
+EOF
+cat >> confdefs.h <<\EOF
+#define DYNODUMP 1
+EOF
+}
+
+  MAKE_SUBDIR="$MAKE_SUBDIR dynodump"
+  case "$canonical" in
+    sparc*   ) dynodump_arch=sparc ;;
+    powerpc* ) dynodump_arch=ppc   ;;
+    i*86*    ) dynodump_arch=i386  ;;
+  esac
+    test "$GCC" = "yes" && ld_switch_site="-fno-gnu-linker $ld_switch_site"
+fi
+
+for dir in "/usr/ccs/lib"; do
+  test -d "$dir" && ld_switch_site="$ld_switch_site -L${dir}"
+done
+
+
+echo "checking "for specified window system"" 1>&6
+echo "configure:3074: checking "for specified window system"" >&5
+
+if test "$x_includes $x_libraries" = "NONE NONE"; then
+  if test -n "$OPENWINHOME" \
+   -a "$OPENWINHOME" != "/usr/openwin" \
+   -a -d "$OPENWINHOME"; then
+    test -d "$OPENWINHOME/lib"           && x_libraries="$OPENWINHOME/lib"
+    test -d "$OPENWINHOME/include"       && x_includes="$OPENWINHOME/include"
+    test -d "$OPENWINHOME/share/include" && x_includes="$OPENWINHOME/share/include"
+  fi
+fi
+
+test "$x_includes $x_libraries" != "NONE NONE" && \
+ window_system=x11 with_x11=yes
+
+if test "$with_x11" != "no"; then
+  # 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:3095: checking for X" >&5
+
+# Check whether --with-x or --without-x was given.
+if test "${with_x+set}" = set; then
+  withval="$with_x"
+  :
+fi
+
+# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+if test "x$with_x" = xno; then
+  # The user explicitly disabled X.
+  have_x=disabled
+else
+  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
+    # Both variables are already set.
+    have_x=yes
+  else
+
+# One or both of the vars are not set, and there is no cached value.
+ac_x_includes=NO ac_x_libraries=NO
 rm -fr conftestdir
 if mkdir conftestdir; then
   cd conftestdir
@@ -2544,71 +3120,76 @@
 	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
 EOF
   if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-    no_x=
     # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    eval `make acfindx 2>/dev/null | grep -v make`
+    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    if test ! -f $ac_im_usrlibdir/libX11.a && test -f $ac_im_libdir/libX11.a
-    then
-      ac_im_usrlibdir=$ac_im_libdir
-    fi
+    for ac_extension in a so sl; do
+      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+        test -f $ac_im_libdir/libX11.$ac_extension; then
+        ac_im_usrlibdir=$ac_im_libdir; break
+      fi
+    done
+    # Screen out bogus values from the imake configuration.  They are
+    # bogus both because they are the default anyway, and because
+    # using them would break gcc on systems where it needs fixed includes.
     case "$ac_im_incroot" in
 	/usr/include) ;;
-	*) test -z "$x_includes" && x_includes="$ac_im_incroot" ;;
+	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
     esac
     case "$ac_im_usrlibdir" in
 	/usr/lib | /lib) ;;
-	*) test -z "$x_libraries" && x_libraries="$ac_im_usrlibdir" ;;
+	*) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
     esac
   fi
   cd ..
   rm -fr conftestdir
 fi
 
-if test -z "$ac_im_usrlibdir"; then
-test -n "$silent" || echo "checking for X include and library files directly"
-if test ".$x_direct_test_library" = . ; then
-   x_direct_test_library='Xt'
-fi
-if test ".$x_direct_test_include" = . ; then
-   x_direct_test_include='X11/Intrinsic.h'
-fi
-cat > conftest.${ac_ext} <<EOF
+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
+
+  # First, try using that file with no special directory specified.
+cat > conftest.$ac_ext <<EOF
+#line 3155 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:3160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
-  no_x=
-
-else
-  rm -rf conftest*
+  # 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/X11/include          \
-    /usr/include/X11          \
-    /usr/local/X11/include    \
-    /usr/local/include/X11    \
-                              \
     /usr/X386/include         \
     /usr/x386/include         \
     /usr/XFree86/include/X11  \
@@ -2625,58 +3206,65 @@
     ; \
   do
     if test -r "$ac_dir/$x_direct_test_include"; then
-      test -z "$x_includes" && x_includes=$ac_dir
-      no_x=
+      ac_x_includes=$ac_dir
       break
     fi
   done
 fi
 rm -f conftest*
-
-# Check for the libraries.  First see if replacing the `include' by
-# `lib' works.
-ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -l"$x_direct_test_library""
-ac_have_lib=""
-test -n "$silent" || echo "checking for -l"$x_direct_test_library""
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; no_x=
-else
-   :; for ac_dir in `echo "$x_includes" | sed s/include/lib/` \
+fi # $ac_x_includes = NO
+
+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 3229 "configure"
+#include "confdefs.h"
+
+int main() {
+${x_direct_test_function}()
+; return 0; }
+EOF
+if { (eval echo configure:3236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  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/X11/lib          \
-    /usr/lib/X11          \
-    /usr/local/X11/lib    \
-    /usr/local/lib/X11    \
-                          \
     /usr/X386/lib         \
     /usr/x386/lib         \
     /usr/XFree86/lib/X11  \
@@ -2687,6 +3275,7 @@
     /usr/athena/lib       \
     /usr/local/x11r5/lib  \
     /usr/lpp/Xamples/lib  \
+    /lib/usr/lib/X11	  \
                           \
     /usr/openwin/lib      \
     /usr/openwin/share/lib \
@@ -2694,53 +3283,1192 @@
 do
   for ac_extension in a so sl; do
     if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-      test -z "$x_libraries" && x_libraries=$ac_dir
-      no_x=
+      ac_x_libraries=$ac_dir
       break 2
     fi
   done
 done
 fi
-
-fi
-test -n "$x_includes" && test -n "$verbose" && echo "	X11 headers are in $x_includes"
-test -n "$x_libraries" && test -n "$verbose" && echo "	X11 libraries are in $x_libraries"
-fi
+rm -f conftest*
+fi # $ac_x_libraries = NO
+
+if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
+  # Didn't find X anywhere.  Cache the known absence of X.
+  ac_cv_have_x="have_x=no"
+else
+  # Record where we found X for the cache.
+  ac_cv_have_x="have_x=yes \
+	        ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
+fi
+  fi
+  eval "$ac_cv_have_x"
+fi # $with_x != no
+
+if test "$have_x" != yes; then
+  echo "$ac_t""$have_x" 1>&6
+  no_x=yes
+else
+  # If each of the values was on the command line, it overrides each guess.
+  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
+  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
+  # Update the cache value to reflect the command line values.
+  ac_cv_have_x="have_x=yes \
+		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+  echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
+fi
+
+if test "$no_x" = yes; then
+  # Not all programs may use this symbol, but it does not hurt to define it.
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining X_DISPLAY_MISSING
+EOF
+cat >> confdefs.h <<\EOF
+#define X_DISPLAY_MISSING 1
+EOF
+}
+
+  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
+else
+  if test -n "$x_includes"; then
+    X_CFLAGS="$X_CFLAGS -I$x_includes"
+  fi
+
+  # It would also be nice to do this for all -L options, not just this one.
+  if test -n "$x_libraries"; then
+    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
+    "SunOS 5"*)
+      echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
+echo "configure:3345: 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 3348 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:3355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_R_nospace=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_R_nospace=no
+fi
+rm -f conftest*
+      if test $ac_R_nospace = yes; then
+	echo "$ac_t""no" 1>&6
+	X_LIBS="$X_LIBS -R$x_libraries"
+      else
+	LIBS="$ac_xsave_LIBS -R $x_libraries"
+	cat > conftest.$ac_ext <<EOF
+#line 3371 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:3378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_R_space=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_R_space=no
+fi
+rm -f conftest*
+	if test $ac_R_space = yes; then
+	  echo "$ac_t""yes" 1>&6
+	  X_LIBS="$X_LIBS -R $x_libraries"
+	else
+	  echo "$ac_t""neither works" 1>&6
+	fi
+      fi
+      LIBS="$ac_xsave_LIBS"
+    esac
+  fi
+
+  # Check for system-dependent libraries X programs must link with.
+  # Do this before checking for the system-independent R6 libraries
+  # (-lICE), since we may need -lsocket or whatever for X linking.
+
+  if test "$ISC" = yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
+  else
+    # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
+    # libraries were built with DECnet support.  And karl@cs.umb.edu says
+    # the Alpha needs dnet_stub (dnet does not exist).
+    if test "$with_dnet" = "no"; then
+ac_cv_lib_dnet_dnet_ntoa=no
+else
+
+echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
+echo "configure:3414: checking for dnet_ntoa in -ldnet" >&5
+ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -ldnet "
+cat > conftest.$ac_ext <<EOF
+#line 3419 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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:3430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+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:3454: checking for dnet_ntoa in -ldnet_stub" >&5
+ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -ldnet_stub "
+cat > conftest.$ac_ext <<EOF
+#line 3459 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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:3470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+    fi
+
+    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+    # to get the SysV transport functions.
+    # chad@anasazi.com 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@clark.net.
+    echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+echo "configure:3499: checking for gethostbyname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3502 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char gethostbyname(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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() {
+
+/* 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();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "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*
+
+if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    if test $ac_cv_func_gethostbyname = no; then
+      
+echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+echo "configure:3546: checking for gethostbyname in -lnsl" >&5
+ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lnsl "
+cat > conftest.$ac_ext <<EOF
+#line 3551 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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:3562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+    fi
+
+    # lieder@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@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:3592: checking for connect" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3595 "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.  */
+/* 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() {
+
+/* 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();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "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*
+
+if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    if test $ac_cv_func_connect = no; then
+      
+xe_msg_checking="for connect in -lsocket"
+test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
+echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
+echo "configure:3641: checking "$xe_msg_checking"" >&5
+ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lsocket $X_EXTRA_LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 3646 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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:3657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+    fi
+
+    # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
+    echo $ac_n "checking for remove""... $ac_c" 1>&6
+echo "configure:3681: checking for remove" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3684 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char remove(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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() {
+
+/* 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();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "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*
+
+if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    if test $ac_cv_func_remove = no; then
+      
+echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
+echo "configure:3728: checking for remove in -lposix" >&5
+ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lposix "
+cat > conftest.$ac_ext <<EOF
+#line 3733 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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:3744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  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:3768: checking for shmat" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3771 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char shmat(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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() {
+
+/* 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();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:3794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "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*
+
+if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    if test $ac_cv_func_shmat = no; then
+      
+echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
+echo "configure:3815: checking for shmat in -lipc" >&5
+ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lipc "
+cat > conftest.$ac_ext <<EOF
+#line 3820 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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:3831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 
     fi
-    if test -n "${x_includes}${x_libraries}" ; then window_system=x11 ; fi
-  ;;
+  fi
+
+  # Check for libraries that X11R6 Xt/Xaw programs need.
+  ac_save_LDFLAGS="$LDFLAGS"
+  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+  # check for ICE first), but we must link in the order -lSM -lICE or
+  # 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@uluru.Stanford.EDU, kb@cs.umb.edu.
+  
+echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
+echo "configure:3865: checking for IceConnectionNumber in -lICE" >&5
+ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lICE "
+cat > conftest.$ac_ext <<EOF
+#line 3870 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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:3881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+  LDFLAGS="$ac_save_LDFLAGS"
+
+fi
+ # Autoconf claims to find X library and include dirs for us.
+  if test "$no_x" = "yes"
+  then with_x11=no  window_system=none HAVE_X_WINDOWS=no
+  else with_x11=yes window_system=x11  HAVE_X_WINDOWS=yes
+  fi
+fi
+
+case "$with_x11" in
+  yes ) window_system=x11  HAVE_X_WINDOWS=yes ;;
+  no  ) window_system=none HAVE_X_WINDOWS=no  ;;
 esac
 
-test -z "${window_system}" && window_system="none"
-
-if test "${window_system}" = "none" ; then
-  if test "${with_tty}" != "yes" ; then
-    echo "No window system support, and no TTY support." >&2
-    echo "Unable to proceed." >&2
-    exit 1
+if test "$with_x11" = "yes"; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_X_WINDOWS
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_X_WINDOWS 1
+EOF
+}
+
+  MAKE_SUBDIR="$MAKE_SUBDIR lwlib"
+
+      for lib_dir in "/usr/dt/lib" "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do
+    inc_dir="`echo $lib_dir | sed 's/lib/include/'`"
+    if test -d "$lib_dir" -a -d "$inc_dir"; then
+      case "$x_libraries" in *"$lib_dir"* ) : ;; *)
+        x_libraries="$lib_dir $x_libraries" X_LIBS="-L${lib_dir} $X_LIBS"
+      esac
+      case "$x_includes" in "$inc_dir"* ) : ;; *)
+        x_includes="$inc_dir $x_includes" X_CFLAGS="-I${inc_dir} $X_CFLAGS"
+      esac
+      break;       fi
+  done
+
+    for rel in "X11R6" "X11R5" "X11R4"; do
+    lib_dir="/usr/contrib/$rel/lib" inc_dir="/usr/contrib/$rel/include"
+    if test -d "$lib_dir" -a -d "$inc_dir"; then
+      case "$x_libraries" in *"$lib_dir"* ) : ;; *)
+        x_libraries="$x_libraries $lib_dir" X_LIBS="$X_LIBS -L${lib_dir}"
+      esac
+      case "$x_includes" in "$inc_dir"* ) : ;; *)
+        x_includes="$x_includes $inc_dir" X_CFLAGS="$X_CFLAGS -I${inc_dir}"
+      esac
+      break;     fi
+  done
+
+  ld_switch_x_site="$X_LIBS"
+
+  if test "$extra_verbose" = "yes"; then
+    echo; echo "X11 compilation variables:"
+    echo "x_libraries = $x_libraries"
+echo "x_includes = $x_includes"
+echo "X_CFLAGS = $X_CFLAGS"
+echo "X_LIBS = $X_LIBS"
+echo "X_PRE_LIBS = $X_PRE_LIBS"
+echo "X_EXTRA_LIBS = $X_EXTRA_LIBS"
+    echo
+  fi
+
+    ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
+echo "configure:3966: checking for X11/Intrinsic.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 3969 "configure"
+#include "confdefs.h"
+#include <X11/Intrinsic.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:3974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+{ echo "configure: error: "Unable to find X11 header files."" 1>&2; exit 1; }
+fi
+
+
+      
+echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
+echo "configure:3998: checking for XOpenDisplay in -lX11" >&5
+ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lX11 "
+cat > conftest.$ac_ext <<EOF
+#line 4003 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char XOpenDisplay();
+
+int main() {
+XOpenDisplay()
+; return 0; }
+EOF
+if { (eval echo configure:4014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  have_lib_x11=yes
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+  if test "$have_lib_x11" != "yes"; then
+    
+xe_msg_checking="for XGetFontProperty in -lX11"
+test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout"
+echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
+echo "configure:4039: checking "$xe_msg_checking"" >&5
+ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lX11 -b i486-linuxaout"
+cat > conftest.$ac_ext <<EOF
+#line 4044 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char XGetFontProperty();
+
+int main() {
+XGetFontProperty()
+; return 0; }
+EOF
+if { (eval echo configure:4055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  ld_switch_x_site="-b i486-linuxaout $ld_switch_x_site"
+else
+  echo "$ac_t""no" 1>&6
+{ echo "configure: error: "Unable to find X11 libraries."" 1>&2; exit 1; }
+fi
+
+
   fi
-  for feature in cde offix menubars scrollbars toolbars dialogs xim tiff
+  libs_x="-lX11"
+
+  case "$canonical" in *-sunos4.* ) # Bug workaround
+   ld_switch_x_site="$ld_switch_x_site -u _XtToolkitInitialize" ;;
+  esac
+  
+echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
+echo "configure:4084: checking for XtOpenDisplay in -lXt" >&5
+ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lXt "
+cat > conftest.$ac_ext <<EOF
+#line 4089 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char XtOpenDisplay();
+
+int main() {
+XtOpenDisplay()
+; return 0; }
+EOF
+if { (eval echo configure:4100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  libs_x="-lXt $libs_x"
+else
+  echo "$ac_t""no" 1>&6
+{ echo "configure: error: "Unable to find X11 libraries."" 1>&2; exit 1; }
+fi
+
+
+
+  echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
+echo "configure:4123: checking the version of X11 being used" >&5
+  cat > conftest.$ac_ext <<EOF
+#line 4125 "configure"
+#include "confdefs.h"
+#include <X11/Intrinsic.h>
+    main(int c, char* v[]) { return c>1 ? XlibSpecificationRelease : 0; }
+EOF
+if { (eval echo configure:4130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
+  ./conftest foobar; rc=$?
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  rc=4
+fi
+rm -fr conftest*
+  echo "$ac_t""R${rc}" 1>&6
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining THIS_IS_X11R${rc}
+EOF
+cat >> confdefs.h <<EOF
+#define THIS_IS_X11R${rc} 1
+EOF
+}
+
+
+  for ac_hdr in X11/Xlocale.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:4154: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4157 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:4162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+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"
+fi
+rm -f conftest*
+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___%'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_hdr
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+}
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
+    echo $ac_n "checking for XFree86""... $ac_c" 1>&6
+echo "configure:4193: checking for XFree86" >&5
+  if test -d "/usr/X386/include" -o \
+          -f "/etc/XF86Config" -o \
+	  -f "/etc/X11/XF86Config" -o \
+	  -f "/usr/X11R6/lib/X11/XF86Config"; then
+    echo "$ac_t""yes" 1>&6
+    { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_XFREE386
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_XFREE386 1
+EOF
+}
+
+  else
+    echo "$ac_t""no" 1>&6
+  fi
+
+    
+echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
+echo "configure:4213: checking for XShapeSelectInput in -lXext" >&5
+ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lXext "
+cat > conftest.$ac_ext <<EOF
+#line 4218 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char XShapeSelectInput();
+
+int main() {
+XShapeSelectInput()
+; return 0; }
+EOF
+if { (eval echo configure:4229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  libs_x="-lXext $libs_x"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+    case "$canonical" in *-sunos4.* ) # Bug workaround
+    ld_switch_x_site="$ld_switch_x_site -u _get_applicationShellWidgetClass" ;;
+  esac
+  if test -z "$with_xmu"; then
+    
+echo $ac_n "checking for XmuConvertStandardSelection in -lXmu""... $ac_c" 1>&6
+echo "configure:4256: checking for XmuConvertStandardSelection in -lXmu" >&5
+ac_lib_var=`echo Xmu'_'XmuConvertStandardSelection | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lXmu "
+cat > conftest.$ac_ext <<EOF
+#line 4261 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char XmuConvertStandardSelection();
+
+int main() {
+XmuConvertStandardSelection()
+; return 0; }
+EOF
+if { (eval echo configure:4272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  with_xmu=yes
+else
+  echo "$ac_t""no" 1>&6
+with_xmu=no
+fi
+
+
+  fi
+  if test "$with_xmu" = "no"; then
+    extra_objs="$extra_objs xmu.o"
+  else
+    libs_x="-lXmu $libs_x"
+  fi
+
+      
+echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
+echo "configure:4302: checking for main in -lXbsd" >&5
+ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lXbsd "
+cat > conftest.$ac_ext <<EOF
+#line 4307 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:4314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  libs_x="-lXbsd $libs_x"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+    ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
+echo "configure:4337: checking for Xm/Xm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4340 "configure"
+#include "confdefs.h"
+#include <Xm/Xm.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:4345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
+echo "configure:4362: checking for XmStringFree in -lXm" >&5
+ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lXm "
+cat > conftest.$ac_ext <<EOF
+#line 4367 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char XmStringFree();
+
+int main() {
+XmStringFree()
+; return 0; }
+EOF
+if { (eval echo configure:4378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  have_motif=yes
+else
+  echo "$ac_t""no" 1>&6
+have_motif=no
+fi
+
+
+else
+  echo "$ac_t""no" 1>&6
+have_motif=no
+fi
+
+
+    
+echo $ac_n "checking for XawScrollbarSetThumb in -lXaw""... $ac_c" 1>&6
+echo "configure:4407: checking for XawScrollbarSetThumb in -lXaw" >&5
+ac_lib_var=`echo Xaw'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lXaw "
+cat > conftest.$ac_ext <<EOF
+#line 4412 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char XawScrollbarSetThumb();
+
+int main() {
+XawScrollbarSetThumb()
+; return 0; }
+EOF
+if { (eval echo configure:4423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  have_xaw=yes
+else
+  echo "$ac_t""no" 1>&6
+have_xaw=no
+fi
+
+
+
+fi 
+test -z "$window_system" && window_system="none"
+
+if test "$window_system" = "none" ; then
+  if test "$with_tty" = "no" ; then
+    { echo "configure: error: No window system support and no TTY support - Unable to proceed." 1>&2; exit 1; }
+  fi
+  for feature in tooltalk cde offix \
+                 menubars scrollbars toolbars dialogs xim xmu \
+                 tiff png jpeg gif compface xpm
   do
-    if eval "test -n \"\$with_$feature\" -a \"\$with_$feature\" != no" ; then
-       echo "configure: warning: --with-$feature ignored:  Not valid without X support" >&2
+    if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
+       echo "configure: warning: --with-$feature ignored:  Not valid without X support" 1>&2
     fi
-    eval "with_$feature=no"
+    eval "with_${feature}=no"
   done
-elif test -z "${with_toolbars}"  ; then
-  with_toolbars='yes'
-fi
-
+else
+  test -z "$with_toolbars" && with_toolbars=yes
+fi
+
+if false; then # obsolete
 runtime_arg="-R${dash_r_space}"
 
-case "${canonical}" in
-  *-sun-solaris* | *-sun-sunos5* ) 
+case "$canonical" in
+  *-sun-solaris* | *-sun-sunos5* )
     add_runtime_flag=yes ;;
   *-sgi-irix5.* )
-    # In the IRIX 5.3 ld, only the last -rpath arg has any effect.  This is 
-    # fundamentaly incompatible with having separate LD_SWITCH_X_SITE
-    # and LD_SWITCH_SITE variables.  Fortunately, SGI fixed this by 6.2.
-    if test -n "${x_libraries}" || test -n "${site_runtime_libraries}" ; then
+                if test -n "$x_libraries" || test -n "$site_runtime_libraries" ; then
       (echo "WARNING: The IRIX 5 ld ignores all but the last -rpath argument,";
        echo "         so if you need to specify more than one additional";
        echo "         runtime library directory, you will have to do so";
@@ -2751,1954 +4479,1825 @@
     fi
     runtime_arg="-rpath " ;;
   *-sgi-irix* )
-    # Note that IRIX gcc (as of 2.7.2) doesn't accept -rpath, so
-    # using it can cause trouble.  Specifying --use-gcc=no will work 
-    # around this, but the real problem is that configure uses $LDFLAGS 
-    # as arguments to $(CC), instead of using prefix-args like the
-    # src/Makefile does.
-    add_runtime_flag=yes;
+                        add_runtime_flag=yes;
     runtime_arg="-rpath " ;;
 esac
-
-if test -n "${x_libraries}" ; then
-    if test "${add_runtime_flag}" = "yes" ; then
-	LD_SWITCH_X_SITE="-L${x_libraries} ${runtime_arg}${x_libraries}"
-  else
-    LD_SWITCH_X_SITE="-L${x_libraries}"
-  fi
-fi
-# LD_SWITCH_X_SITE_AUX (from FSF) is ill-conceived.  See s/sol2*.h.
-# test -n "${x_libraries}" -a LD_SWITCH_X_SITE_AUX="-R${x_libraries}"
-test -n "${x_includes}" && C_SWITCH_X_SITE="-I${x_includes}"
-
-if test -n "${site_libraries}" ; then
-  for arg in ${site_libraries}
-  do
-    LD_SWITCH_SITE="${LD_SWITCH_SITE} -L${arg}"
+fi
+
+if test -n "$site_libraries"; then
+  for arg in $site_libraries; do
+    test -d "$arg" && arg="-L${arg}"
+    ld_switch_site="$ld_switch_site $arg"
   done
 fi
-if test -n "${site_runtime_libraries}" ; then
-  for arg in ${site_runtime_libraries}
-  do
-    LD_SWITCH_SITE="${LD_SWITCH_SITE} -L${arg}"
-    LD_SWITCH_SITE="${LD_SWITCH_SITE} ${runtime_arg}${arg}"
-  done
-fi
-if test -n "${site_includes}" ; then
-  for arg in ${site_includes}
-  do
-    C_SWITCH_SITE="${C_SWITCH_SITE} -I${arg}"
-    CPP="${CPP} -I${arg}"
+
+if test -n "$site_runtime_libraries" ; then
+  LD_RUN_PATH="`echo $site_runtime_libraries | sed 's/ 	*/:/'`"
+  export LD_RUN_PATH
+fi
+
+if test -n "$site_includes" ; then
+  for arg in $site_includes; do
+    test -d "$arg" && arg="-I${arg}"
+    c_switch_site="$c_switch_site $arg"
   done
 fi
 
-# FSF 19.29 has some bitmapdir stuff here.
+
 bitmapdir=
 
-# Avoid forcing the search of /usr/include before fixed include files.
-test "$C_SWITCH_X_SITE" = "-I/usr/include" && C_SWITCH_X_SITE=" "
-
-# Need for check for audio/Xtutil.h.
-CPP="${CPP} ${C_SWITCH_X_SITE}"
-
-case "${window_system}" in
+case "$window_system" in
   x11  ) HAVE_X_WINDOWS=yes; echo "  Using X11." ;;
   none ) HAVE_X_WINDOWS=no ; echo "  Using no window system." ;;
 esac
 
-if test "${opsys}" = "hpux9"; then
-  case "${x_libraries}" in
-    *X11R4* ) opsysfile="s/hpux9-x11r4.h" ;;
-  esac
-fi
-
-if test "${opsys}" = "hpux9-shr"; then
-  case "${x_libraries}" in
-    *X11R4* ) opsysfile="s/hpux9shxr4.h" ;;
-  esac
-fi
-
-############################################################################
-#									   #
-#   Extract some information from the operating system and machine files   #
-#									   #
-############################################################################
-
-echo "examining the machine- and system-dependent files to find out"
-echo " - which libraries the lib-src programs will want, and"
-echo " - whether the GNU malloc routines are usable."
-
-### First figure out CFLAGS (which we use for running the compiler here)
-### and REAL_CFLAGS (which we use for real compilation).
-### The two are the same except on a few systems, where they are made
-### different to work around various lossages.  For example,
-### GCC 2.5 on Linux needs them to be different because it treats -g
-### as implying static linking.
-
-### If the CFLAGS env var is specified, we use that value
-### instead of the default.
-
-### It's not important that this name contain the PID; you can't run
-### two configures in the same directory and have anything work
-### anyway.
-tempcname="conftest.c"
-
-echo '
-#define NOT_C_CODE
-#include "'${srcdir}'/src/'${opsysfile}'"
-#include "'${srcdir}'/src/'${machfile}'"
-#ifndef LIBS_MACHINE
-#define LIBS_MACHINE
-#endif
-#ifndef LIBS_SYSTEM
-#define LIBS_SYSTEM
-#endif
-#ifndef C_SWITCH_SYSTEM
-#define C_SWITCH_SYSTEM
-#endif
-#ifndef C_SWITCH_X_SYSTEM
-#define C_SWITCH_X_SYSTEM
-#endif
-#ifndef C_SWITCH_MACHINE
-#define C_SWITCH_MACHINE
-#endif
-#ifndef LD_SWITCH_X_SYSTEM
-#define LD_SWITCH_X_SYSTEM
-#endif
-#ifndef LIB_STANDARD
-#define LIB_STANDARD
-#endif
-configure___ libsrc_libs=LIBS_MACHINE LIBS_SYSTEM LIB_STANDARD
-configure___ c_switch_system=C_SWITCH_SYSTEM
-configure___ c_switch_x_system=C_SWITCH_X_SYSTEM
-configure___ ld_switch_x_system=LD_SWITCH_X_SYSTEM
-configure___ c_switch_machine=C_SWITCH_MACHINE
-
-#ifndef LIB_X11_LIB
-#define LIB_X11_LIB -lX11
-#endif
-
-#ifndef LIBX11_MACHINE
-#define LIBX11_MACHINE
-#endif
-
-#ifndef LIBX11_SYSTEM
-#define LIBX11_SYSTEM
-#endif
-configure___ LIBX=LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM
-
-#ifdef UNEXEC
-configure___ unexec=UNEXEC
-#else
-configure___ unexec=unexec.o
-#endif
-
-#ifdef SYSTEM_MALLOC
-configure___ system_malloc=yes
-#else
-configure___ system_malloc=no
-#endif
-
-#ifndef C_DEBUG_SWITCH
-#define C_DEBUG_SWITCH -g
-#endif
-
-#ifndef C_OPTIMIZE_SWITCH
-#define C_OPTIMIZE_SWITCH -O
-#endif
-
-#ifdef THIS_IS_CONFIGURE
-
-/* Get the CFLAGS for tests in configure.  */
-#ifdef __GNUC__
-configure___ CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${SPECIFIED_CFLAGS}'
-#else
-configure___ CFLAGS=C_DEBUG_SWITCH '${SPECIFIED_CFLAGS}'
-#endif
-
-#else /* not THIS_IS_CONFIGURE */
-
-/* Get the CFLAGS for real compilation.  */
-#ifdef __GNUC__
-configure___ REAL_CFLAGS=C_DEBUG_SWITCH C_OPTIMIZE_SWITCH '${SPECIFIED_CFLAGS}'
-#else
-configure___ REAL_CFLAGS=C_DEBUG_SWITCH '${SPECIFIED_CFLAGS}'
-#endif
-
-#endif /* not THIS_IS_CONFIGURE */
-' > ${tempcname}
-# The value of CPP is a quoted variable reference, so we need to do this
-# to get its actual value...
-CPP=`eval "echo $CPP"`
-eval `${CPP} -Isrc ${tempcname} \
-       | grep 'configure___' \
-       | sed -n -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/p'`
-if test "x$SPECIFIED_CFLAGS" = x ; then
-  eval `${CPP} -Isrc -DTHIS_IS_CONFIGURE ${tempcname} \
-	 | grep 'configure___' \
-	 | sed -n -e 's/^configure___ \([^=]*=\)\(.*\)$/\1"\2"/p'`
-else
-  REAL_CFLAGS="$CFLAGS"
-fi
-rm ${tempcname}
-
-# override CFLAGS if user wishes
-if test "${cflags}" != "NO_CFLAGS_DEFINED" ; then
-  REAL_CFLAGS=${cflags}
-fi
-
-### Compute the unexec source name from the object name.
-UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"
-
-# Do the opsystem or machine files prohibit the use of the GNU malloc?
-# Assume not, until told otherwise.
-GNU_MALLOC=yes
-if test "${system_malloc}" = "yes" ; then
-  GNU_MALLOC=no
-  GNU_MALLOC_reason="
-  (The GNU allocators don't work with this system configuration.)"
-elif test "${use_system_malloc}" = "yes" ; then
-  GNU_MALLOC=no
-  GNU_MALLOC_reason="
-  (User chose not to use GNU allocators.)"
-fi
-
-LISP_FLOAT_TYPE=yes
-
-
-#### Add the libraries to LIBS and check for some functions.
-
-CPPFLAGS="${C_SWITCH_SITE} $c_switch_system $c_switch_machine $c_switch_x_system $CPPFLAGS"
-DEFS="${C_SWITCH_SITE} $c_switch_system $c_switch_machine $c_switch_x_system $DEFS"
-LIBS="${LD_SWITCH_SITE} $ld_switch_x_system $libsrc_libs $LIBS"
-
-test "${with_dnet}"      != "no"   -a \
-     "${with_dnet}"      != "yes" && { ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -ldnet"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -ldnet"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; with_dnet="yes"
-else
-   :; 
+case "$x_libraries" in *X11R4* )
+  test "$opsys" = "hpux9"     && opsysfile="s/hpux9-x11r4.h"
+  test "$opsys" = "hpux9-shr" && opsysfile="s/hpux9shxr4.h"
+esac
+
+{ test "$extra_verbose" = "yes" && cat << \EOF
+    Defining LISP_FLOAT_TYPE
+EOF
+cat >> confdefs.h <<\EOF
+#define LISP_FLOAT_TYPE 1
+EOF
+}
+ 
+
+echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
+echo "configure:4530: checking for kstat_open in -lkstat" >&5
+ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lkstat "
+cat > conftest.$ac_ext <<EOF
+#line 4535 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char kstat_open();
+
+int main() {
+kstat_open()
+; return 0; }
+EOF
+if { (eval echo configure:4546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo kstat | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_lib
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+}
+
+  LIBS="-lkstat $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+
+echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
+echo "configure:4580: checking for kvm_read in -lkvm" >&5
+ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lkvm "
+cat > conftest.$ac_ext <<EOF
+#line 4585 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char kvm_read();
+
+int main() {
+kvm_read()
+; return 0; }
+EOF
+if { (eval echo configure:4596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo kvm | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_lib
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+}
+
+  LIBS="-lkvm $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+
+echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
+echo "configure:4630: checking for cma_open in -lpthreads" >&5
+ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lpthreads "
+cat > conftest.$ac_ext <<EOF
+#line 4635 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char cma_open();
+
+int main() {
+cma_open()
+; return 0; }
+EOF
+if { (eval echo configure:4646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo pthreads | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_lib
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+}
+
+  LIBS="-lpthreads $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+if test "$ac_cv_lib_pthreads_cma_open" = "yes"; then
+   case "$opsys" in decosf*) c_switch_site="$c_switch_site -threads";; esac
+fi
+
+echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
+echo "configure:4682: checking whether the -xildoff compiler flag is required" >&5
+if   ${CC-cc} '-###' -xildon  no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then
+  if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ;
+    then echo "$ac_t""no" 1>&6;
+    else echo "$ac_t""yes" 1>&6; ld_switch_site="$ld_switch_site -xildoff"
+  fi
+  else echo "$ac_t""no" 1>&6
+fi
+
+test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
+test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6
+echo "configure:4694: checking for X11/Xauth.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4697 "configure"
+#include "confdefs.h"
+#include <X11/Xauth.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:4702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_xauth=no
+fi
+ }
+test -z "$with_xauth" && { 
+echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
+echo "configure:4725: checking for XauGetAuthByAddr in -lXau" >&5
+ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lXau "
+cat > conftest.$ac_ext <<EOF
+#line 4730 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char XauGetAuthByAddr();
+
+int main() {
+XauGetAuthByAddr()
+; return 0; }
+EOF
+if { (eval echo configure:4741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_xauth=no
+fi
+
+ }
+test -z "$with_xauth" && with_xauth=yes
+if test "$with_xauth" = "yes"; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_XAUTH
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_XAUTH 1
+EOF
+}
+
+  libs_x="-lXau $libs_x"
+fi
+
+test -z "$with_offix" && { ac_safe=`echo "OffiX/DragAndDrop.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for OffiX/DragAndDrop.h""... $ac_c" 1>&6
+echo "configure:4777: checking for OffiX/DragAndDrop.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4780 "configure"
+#include "confdefs.h"
+#include <OffiX/DragAndDrop.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:4785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_offix=no
+fi
+ }
+test -z "$with_offix" && { 
+echo $ac_n "checking for DndInitialize in -lDnd""... $ac_c" 1>&6
+echo "configure:4808: checking for DndInitialize in -lDnd" >&5
+ac_lib_var=`echo Dnd'_'DndInitialize | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lDnd "
+cat > conftest.$ac_ext <<EOF
+#line 4813 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char DndInitialize();
+
+int main() {
+DndInitialize()
+; return 0; }
+EOF
+if { (eval echo configure:4824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  : 
+else
+  echo "$ac_t""no" 1>&6
+with_offix=no
+fi
+
+ }
+test -z "$with_offix" && with_offix=yes
+if test "$with_offix" = "yes"; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_OFFIX_DND
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_OFFIX_DND 1
+EOF
+}
+
+  libs_x="-lDnd $libs_x"
+fi
+
+test "$with_cde" = "yes" && with_tooltalk=yes # CDE requires tooltalk
+if test "$with_tooltalk" != "no" ; then
+      for dir in "" "Tt/" "desktop/" ; do
+    ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6
+echo "configure:4863: checking for ${dir}tt_c.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4866 "configure"
+#include "confdefs.h"
+#include <${dir}tt_c.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:4871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  tt_c_h_path="${dir}tt_c.h" && break
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  done
+  test -z "$tt_c_h_path" && with_tooltalk=no
+fi
+if test "$with_tooltalk" != "no" ; then
+  for extra_libs in "" "-lI18N -lce" "-lcxx"; do
+    
+xe_msg_checking="for tt_message_create in -ltt"
+test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
+echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
+echo "configure:4900: checking "$xe_msg_checking"" >&5
+ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -ltt $extra_libs"
+cat > conftest.$ac_ext <<EOF
+#line 4905 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char tt_message_create();
+
+int main() {
+tt_message_create()
+; return 0; }
+EOF
+if { (eval echo configure:4916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  with_tooltalk=yes tt_libs="-ltt $extra_libs"; break
+else
+  echo "$ac_t""no" 1>&6
+:
+fi
+
+
+  done
+fi
+test -z "$with_tooltalk" && with_tooltalk=no
+if test "$with_tooltalk" = "yes"; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining TOOLTALK
+EOF
+cat >> confdefs.h <<\EOF
+#define TOOLTALK 1
+EOF
+}
+
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining TT_C_H_PATH = "$tt_c_h_path"
+EOF
+cat >> confdefs.h <<EOF
+#define TT_C_H_PATH "$tt_c_h_path"
+EOF
+}
+
+  libs_x="$tt_libs $libs_x"
+  extra_objs="$extra_objs tooltalk.o"
+fi
+
+test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6
+echo "configure:4963: checking for Dt/Dt.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4966 "configure"
+#include "confdefs.h"
+#include <Dt/Dt.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:4971: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_cde=no
 fi
  }
-test "${with_dnet}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_LIBDNET"
-echo "#define" HAVE_LIBDNET "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_LIBDNET=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_LIBDNET\${ac_dB}HAVE_LIBDNET\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_LIBDNET\${ac_uB}HAVE_LIBDNET\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_LIBDNET\${ac_eB}HAVE_LIBDNET\${ac_eC}1\${ac_eD}
-"
-}
-
-
-
-ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lkstat"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lkstat"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   
-{
-test -n "$verbose" && \
-echo "	defining HAVE_LIBKSTAT"
-echo "#define" HAVE_LIBKSTAT "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_LIBKSTAT=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_LIBKSTAT\${ac_dB}HAVE_LIBKSTAT\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_LIBKSTAT\${ac_uB}HAVE_LIBKSTAT\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_LIBKSTAT\${ac_eB}HAVE_LIBKSTAT\${ac_eC}1\${ac_eD}
-"
-}
-
-   LIBS="${LIBS} -lkstat"
-fi
-
-
-ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lintl"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lintl"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_LIBINTL"
-echo "#define" HAVE_LIBINTL "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_LIBINTL=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_LIBINTL\${ac_dB}HAVE_LIBINTL\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_LIBINTL\${ac_uB}HAVE_LIBINTL\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_LIBINTL\${ac_eB}HAVE_LIBINTL\${ac_eC}1\${ac_eD}
-"
-}
-
-else
-   :; 
-fi
-
-
-ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lXbsd"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lXbsd"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd"
-else
-   :; 
-fi
-
-
-ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lpthreads"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lpthreads"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; HAVE_PTHREADS=yes
-else
-   :; 
-fi
-
-if test -n "${HAVE_PTHREADS}" ; then
-   
-{
-test -n "$verbose" && \
-echo "	defining HAVE_PTHREADS"
-echo "#define" HAVE_PTHREADS "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_PTHREADS=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_PTHREADS\${ac_dB}HAVE_PTHREADS\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_PTHREADS\${ac_uB}HAVE_PTHREADS\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_PTHREADS\${ac_eB}HAVE_PTHREADS\${ac_eC}1\${ac_eD}
-"
-}
-
-   case "${opsys}" in
-     decosf* ) CFLAGS="${CFLAGS} -threads" ;;
-   esac
-fi
-
-if test "${window_system}" != "none" ; then
-  test -n "$silent" || echo "checking for XFree86"
-  if test -d /usr/X386/include; then
-    HAVE_XFREE386=yes
-    test -z "${C_SWITCH_X_SITE}" && C_SWITCH_X_SITE="-I/usr/X386/include"
-  elif test -f /etc/XF86Config -o \
-	    -f /etc/X11/XF86Config -o \
-	    -f /usr/X11R6/lib/X11/XF86Config; then
-    HAVE_XFREE386=yes
-    test -z "${C_SWITCH_X_SITE}" && C_SWITCH_X_SITE="-I/usr/X11R6/include"
-  else
-    HAVE_XFREE386=no
-  fi
-  test -n "$verbose" && echo "	${HAVE_XFREE386}"
-else
-  HAVE_XFREE386=no
-fi
-
-############################################################################
-#									   #
-#                     Test for various X-specific features                 #
-#									   #
-############################################################################
-
-# Change CFLAGS temporarily for damn binutils 2.6.0.10 check.
-if test "${HAVE_X_WINDOWS}" = "yes"; then
-  case "${opsys}" in
-    linux* )
-      CFLAGS="-Wl,-rpath-link,/usr/X11R6/lib $CFLAGS"
-      test -n "$silent" || echo "checking for whether path-link option is needed"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { ;; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  need_path_link=yes
-
-else
-  rm -rf conftest*
-  need_path_link=no
-fi
-rm -f conftest*
-
-      if test "${need_path_link}" = "no"; then
-        CFLAGS="$REAL_CFLAGS"
-	test -n "$verbose" && echo "	no"
-      else
-	test -n "$verbose" && echo "	yes"
-      fi
-    ;;
-  esac
-fi
-
-# Change CFLAGS temporarily so that C_SWITCH_X_SITE gets used
-# for the tests that follow.  We set it back to REAL_CFLAGS later on.
+test -z "$with_cde" && { 
+echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
+echo "configure:4994: checking for DtDndDragStart in -lDtSvc" >&5
+ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lDtSvc "
+cat > conftest.$ac_ext <<EOF
+#line 4999 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char DtDndDragStart();
+
+int main() {
+DtDndDragStart()
+; return 0; }
+EOF
+if { (eval echo configure:5010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_cde=no
+fi
+
+ }
+test -z "$with_cde" && with_cde=yes
+if test "$with_cde" = "yes" ; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_CDE
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_CDE 1
+EOF
+}
+
+  libs_x="-lDtSvc $libs_x"
+  with_tooltalk=yes # CDE requires Tooltalk
+  with_motif=yes    # CDE requires Motif
+fi
+
+if test "$with_energize" = "yes" ; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining ENERGIZE
+EOF
+cat >> confdefs.h <<\EOF
+#define ENERGIZE 1
+EOF
+}
+
   
-if test "${HAVE_X_WINDOWS}" = "yes"; then
-  DEFS="$C_SWITCH_X_SITE $DEFS"
-  LDFLAGS="$LDFLAGS $LD_SWITCH_X_SITE"
-  LIBS="$LIBX $LIBS"
-  CFLAGS="$C_SWITCH_X_SITE $CFLAGS"
-
-  # On Solaris, arrange for LD_RUN_PATH to point to the X libraries for tests.
-  # This is handled by LD_SWITCH_X_SITE_AUX during the real build,
-  # but it's more convenient here to set LD_RUN_PATH
-  # since this also works on hosts that don't understand LD_SWITCH_X_SITE_AUX.
-  if test "${x_libraries}" != NONE && test -n "${x_libraries}"; then
-    LD_RUN_PATH=$x_libraries${LD_RUN_PATH+:}$LD_RUN_PATH
-    export LD_RUN_PATH
-  fi
-
-  if test "${HAVE_XFREE386}" = "yes" ; then
-    case "${opsys}" in
-      linux* )
-	test -n "$silent" || echo "checking for whether XFree86 needs -b to link"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { XOpenDisplay ("foo");; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  xfree86_first_failure=no
-
-else
-  rm -rf conftest*
-  xfree86_first_failure=yes
-fi
-rm -f conftest*
-
-	if test "${xfree86_first_failure}" = "yes"; then
-	  OLD_LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE"
-	  OLD_C_SWITCH_X_SITE="$C_SWITCH_X_SITE"
-	  OLD_CPPFLAGS="$CPPFLAGS"
-	  OLD_LIBS="$LIBS"
-	  LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -b i486-linuxaout"
-	  C_SWITCH_X_SITE="$C_SWITCH_X_SITE -b i486-linuxaout"
-	  CPPFLAGS="$CPPFLAGS -b i486-linuxaout"
-	  LIBS="$LIBS -b i486-linuxaout"
-	  cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { XOpenDisplay ("foo");; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  xfree86_second_failure=no
-
-else
-  rm -rf conftest*
-  xfree86_second_failure=yes
-fi
-rm -f conftest*
-
-	  if test "${xfree86_second_failure}" = "yes"; then
-	    # If we get the same failure with -b, there is no use adding -b.
-	    # So take it out.  This plays safe.
-	    LD_SWITCH_X_SITE="$OLD_LD_SWITCH_X_SITE"
-	    C_SWITCH_X_SITE="$OLD_C_SWITCH_X_SITE"
-	    CPPFLAGS="$OLD_CPPFLAGS"
-	    LIBS="$OLD_LIBS"
-	    test -n "$verbose" && echo "	no"
-	  else
-	    test -n "$verbose" && echo "	yes"
-	  fi
-	else
-	  test -n "$verbose" && echo "	no"
-	fi
-      ;;
-    esac
-  fi
-
-#  A C_CHECK_FUNCS(XrmSetDatabase XScreenResourceString \
-#XScreenNumberOfScreen XSetWMProtocols)
-fi
-
-#
-# make sure we can find libX11.*
-#
-if test "${window_system}" != "none" ; then
-  internal_xlibs_found='no'
-  ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lX11"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lX11"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; internal_xlibs_found='yes'
-else
-   :; 
-fi
-
-  if test "${internal_xlibs_found}" = "no" ; then
-    echo "Unable to find X11 libraries." >&2
-    exit 1
-  else
-    test -n "$verbose" && echo "	yes"
-  fi
-fi
-
-#
-# make sure we can find Intrinsic.h
-#
-if test "${window_system}" != "none" ; then
-  internal_xincludes_found='no'
-  for arg in ${DEFS} /usr/include
-  do
-    if test -f `echo "${arg}/X11/Intrinsic.h" | sed 's/^\-I//'` ; then
-      internal_xincludes_found='yes'
+echo $ac_n "checking for main in -lenergize""... $ac_c" 1>&6
+echo "configure:5057: checking for main in -lenergize" >&5
+ac_lib_var=`echo energize'_'main | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lenergize "
+cat > conftest.$ac_ext <<EOF
+#line 5062 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:5069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  LIBS="$LIBS -lenergize"
+     energize_version="3.X"
+     { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining ENERGIZE_3
+EOF
+cat >> confdefs.h <<\EOF
+#define ENERGIZE_3 1
+EOF
+}
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+  if test -z "$energize_version"; then
+    
+echo $ac_n "checking for main in -lconn""... $ac_c" 1>&6
+echo "configure:5101: checking for main in -lconn" >&5
+ac_lib_var=`echo conn'_'main | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lconn "
+cat > conftest.$ac_ext <<EOF
+#line 5106 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:5113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  LIBS="$LIBS -lconn"
+      energize_version="2.X"
+      { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining ENERGIZE_2
+EOF
+cat >> confdefs.h <<\EOF
+#define ENERGIZE_2 1
+EOF
+}
+
+else
+  echo "$ac_t""no" 1>&6
+{ echo "configure: error: Unable to find Energize library." 1>&2; exit 1; }
+fi
+
+
     fi
-  done
-  if test "${internal_xincludes_found}" = "no" ; then
-    echo "Unable to find X11 header files." >&2
-    exit 1
-  fi
-fi
-
-#
-# Sun OS 4 systems need the following kludge
-#
-if test "${window_system}" != "none" ; then
-  case "${canonical}" in *-sunos4* )
-    LIBS="$LIBS -u _XtToolkitInitialize -u _get_applicationShellWidgetClass" ;;
-  esac
-fi
-
-#
-# See if we can find Xauth.
-#
-with_xauth='no'
-if test "${window_system}" != "none" ; then
-  internal_xauth_lib_found='no'
-  ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lXau"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lXau"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; internal_xauth_lib_found='yes'
-else
-   :; 
-fi
-
-  if test "${internal_xauth_lib_found}" = "yes" ; then
-    internal_xauth_includes_found='no'
-    for arg in ${DEFS} /usr/include
-    do
-      if test -f `echo "${arg}/X11/Xauth.h" | sed 's/^\-I//'` ; then
-  	internal_xauth_includes_found='yes'
-      fi
-    done
-    if test "${internal_xauth_includes_found}" = "yes" ; then
-      with_xauth='yes'
-    fi
-  fi
-fi
-test "${with_xauth}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_XAUTH"
-echo "#define" HAVE_XAUTH "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_XAUTH=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_XAUTH\${ac_dB}HAVE_XAUTH\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_XAUTH\${ac_uB}HAVE_XAUTH\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_XAUTH\${ac_eB}HAVE_XAUTH\${ac_eC}1\${ac_eD}
-"
-}
-
-
-#
-# See if we can find CDE.
-#
-if test "${window_system}" != "none" -a \
-	"${with_cde}"      != "no"   -a \
-	"${with_cde}"      != "yes" ; then
-  internal_cde_lib_found='no'
-  ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lDtSvc"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lDtSvc"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; internal_cde_lib_found='yes'
-else
-   :; 
-fi
-
-  if test "${internal_cde_lib_found}" = "no" -a -f "/usr/dt/lib/libDtSvc.a"; then
-    internal_cde_lib_found="yes"
-  fi
-  if test "${internal_cde_lib_found}" = "yes" ; then
-    internal_cde_includes_found='no'
-    for arg in ${DEFS} /usr/include /usr/dt/include ; do
-      if test -f `echo "${arg}/Dt/Dt.h" | sed 's/^\-I//'` ; then
-        internal_cde_includes_found='yes'
-      fi
-    done
-    if test "${internal_cde_includes_found}" = "yes" ; then
-      with_cde='yes'
-    fi
-  fi
-fi
-test "${with_cde}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_CDE"
-echo "#define" HAVE_CDE "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_CDE=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_CDE\${ac_dB}HAVE_CDE\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_CDE\${ac_uB}HAVE_CDE\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_CDE\${ac_eB}HAVE_CDE\${ac_eC}1\${ac_eD}
-"
-}
-
-
-# having CDE implies Tooltalk
-if test "${with_cde}"      = "yes" -a \
-        "${with_tooltalk}" != "no" -a \
-	"${with_tooltalk}" != "none" ; then
-  with_tooltalk='yes'
-fi
-
-# having CDE requires Motif
-if test "${with_cde}" = "yes" ; then
-  motif_libs="-lXm -lXt"
-fi
-
-#
-# See if we can find OffiX.
-#
-if test "${window_system}" != "none" -a \
-	"${with_offix}"    != "no"   -a \
-	"${with_offix}"    != "yes" ; then
-  internal_offix_lib_found='no'
-  ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lDnd"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lDnd"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; internal_offix_lib_found='yes'
-else
-   :; 
-fi
-
-  if test "${internal_offix_lib_found}" = "yes" ; then
-    internal_offix_includes_found='no'
-    for arg in ${DEFS} /usr/include ; do
-      if test -f `echo "${arg}/OffiX/DragAndDrop.h" | sed 's/^\-I//'` ; then
-        internal_offix_includes_found='yes'
-      fi
-    done
-    test "${internal_offix_includes_found}" = "yes" && with_offix='yes'
-  fi
-fi
-test "${with_offix}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_OFFIX_DND"
-echo "#define" HAVE_OFFIX_DND "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_OFFIX_DND=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_OFFIX_DND\${ac_dB}HAVE_OFFIX_DND\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_OFFIX_DND\${ac_uB}HAVE_OFFIX_DND\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_OFFIX_DND\${ac_eB}HAVE_OFFIX_DND\${ac_eC}1\${ac_eD}
-"
-}
-
-
-# X window options
-if test "${window_system}" != "none" ; then
-  test -n "$silent" || echo "checking the version of X11 being used"
-cat > conftest.${ac_ext} <<EOF
-#include <X11/Intrinsic.h>
-int main() {
-#if (XlibSpecificationRelease == 4)
-  printf ("X11R4\n");
-#elif (XlibSpecificationRelease == 5)
-  printf ("X11R5\n");
-#elif (XlibSpecificationRelease == 6)
-  printf ("X11R6\n");
-#elif (XtSpecificationRelease == 4)
-  printf ("X11R4\n");
-#endif
-  return 0;
-}
-EOF
-ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} ${DEFS}"
-if eval $ac_compile; then
-  case "`./conftest`" in
-    X11R4 ) 
-{
-test -n "$verbose" && \
-echo "	defining THIS_IS_X11R4"
-echo "#define" THIS_IS_X11R4 "1" >> confdefs.h
-DEFS="$DEFS -DTHIS_IS_X11R4=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}THIS_IS_X11R4\${ac_dB}THIS_IS_X11R4\${ac_dC}1\${ac_dD}
-\${ac_uA}THIS_IS_X11R4\${ac_uB}THIS_IS_X11R4\${ac_uC}1\${ac_uD}
-\${ac_eA}THIS_IS_X11R4\${ac_eB}THIS_IS_X11R4\${ac_eC}1\${ac_eD}
-"
-}
- ;;
-    X11R5 ) 
-{
-test -n "$verbose" && \
-echo "	defining THIS_IS_X11R5"
-echo "#define" THIS_IS_X11R5 "1" >> confdefs.h
-DEFS="$DEFS -DTHIS_IS_X11R5=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}THIS_IS_X11R5\${ac_dB}THIS_IS_X11R5\${ac_dC}1\${ac_dD}
-\${ac_uA}THIS_IS_X11R5\${ac_uB}THIS_IS_X11R5\${ac_uC}1\${ac_uD}
-\${ac_eA}THIS_IS_X11R5\${ac_eB}THIS_IS_X11R5\${ac_eC}1\${ac_eD}
-"
-}
- ;;
-    X11R6 ) 
-{
-test -n "$verbose" && \
-echo "	defining THIS_IS_X11R6"
-echo "#define" THIS_IS_X11R6 "1" >> confdefs.h
-DEFS="$DEFS -DTHIS_IS_X11R6=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}THIS_IS_X11R6\${ac_dB}THIS_IS_X11R6\${ac_dC}1\${ac_dD}
-\${ac_uA}THIS_IS_X11R6\${ac_uB}THIS_IS_X11R6\${ac_uC}1\${ac_uD}
-\${ac_eA}THIS_IS_X11R6\${ac_eB}THIS_IS_X11R6\${ac_eC}1\${ac_eD}
-"
-}
- ;;
-  esac
-fi
-LIBS=$ac_save_LIBS
-rm -f conftest*
-
-  for ac_hdr in X11/Xlocale.h
-do
-ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./' '[A-Z]__'`
-test -n "$silent" || echo "checking for ${ac_hdr}"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <${ac_hdr}>
-EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+  ac_safe=`echo "editorconn.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for editorconn.h""... $ac_c" 1>&6
+echo "configure:5146: checking for editorconn.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5149 "configure"
+#include "confdefs.h"
+#include <editorconn.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:5154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining ${ac_tr_hdr}"
-echo "#define" ${ac_tr_hdr} "1" >> confdefs.h
-DEFS="$DEFS -D${ac_tr_hdr}=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}${ac_tr_hdr}\${ac_dB}${ac_tr_hdr}\${ac_dC}1\${ac_dD}
-\${ac_uA}${ac_tr_hdr}\${ac_uB}${ac_tr_hdr}\${ac_uC}1\${ac_uD}
-\${ac_eA}${ac_tr_hdr}\${ac_eB}${ac_tr_hdr}\${ac_eC}1\${ac_eD}
-"
-}
-
-
-fi
-rm -f conftest*
-done
-
-fi
-
-#
-# if Energize specified, make sure we can find its need libraries/headers
-#
-if test "${with_energize}" = "yes" ; then
-  ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lenergize"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lenergize"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; energize_version='3.X'
-else
-   :; 
-fi
-
-  if test "${energize_version}" = "no" ; then
-    ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lconn"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lconn"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; energize_version='2.X'
-else
-   :; 
-fi
-
-    if test "${energize_version}" = "no" ; then
-      echo "Unable to find Energize library." >&2
-      exit 1
-    fi
-  fi
-
-  internal_eincludes_found='no'
-  for arg in ${DEFS} /usr/include
-  do
-    if test -f `echo "${arg}/editorconn.h" | sed 's/^\-I//'` ; then
-      internal_eincludes_found='yes'
-    fi
-  done
-  if test "${internal_eincludes_found}" = "no" ; then
-    echo "Unable to find Energize editorconn.h header file." >&2
-    exit 1
-  fi
-fi
-
-#
-# logb and frexp are found in -lm on most systems.
-#
-ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lm"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lm"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   
-{
-test -n "$verbose" && \
-echo "	defining HAVE_LIBM"
-echo "#define" HAVE_LIBM "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_LIBM=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_LIBM\${ac_dB}HAVE_LIBM\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_LIBM\${ac_uB}HAVE_LIBM\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_LIBM\${ac_eB}HAVE_LIBM\${ac_eC}1\${ac_eD}
-"
-}
-
-   LIBS="${LIBS} -lm"
-fi
-
-
-#
-# see if XPM is hanging around somewhere
-#
-test "${window_system}" != "none" -a \
-     "${with_xpm}"      != "no"   -a \
-     "${with_xpm}"      != "yes" && { ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lXpm"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lXpm"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; with_xpm="yes"
-else
-   :; 
+  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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+{ echo "configure: error: Unable to find Energize editorconn.h header file." 1>&2; exit 1; }
+fi
+
+
+  test "$energize_version" = "2.X" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining ENERGIZE_2
+EOF
+cat >> confdefs.h <<\EOF
+#define ENERGIZE_2 1
+EOF
+}
+
+  test "$energize_version" = "3.X" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining ENERGIZE_3
+EOF
+cat >> confdefs.h <<\EOF
+#define ENERGIZE_3 1
+EOF
+}
+
+fi
+
+
+echo "checking for graphics libraries" 1>&6
+echo "configure:5196: checking for graphics libraries" >&5
+test -z "$with_gif" && with_gif=yes;
+if test "$with_gif" = "yes"; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_GIF
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_GIF 1
+EOF
+}
+
+  extra_objs="$extra_objs dgif_lib.o gif_err.o gifalloc.o"
+fi
+
+test -z "$with_xpm" && { ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6
+echo "configure:5212: checking for X11/xpm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5215 "configure"
+#include "confdefs.h"
+#include <X11/xpm.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:5220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_xpm=no
 fi
  }
-
-test "${with_xpm}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_XPM"
-echo "#define" HAVE_XPM "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_XPM=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_XPM\${ac_dB}HAVE_XPM\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_XPM\${ac_uB}HAVE_XPM\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_XPM\${ac_eB}HAVE_XPM\${ac_eC}1\${ac_eD}
-"
-}
-
-
-#
-# see if Xmu is hanging around somewhere
-#
-# FSF 19.31 has this:
-#dnl If using toolkit, check whether libXmu.a exists.
-#dnl tranle@intellicorp.com says libXmu.a can need XtMalloc in libXt.a to link.
-#  OLDLIBS="$LIBS"
-#  if test x$HAVE_X11XTR6 = xyes; then
-#    LIBS="-lXt -lSM -lICE $LIBS"
-#  else
-#    LIBS="-lXt $LIBS"
-#  fi
-#  A C_CHECK_LIB(Xmu, XmuConvertStandardSelection)
-#  LIBS="$OLDLIBS"
-
-if test "${window_system}" != "none" ; then
-  if test "${with_xmu}" != "no" ; then
-    test "${with_xmu}" != "yes" && { ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lXmu"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lXmu"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; with_xmu="yes"
-else
-   :; 
-fi
+test -z "$with_xpm" && { 
+echo $ac_n "checking for XpmReadFileToData in -lXpm""... $ac_c" 1>&6
+echo "configure:5243: checking for XpmReadFileToData in -lXpm" >&5
+ac_lib_var=`echo Xpm'_'XpmReadFileToData | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lXpm "
+cat > conftest.$ac_ext <<EOF
+#line 5248 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char XpmReadFileToData();
+
+int main() {
+XpmReadFileToData()
+; return 0; }
+EOF
+if { (eval echo configure:5259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_xpm=no
+fi
+
  }
-    # On SunOS4 (and 5!) we must kludge harder to try to detect Xmu
-    # Upgrade to autoconf 2 and use ac_check_lib - mrb
-    if test "${with_xmu}" != "yes" ; then
-      # begin expansion of ac_have_library
-      ac_save_LIBS="${LIBS}"
-      LIBS="${LIBS} -lXmu -lXt -lXext -lX11 -lm"
-      if test ${machine} = sparc -a ${opsys} = linux; then
-	LIBS="${LIBS} -lICE -lSM"
-      fi
-      ac_have_lib=""
-      cat > conftest.${ac_ext} <<EOF
-int main() { return 0; }
-EOF
-      if eval $ac_compile; then
-        rm -rf conftest*
-        ac_have_lib="1"
-      fi
-      rm -f conftest*
-      LIBS="${ac_save_LIBS}"
-      test -n "${ac_have_lib}" && with_xmu="yes"
-      # end expansion of ac_have_library
-    fi
-    # Sparc/Linux test - fp
-    if test "${with_xmu}" != "yes" -a  ${machine} = sparc -a ${opsys} = linux; then
-      # begin expansion of ac_have_library
-      ac_save_LIBS="${LIBS}"
-      LIBS="${LIBS} -lXmu -lXt -lXext -lX11 -lm -lICE -lSM"
-      ac_have_lib=""
-      cat > conftest.${ac_ext} <<EOF
-int main() { return 0; }
-EOF
-      if eval $ac_compile; then
-        rm -rf conftest*
-        ac_have_lib="1"
-      fi
-      rm -f conftest*
-      LIBS="${ac_save_LIBS}"
-      test -n "${ac_have_lib}" && with_xmu="yes"
-      # end expansion of ac_have_library
-    fi
-    # On UnixWare 2.1 we must kludge harder to try to detect Xmu
-    # Upgrade to autoconf 2 and use ac_check_lib - mrb
-    if test "${with_xmu}" != "yes" && test -f "/.UpgradeVer2.1" ; then
-      # begin expansion of ac_have_library
-      ac_save_LIBS="${LIBS}"
-      if test x$HAVE_XFREE386 = xyes; then
-	LIBS="-lXt -lSM -lICE ${LIBS}"
-      else
-	LIBS="${LIBS} -lXmu -lXt -lXext -lX11"
-      fi
-      ac_have_lib=""
-      cat > conftest.${ac_ext} <<EOF
-int main() { return 0; }
-EOF
-      if eval $ac_compile; then
-        rm -rf conftest*
-        ac_have_lib="1"
-      fi
-      rm -f conftest*
-      LIBS="${ac_save_LIBS}"
-      test -n "${ac_have_lib}" && with_xmu="yes"
-      # end expansion of ac_have_library
-    fi
-  fi
-fi
-test "${with_xmu}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_XMU"
-echo "#define" HAVE_XMU "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_XMU=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_XMU\${ac_dB}HAVE_XMU\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_XMU\${ac_uB}HAVE_XMU\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_XMU\${ac_eB}HAVE_XMU\${ac_eC}1\${ac_eD}
-"
-}
-
-
-#
-# see if COMPFACE is hanging around somewhere
-#
-if test "${window_system}" != "none" -a \
-        "${with_xface}"    != "no"   -a \
-        "${with_xface}"    != "yes" ; then
-  test -n "$silent" || echo "checking for compface.h"
-cat > conftest.${ac_ext} <<EOF
+test -z "$with_xpm" && with_xpm=yes
+if test "$with_xpm" = "yes"; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_XPM
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_XPM 1
+EOF
+}
+
+  libs_x="-lXpm $libs_x"
+fi
+
+test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for compface.h""... $ac_c" 1>&6
+echo "configure:5295: checking for compface.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5298 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:5303: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
-  compface_incl="yes"
-
-else
-  rm -rf conftest*
-  with_xface="no"
-fi
-rm -f conftest*
-
-  if test "${compface_incl}" = "yes" ; then
-    ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lcompface"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lcompface"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; with_xface="yes"
-else
-   :; 
-fi
-
-  fi
-fi
-test "${with_xface}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_XFACE"
-echo "#define" HAVE_XFACE "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_XFACE=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_XFACE\${ac_dB}HAVE_XFACE\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_XFACE\${ac_uB}HAVE_XFACE\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_XFACE\${ac_eB}HAVE_XFACE\${ac_eC}1\${ac_eD}
-"
-}
-
-
-#
-# check whether we're using GIF support
-#
-if test "${window_system}" = "none" ; then
-  if test -z "${with_gif}" ; then
-    with_gif=no
-  elif test "${with_gif}" != "no" ; then
-    echo "GIF support cannot be specified without a window system."
-    exit 1
-  fi
-elif test -z "${with_gif}" ; then
-  with_gif=yes
-fi
-test "${with_gif}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_GIF"
-echo "#define" HAVE_GIF "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_GIF=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_GIF\${ac_dB}HAVE_GIF\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_GIF\${ac_uB}HAVE_GIF\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_GIF\${ac_eB}HAVE_GIF\${ac_eC}1\${ac_eD}
-"
-}
-
-
-if test "${window_system}" = "none" ; then
-  if test -z "${with_jpeg}" ; then
-    with_jpeg=no
-  elif test "${with_jpeg}" != "no" ; then
-    echo "JPEG support cannot be specified without a window system."
-    exit 1
-  fi
-else
-  if test "${with_jpeg}" != "no" -a \
-          "${with_jpeg}" != "yes" ; then
-    test -n "$silent" || echo "checking for jpeglib.h"
-cat > conftest.${ac_ext} <<EOF
+  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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_xface=no
+fi
+ }
+test -z "$with_xface" && { 
+echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
+echo "configure:5326: checking for UnGenFace in -lcompface" >&5
+ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lcompface "
+cat > conftest.$ac_ext <<EOF
+#line 5331 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char UnGenFace();
+
+int main() {
+UnGenFace()
+; return 0; }
+EOF
+if { (eval echo configure:5342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  : 
+else
+  echo "$ac_t""no" 1>&6
+with_xface=no
+fi
+
+ }
+test -z "$with_xface" && with_xface=yes
+if test "$with_xface" = "yes"; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_XFACE
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_XFACE 1
+EOF
+}
+
+  libs_x="-lcompface $libs_x"
+fi
+
+test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
+echo "configure:5378: checking for jpeglib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5381 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:5386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
-  jpeglib_incl="yes"
-
-else
-  rm -rf conftest*
-  with_jpeg="no"
-fi
-rm -f conftest*
-
-    test "${jpeglib_incl}" = "yes" && { ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -ljpeg"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -ljpeg"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; with_jpeg="yes"
-else
-   :; 
+  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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_jpeg=no
 fi
  }
-  fi
-fi
-test "${with_jpeg}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_JPEG"
-echo "#define" HAVE_JPEG "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_JPEG=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_JPEG\${ac_dB}HAVE_JPEG\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_JPEG\${ac_uB}HAVE_JPEG\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_JPEG\${ac_eB}HAVE_JPEG\${ac_eC}1\${ac_eD}
-"
-}
-
-
-if test "${window_system}" = "none" ; then
-  if test -z "${with_png}" ; then
-    with_png=no
-  elif test "${with_png}" != "no" ; then
-    echo "PNG support cannot be specified without a window system."
-    exit 1
-  fi
-fi
-test -z "${with_png}" && { test -n "$silent" || echo "checking for png.h"
-cat > conftest.${ac_ext} <<EOF
+test -z "$with_jpeg" && { 
+echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
+echo "configure:5409: checking for jpeg_destroy_decompress in -ljpeg" >&5
+ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -ljpeg "
+cat > conftest.$ac_ext <<EOF
+#line 5414 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char jpeg_destroy_decompress();
+
+int main() {
+jpeg_destroy_decompress()
+; return 0; }
+EOF
+if { (eval echo configure:5425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_jpeg=no
+fi
+
+ }
+test -z "$with_jpeg" && with_jpeg=yes
+if test "$with_jpeg" = "yes"; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_JPEG
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_JPEG 1
+EOF
+}
+
+  libs_x="-ljpeg $libs_x"
+fi
+
+test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for png.h""... $ac_c" 1>&6
+echo "configure:5461: checking for png.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5464 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:5469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
   :
 else
-  rm -rf conftest*
-  with_png="no"
-fi
-rm -f conftest*
+  echo "$ac_t""no" 1>&6
+with_png=no
+fi
  }
-test -z "${with_png}" && { test -n "$silent" || echo "checking for pow"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() { 
+test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
+echo "configure:5491: checking for pow" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5494 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char pow(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char pow();
+
+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_pow) || defined (__stub___pow)
 choke me
 #else
-/* Override any gcc2 internal prototype to avoid an error.  */
-extern char pow(); pow();
+pow();
 #endif
+
 ; return 0; }
 EOF
-if eval $ac_compile; then
+if { (eval echo configure:5517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_func_pow=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_pow=no"
+fi
+rm -f conftest*
+
+if eval "test \"`echo '$ac_cv_func_'pow`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
   :
 else
-  rm -rf conftest*
-  with_png="no"
-fi
-rm -f conftest*
- }
-if test -z "${with_png}" ; then
-  ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lz"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lz"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; with_png="yes"
-else
-   :; 
-fi
-
-  test -z "${with_png}" && { ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lgz"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lgz"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; with_png="gnuz"
-else
-   :; with_png="no"
+  echo "$ac_t""no" 1>&6
+with_png=no
 fi
  }
-  if test "${with_png}" != "no"; then
-    png_save_libs="${LIBS}"
-    case "${with_png}" in
-      yes  ) LIBS="${LIBS} -lz" ;;
-      gnuz ) LIBS="${LIBS} -lgz" ;;
-    esac
-    ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lpng"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lpng"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; 
-else
-   :; with_png="no"
-fi
-
-    LIBS="$png_save_libs"
-  fi
-fi
-case "${with_png}" in
-  yes  ) 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_PNG"
-echo "#define" HAVE_PNG "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_PNG=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_PNG\${ac_dB}HAVE_PNG\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_PNG\${ac_uB}HAVE_PNG\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_PNG\${ac_eB}HAVE_PNG\${ac_eC}1\${ac_eD}
-"
-}
- ;;
-  gnuz ) 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_PNG"
-echo "#define" HAVE_PNG "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_PNG=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_PNG\${ac_dB}HAVE_PNG\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_PNG\${ac_uB}HAVE_PNG\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_PNG\${ac_eB}HAVE_PNG\${ac_eC}1\${ac_eD}
-"
-}
- 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_PNG_GNUZ"
-echo "#define" HAVE_PNG_GNUZ "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_PNG_GNUZ=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_PNG_GNUZ\${ac_dB}HAVE_PNG_GNUZ\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_PNG_GNUZ\${ac_uB}HAVE_PNG_GNUZ\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_PNG_GNUZ\${ac_eB}HAVE_PNG_GNUZ\${ac_eC}1\${ac_eD}
-"
-}
- ;;
+if test "$with_png" != "no"; then
+  for extra_libs in "" "-lz" "-lgz"; do
+    
+xe_msg_checking="for png_read_image in -lpng"
+test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
+echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
+echo "configure:5542: checking "$xe_msg_checking"" >&5
+ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lpng $extra_libs"
+cat > conftest.$ac_ext <<EOF
+#line 5547 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char png_read_image();
+
+int main() {
+png_read_image()
+; return 0; }
+EOF
+if { (eval echo configure:5558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  png_libs="-lpng $extra_libs" with_png=yes; break
+else
+  echo "$ac_t""no" 1>&6
+:
+fi
+
+
+  done
+fi
+test -z "$with_png" && with_png=no
+if test "$with_png" = "yes"; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_PNG
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_PNG 1
+EOF
+}
+
+  libs_x="$png_libs $libs_x"
+fi
+
+if test "$with_tiff" = "yes"; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_TIFF
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_TIFF 1
+EOF
+}
+
+  libs_x="-ltiff $libs_x"
+fi
+
+
+case "$with_menubars" in "" | "yes" | "athena" )
+  with_menubars="lucid" ;;
+esac
+case "$with_dialogs" in "" | "yes" | "lucid"  )
+  if   test "$have_motif" = "yes"; then with_dialogs="motif"
+  elif test "$have_xaw"   = "yes"; then with_dialogs="athena"
+  else with_dialogs=no
+  fi ;;
+esac
+case "$with_scrollbars" in "" | "yes" )
+  with_scrollbars="lucid" ;;
+esac
+
+all_widgets="$with_menubars $with_scrollbars $with_dialogs $with_toolbars"
+
+case "$all_widgets" in *athena* )
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining LWLIB_USES_ATHENA
+EOF
+cat >> confdefs.h <<\EOF
+#define LWLIB_USES_ATHENA 1
+EOF
+}
+
+  libs_x="-lXaw $libs_x" ;;
+esac
+
+case "$all_widgets" in *motif* )
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining LWLIB_USES_MOTIF
+EOF
+cat >> confdefs.h <<\EOF
+#define LWLIB_USES_MOTIF 1
+EOF
+}
+
+  need_motif=yes ;;
 esac
 
-test "${with_tiff}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_TIFF"
-echo "#define" HAVE_TIFF "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_TIFF=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_TIFF\${ac_dB}HAVE_TIFF\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_TIFF\${ac_uB}HAVE_TIFF\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_TIFF\${ac_eB}HAVE_TIFF\${ac_eC}1\${ac_eD}
-"
-}
-
-
-# We use Lucid toolkit defaults for the menubars and scrollbars, but
-# if Motif is available we use it for the dialog boxes.
-if test "${window_system}" != "none" ; then
-  save_libs="${LIBS}"
-  if test "x${with_dialogs}" = "x" ; then
-      # We can't use ac_have_library because it simply appends -lXm to the
-      # end of the link line which is insufficient since -lXm will generate
-      # dependencies on -lXt
-# begin expansion of ac_have_library
-ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lXm -lXt ${LIBS}"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lXm"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; with_dialogs="motif" motif_libs="-lXm -lXt"
-else
-   :; 
-fi
-# end expansion of ac_have_library
-    # Sigh.  My Motif (MoTeeth) under Linux also depends on Xpm and Xext.
-    if test "${with_dialogs}" != "motif" ; then
-# begin expansion of ac_have_library
-ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lXm -lXt -lXpm -lXext ${LIBS}"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lXm in another way"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; with_dialogs="motif" motif_libs="-lXm -lXt -lXpm -lXext"
-else
-   :; 
-fi
-# end expansion of ac_have_library
-    fi
-    test "${with_dialogs}" = "motif" && test -n "$verbose" && echo "	Found Motif"
+case "$with_scrollbars" in athena* ) { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining LWLIB_SCROLLBARS_ATHENA
+EOF
+cat >> confdefs.h <<\EOF
+#define LWLIB_SCROLLBARS_ATHENA 1
+EOF
+}
+;; esac
+case "$with_dialogs"    in athena* ) { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining LWLIB_DIALOGS_ATHENA
+EOF
+cat >> confdefs.h <<\EOF
+#define LWLIB_DIALOGS_ATHENA 1
+EOF
+}
+   ;; esac
+test "$with_scrollbars" = "athena3d" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining LWLIB_SCROLLBARS_ATHENA3D
+EOF
+cat >> confdefs.h <<\EOF
+#define LWLIB_SCROLLBARS_ATHENA3D 1
+EOF
+}
+
+test "$with_dialogs"    = "athena3d" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining LWLIB_DIALOGS_ATHENA3D
+EOF
+cat >> confdefs.h <<\EOF
+#define LWLIB_DIALOGS_ATHENA3D 1
+EOF
+}
+
+
+test "$with_menubars"   != "no"    && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_MENUBARS
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_MENUBARS 1
+EOF
+}
+
+test "$with_scrollbars" != "no"    && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_SCROLLBARS
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_SCROLLBARS 1
+EOF
+}
+
+test "$with_dialogs"    != "no"    && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_DIALOGS
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_DIALOGS 1
+EOF
+}
+
+test "$with_toolbars"   != "no"    && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_TOOLBARS
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_TOOLBARS 1
+EOF
+}
+
+
+test "$with_menubars"   = "lucid"  && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining LWLIB_MENUBARS_LUCID
+EOF
+cat >> confdefs.h <<\EOF
+#define LWLIB_MENUBARS_LUCID 1
+EOF
+}
+
+test "$with_scrollbars" = "lucid"  && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining LWLIB_SCROLLBARS_LUCID
+EOF
+cat >> confdefs.h <<\EOF
+#define LWLIB_SCROLLBARS_LUCID 1
+EOF
+}
+
+
+test "$with_menubars"   = "motif"  && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining LWLIB_MENUBARS_MOTIF
+EOF
+cat >> confdefs.h <<\EOF
+#define LWLIB_MENUBARS_MOTIF 1
+EOF
+}
+
+test "$with_scrollbars" = "motif"  && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining LWLIB_SCROLLBARS_MOTIF
+EOF
+cat >> confdefs.h <<\EOF
+#define LWLIB_SCROLLBARS_MOTIF 1
+EOF
+}
+
+test "$with_dialogs"    = "motif"  && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining LWLIB_DIALOGS_MOTIF
+EOF
+cat >> confdefs.h <<\EOF
+#define LWLIB_DIALOGS_MOTIF 1
+EOF
+}
+
+
+test "$with_menubars"   != "no"      && extra_objs="$extra_objs menubar.o"
+test "$with_scrollbars" != "no"      && extra_objs="$extra_objs scrollbar.o"
+test "$with_dialogs"    != "no"      && extra_objs="$extra_objs dialog.o"
+test "$with_toolbars"   != "no"      && extra_objs="$extra_objs toolbar.o"
+test "$all_widgets" != "no no no no" && extra_objs="$extra_objs gui.o"
+
+if test "$with_x11" = "yes"; then
+  test "$with_menubars"   != "no"      && extra_objs="$extra_objs menubar-x.o"
+  test "$with_scrollbars" != "no"      && extra_objs="$extra_objs scrollbar-x.o"
+  test "$with_dialogs"    != "no"      && extra_objs="$extra_objs dialog-x.o"
+  test "$with_toolbars"   != "no"      && extra_objs="$extra_objs toolbar-x.o"
+  test "$all_widgets" != "no no no no" && extra_objs="$extra_objs gui-x.o"
+fi
+
+
+test -z "$with_mule" && with_mule=no
+
+if test "$with_mule" = "yes" ; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining MULE
+EOF
+cat >> confdefs.h <<\EOF
+#define MULE 1
+EOF
+}
+
+  extra_objs="$extra_objs mule.o mule-ccl.o mule-charset.o mule-coding.o"
+
+    
+echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
+echo "configure:5784: checking for strerror in -lintl" >&5
+ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lintl "
+cat > conftest.$ac_ext <<EOF
+#line 5789 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char strerror();
+
+int main() {
+strerror()
+; return 0; }
+EOF
+if { (eval echo configure:5800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo intl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_lib
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+}
+
+  LIBS="-lintl $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
+  echo "checking for Mule input methods" 1>&6
+echo "configure:5833: checking for Mule input methods" >&5
+    case "$with_xim" in "" | "yes" )
+    echo "checking for XIM" 1>&6
+echo "configure:5836: checking for XIM" >&5
+    
+echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
+echo "configure:5839: checking for XmImMbLookupString in -lXm" >&5
+ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lXm "
+cat > conftest.$ac_ext <<EOF
+#line 5844 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char XmImMbLookupString();
+
+int main() {
+XmImMbLookupString()
+; return 0; }
+EOF
+if { (eval echo configure:5855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  with_xim=motif
+else
+  echo "$ac_t""no" 1>&6
+with_xim=xlib
+fi
+
+
+  esac
+  if test "$with_xim" != "no" ; then
+    { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_XIM
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_XIM 1
+EOF
+}
+
+    if test "$with_xim" = "xlib"; then
+      { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining XIM_XLIB
+EOF
+cat >> confdefs.h <<\EOF
+#define XIM_XLIB 1
+EOF
+}
+
+      extra_objs="$extra_objs input-method-xlib.o"
   fi
-fi
-
-# Finish ensuring that we have values for the various toolkit items.
-
-test "${with_menubars}"   = "motif" -o \
-     "${with_scrollbars}" = "motif" -o \
-     "${with_dialogs}"    = "motif"  && with_motif="yes"
-test "${with_menubars}"   = "athena" -o \
-     "${with_scrollbars}" = "athena" -o \
-     "${with_dialogs}"    = "athena"  && with_athena="yes"
-test "${with_menubars}"   = "athena3d" -o \
-     "${with_scrollbars}" = "athena3d" -o \
-     "${with_dialogs}"    = "athena3d"  && with_athena="yes"
-test "${with_menubars}"   = ""       && with_menubars="lucid"
-test "${with_menubars}"   = "athena" && with_menubars="lucid"
-test "${with_scrollbars}" = ""       && with_scrollbars="lucid"
-test "${with_dialogs}"    = ""       && with_dialogs="athena"
-test "${with_dialogs}"    = "lucid"  && with_dialogs="athena"
-
-test "${with_menubars}"   != "no"    && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_MENUBARS"
-echo "#define" HAVE_MENUBARS "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_MENUBARS=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_MENUBARS\${ac_dB}HAVE_MENUBARS\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_MENUBARS\${ac_uB}HAVE_MENUBARS\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_MENUBARS\${ac_eB}HAVE_MENUBARS\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_scrollbars}" != "no"    && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_SCROLLBARS"
-echo "#define" HAVE_SCROLLBARS "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_SCROLLBARS=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_SCROLLBARS\${ac_dB}HAVE_SCROLLBARS\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_SCROLLBARS\${ac_uB}HAVE_SCROLLBARS\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_SCROLLBARS\${ac_eB}HAVE_SCROLLBARS\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_dialogs}"    != "no"    && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_DIALOGS"
-echo "#define" HAVE_DIALOGS "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_DIALOGS=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_DIALOGS\${ac_dB}HAVE_DIALOGS\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_DIALOGS\${ac_uB}HAVE_DIALOGS\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_DIALOGS\${ac_eB}HAVE_DIALOGS\${ac_eC}1\${ac_eD}
-"
-}
-
-
-test "${with_menubars}"   = "lucid"  && 
-{
-test -n "$verbose" && \
-echo "	defining LWLIB_MENUBARS_LUCID"
-echo "#define" LWLIB_MENUBARS_LUCID "1" >> confdefs.h
-DEFS="$DEFS -DLWLIB_MENUBARS_LUCID=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}LWLIB_MENUBARS_LUCID\${ac_dB}LWLIB_MENUBARS_LUCID\${ac_dC}1\${ac_dD}
-\${ac_uA}LWLIB_MENUBARS_LUCID\${ac_uB}LWLIB_MENUBARS_LUCID\${ac_uC}1\${ac_uD}
-\${ac_eA}LWLIB_MENUBARS_LUCID\${ac_eB}LWLIB_MENUBARS_LUCID\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_menubars}"   = "motif"  && 
-{
-test -n "$verbose" && \
-echo "	defining LWLIB_MENUBARS_MOTIF"
-echo "#define" LWLIB_MENUBARS_MOTIF "1" >> confdefs.h
-DEFS="$DEFS -DLWLIB_MENUBARS_MOTIF=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}LWLIB_MENUBARS_MOTIF\${ac_dB}LWLIB_MENUBARS_MOTIF\${ac_dC}1\${ac_dD}
-\${ac_uA}LWLIB_MENUBARS_MOTIF\${ac_uB}LWLIB_MENUBARS_MOTIF\${ac_uC}1\${ac_uD}
-\${ac_eA}LWLIB_MENUBARS_MOTIF\${ac_eB}LWLIB_MENUBARS_MOTIF\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_scrollbars}" = "lucid"  && 
-{
-test -n "$verbose" && \
-echo "	defining LWLIB_SCROLLBARS_LUCID"
-echo "#define" LWLIB_SCROLLBARS_LUCID "1" >> confdefs.h
-DEFS="$DEFS -DLWLIB_SCROLLBARS_LUCID=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}LWLIB_SCROLLBARS_LUCID\${ac_dB}LWLIB_SCROLLBARS_LUCID\${ac_dC}1\${ac_dD}
-\${ac_uA}LWLIB_SCROLLBARS_LUCID\${ac_uB}LWLIB_SCROLLBARS_LUCID\${ac_uC}1\${ac_uD}
-\${ac_eA}LWLIB_SCROLLBARS_LUCID\${ac_eB}LWLIB_SCROLLBARS_LUCID\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_scrollbars}" = "motif"  && 
-{
-test -n "$verbose" && \
-echo "	defining LWLIB_SCROLLBARS_MOTIF"
-echo "#define" LWLIB_SCROLLBARS_MOTIF "1" >> confdefs.h
-DEFS="$DEFS -DLWLIB_SCROLLBARS_MOTIF=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}LWLIB_SCROLLBARS_MOTIF\${ac_dB}LWLIB_SCROLLBARS_MOTIF\${ac_dC}1\${ac_dD}
-\${ac_uA}LWLIB_SCROLLBARS_MOTIF\${ac_uB}LWLIB_SCROLLBARS_MOTIF\${ac_uC}1\${ac_uD}
-\${ac_eA}LWLIB_SCROLLBARS_MOTIF\${ac_eB}LWLIB_SCROLLBARS_MOTIF\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_scrollbars}" = "athena" && 
-{
-test -n "$verbose" && \
-echo "	defining LWLIB_SCROLLBARS_ATHENA"
-echo "#define" LWLIB_SCROLLBARS_ATHENA "1" >> confdefs.h
-DEFS="$DEFS -DLWLIB_SCROLLBARS_ATHENA=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}LWLIB_SCROLLBARS_ATHENA\${ac_dB}LWLIB_SCROLLBARS_ATHENA\${ac_dC}1\${ac_dD}
-\${ac_uA}LWLIB_SCROLLBARS_ATHENA\${ac_uB}LWLIB_SCROLLBARS_ATHENA\${ac_uC}1\${ac_uD}
-\${ac_eA}LWLIB_SCROLLBARS_ATHENA\${ac_eB}LWLIB_SCROLLBARS_ATHENA\${ac_eC}1\${ac_eD}
-"
-}
-
-if test "${with_scrollbars}" = "athena3d"; then
-	
-{
-test -n "$verbose" && \
-echo "	defining LWLIB_SCROLLBARS_ATHENA"
-echo "#define" LWLIB_SCROLLBARS_ATHENA "1" >> confdefs.h
-DEFS="$DEFS -DLWLIB_SCROLLBARS_ATHENA=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}LWLIB_SCROLLBARS_ATHENA\${ac_dB}LWLIB_SCROLLBARS_ATHENA\${ac_dC}1\${ac_dD}
-\${ac_uA}LWLIB_SCROLLBARS_ATHENA\${ac_uB}LWLIB_SCROLLBARS_ATHENA\${ac_uC}1\${ac_uD}
-\${ac_eA}LWLIB_SCROLLBARS_ATHENA\${ac_eB}LWLIB_SCROLLBARS_ATHENA\${ac_eC}1\${ac_eD}
-"
-}
-
-	
-{
-test -n "$verbose" && \
-echo "	defining LWLIB_SCROLLBARS_ATHENA3D"
-echo "#define" LWLIB_SCROLLBARS_ATHENA3D "1" >> confdefs.h
-DEFS="$DEFS -DLWLIB_SCROLLBARS_ATHENA3D=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}LWLIB_SCROLLBARS_ATHENA3D\${ac_dB}LWLIB_SCROLLBARS_ATHENA3D\${ac_dC}1\${ac_dD}
-\${ac_uA}LWLIB_SCROLLBARS_ATHENA3D\${ac_uB}LWLIB_SCROLLBARS_ATHENA3D\${ac_uC}1\${ac_uD}
-\${ac_eA}LWLIB_SCROLLBARS_ATHENA3D\${ac_eB}LWLIB_SCROLLBARS_ATHENA3D\${ac_eC}1\${ac_eD}
-"
-}
-
-fi
-test "${with_dialogs}"    = "motif"  && 
-{
-test -n "$verbose" && \
-echo "	defining LWLIB_DIALOGS_MOTIF"
-echo "#define" LWLIB_DIALOGS_MOTIF "1" >> confdefs.h
-DEFS="$DEFS -DLWLIB_DIALOGS_MOTIF=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}LWLIB_DIALOGS_MOTIF\${ac_dB}LWLIB_DIALOGS_MOTIF\${ac_dC}1\${ac_dD}
-\${ac_uA}LWLIB_DIALOGS_MOTIF\${ac_uB}LWLIB_DIALOGS_MOTIF\${ac_uC}1\${ac_uD}
-\${ac_eA}LWLIB_DIALOGS_MOTIF\${ac_eB}LWLIB_DIALOGS_MOTIF\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_dialogs}"    = "athena" && 
-{
-test -n "$verbose" && \
-echo "	defining LWLIB_DIALOGS_ATHENA"
-echo "#define" LWLIB_DIALOGS_ATHENA "1" >> confdefs.h
-DEFS="$DEFS -DLWLIB_DIALOGS_ATHENA=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}LWLIB_DIALOGS_ATHENA\${ac_dB}LWLIB_DIALOGS_ATHENA\${ac_dC}1\${ac_dD}
-\${ac_uA}LWLIB_DIALOGS_ATHENA\${ac_uB}LWLIB_DIALOGS_ATHENA\${ac_uC}1\${ac_uD}
-\${ac_eA}LWLIB_DIALOGS_ATHENA\${ac_eB}LWLIB_DIALOGS_ATHENA\${ac_eC}1\${ac_eD}
-"
-}
-
-if test "${with_dialogs}"    = "athena3d"; then
-	
-{
-test -n "$verbose" && \
-echo "	defining LWLIB_DIALOGS_ATHENA"
-echo "#define" LWLIB_DIALOGS_ATHENA "1" >> confdefs.h
-DEFS="$DEFS -DLWLIB_DIALOGS_ATHENA=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}LWLIB_DIALOGS_ATHENA\${ac_dB}LWLIB_DIALOGS_ATHENA\${ac_dC}1\${ac_dD}
-\${ac_uA}LWLIB_DIALOGS_ATHENA\${ac_uB}LWLIB_DIALOGS_ATHENA\${ac_uC}1\${ac_uD}
-\${ac_eA}LWLIB_DIALOGS_ATHENA\${ac_eB}LWLIB_DIALOGS_ATHENA\${ac_eC}1\${ac_eD}
-"
-}
-
-	
-{
-test -n "$verbose" && \
-echo "	defining LWLIB_DIALOGS_ATHENA3D"
-echo "#define" LWLIB_DIALOGS_ATHENA3D "1" >> confdefs.h
-DEFS="$DEFS -DLWLIB_DIALOGS_ATHENA3D=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}LWLIB_DIALOGS_ATHENA3D\${ac_dB}LWLIB_DIALOGS_ATHENA3D\${ac_dC}1\${ac_dD}
-\${ac_uA}LWLIB_DIALOGS_ATHENA3D\${ac_uB}LWLIB_DIALOGS_ATHENA3D\${ac_uC}1\${ac_uD}
-\${ac_eA}LWLIB_DIALOGS_ATHENA3D\${ac_eB}LWLIB_DIALOGS_ATHENA3D\${ac_eC}1\${ac_eD}
-"
-}
-
-fi
-
-############################################################################
-#									   #
-#                             Misc other feature tests                     #
-#									   #
-############################################################################
-
-# Mule-dependent option processing
-if test "$with_mule" = "yes" ; then
-  # Do we have the XmIm* routines?  And if so, do we want to use them?
-  test "$with_xim" != no && test -n "$silent" || echo "checking for XIM"
-  if test -z "$with_xim" -o "$with_xim" = "yes" ; then
-    xim_save_libs="$LIBS"
-    LIBS="${motif_libs} ${LIBS}"
-    test -n "$silent" || echo "checking for XmImMbLookupString"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() { 
+    if test "$with_xim" = "motif"; then
+      { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining XIM_MOTIF
+EOF
+cat >> confdefs.h <<\EOF
+#define XIM_MOTIF 1
+EOF
+}
+
+      need_motif=yes
+      extra_objs="$extra_objs input-method-motif.o"
+  fi
+    fi
+
+    test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
+  test -z "$with_wnn" && { ac_safe=`echo "wnn/wnnerror.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for wnn/wnnerror.h""... $ac_c" 1>&6
+echo "configure:5914: checking for wnn/wnnerror.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5917 "configure"
+#include "confdefs.h"
+#include <wnn/wnnerror.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:5922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_wnn=no
+fi
+ }
+  test -z "$with_wnn" && { 
+echo $ac_n "checking for jl_dic_list in -lwnn""... $ac_c" 1>&6
+echo "configure:5945: checking for jl_dic_list in -lwnn" >&5
+ac_lib_var=`echo wnn'_'jl_dic_list | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lwnn "
+cat > conftest.$ac_ext <<EOF
+#line 5950 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char jl_dic_list();
+
+int main() {
+jl_dic_list()
+; return 0; }
+EOF
+if { (eval echo configure:5961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_wnn=no
+fi
+
+ }
+  test -z "$with_wnn" && with_wnn=yes
+  if test "$with_wnn" = "yes"; then
+    { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_WNN
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_WNN 1
+EOF
+}
+
+    libs_x="-lwnn $libs_x"
+    extra_objs="$extra_objs mule-wnnfns.o"
+    
+echo $ac_n "checking for jl_fi_dic_list in -lwnn""... $ac_c" 1>&6
+echo "configure:5996: checking for jl_fi_dic_list in -lwnn" >&5
+ac_lib_var=`echo wnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lwnn "
+cat > conftest.$ac_ext <<EOF
+#line 6001 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char jl_fi_dic_list();
+
+int main() {
+jl_fi_dic_list()
+; return 0; }
+EOF
+if { (eval echo configure:6012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  with_wnn6=yes
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+    test "$with_wnn6" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_WNN6
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_WNN6 1
+EOF
+}
+
+    fi
+
+    test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6
+echo "configure:6044: checking for canna/RK.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6047 "configure"
+#include "confdefs.h"
+#include <canna/RK.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:6052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_canna=no
+fi
+ }
+  test -z "$with_canna" && { 
+echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
+echo "configure:6075: checking for RkBgnBun in -lRKC" >&5
+ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lRKC "
+cat > conftest.$ac_ext <<EOF
+#line 6080 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char RkBgnBun();
+
+int main() {
+RkBgnBun()
+; return 0; }
+EOF
+if { (eval echo configure:6091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_canna=no
+fi
+
+ }
+  test -z "$with_canna" && { 
+echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
+echo "configure:6114: checking for jrKanjiControl in -lcanna" >&5
+ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lcanna "
+cat > conftest.$ac_ext <<EOF
+#line 6119 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char jrKanjiControl();
+
+int main() {
+jrKanjiControl()
+; return 0; }
+EOF
+if { (eval echo configure:6130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_canna=no
+fi
+
+ }
+  test -z "$with_canna" && with_canna=yes
+  if test "$with_canna" = "yes"; then
+    { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_CANNA
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_CANNA 1
+EOF
+}
+
+    libs_x="-lcanna -lRKC $libs_x"
+    extra_objs="$extra_objs mule-canna.o"
+    fi
+else # "$with_mule" = "no"
+  for feature in xim canna wnn; do
+    if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
+      echo "configure: warning: "--with-${feature} ignored:  Not valid without Mule support"" 1>&2
+    fi
+    eval "with_${feature}=no"
+  done
+fi
+
+
+test "$need_motif" = "yes" && libs_x="-lXm $libs_x"
+
+for ac_func in acosh asinh atanh cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random realpath rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask strcasecmp strerror tzset utimes waitpid
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:6179: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6182 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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() {
+
 /* 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_XmImMbLookupString) || defined (__stub___XmImMbLookupString)
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-/* Override any gcc2 internal prototype to avoid an error.  */
-extern char XmImMbLookupString(); XmImMbLookupString();
+$ac_func();
 #endif
+
 ; return 0; }
 EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  have_XmIm=yes
-
-else
-  rm -rf conftest*
-  have_XmIm=no
-fi
-rm -f conftest*
-
-    LIBS="$xim_save_libs"
-    if test "$with_xim" = "yes" -a "$have_XmIm" = "yes"; then with_xim=motif
-    elif test "$with_xim"  = "yes"; then with_xim=xlib
-    else                                 with_xim=no
-    fi
-  fi
-  if test "$with_xim" != "no" ; then
-    
-{
-test -n "$verbose" && \
-echo "	defining HAVE_XIM"
-echo "#define" HAVE_XIM "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_XIM=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_XIM\${ac_dB}HAVE_XIM\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_XIM\${ac_uB}HAVE_XIM\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_XIM\${ac_eB}HAVE_XIM\${ac_eC}1\${ac_eD}
-"
-}
-
-    test "$with_xim" = "xlib"  && 
-{
-test -n "$verbose" && \
-echo "	defining XIM_XLIB"
-echo "#define" XIM_XLIB "1" >> confdefs.h
-DEFS="$DEFS -DXIM_XLIB=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}XIM_XLIB\${ac_dB}XIM_XLIB\${ac_dC}1\${ac_dD}
-\${ac_uA}XIM_XLIB\${ac_uB}XIM_XLIB\${ac_uC}1\${ac_uD}
-\${ac_eA}XIM_XLIB\${ac_eB}XIM_XLIB\${ac_eC}1\${ac_eD}
-"
-}
-
-    test "$with_xim" = "motif" && 
-{
-test -n "$verbose" && \
-echo "	defining XIM_MOTIF"
-echo "#define" XIM_MOTIF "1" >> confdefs.h
-DEFS="$DEFS -DXIM_MOTIF=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}XIM_MOTIF\${ac_dB}XIM_MOTIF\${ac_dC}1\${ac_dD}
-\${ac_uA}XIM_MOTIF\${ac_uB}XIM_MOTIF\${ac_uC}1\${ac_uD}
-\${ac_eA}XIM_MOTIF\${ac_eB}XIM_MOTIF\${ac_eC}1\${ac_eD}
-"
-}
-
-  fi
-  # wnn6 implies wnn support
-  if test "$with_wnn6" = "yes" ; then
-    with_wnn=yes
-  fi
-else # Other internationalization features depend on Mule
-  with_mule="no"
-  for feature in xim canna wnn wnn6 ; do
-    if eval "test -n \"\$with_$feature\" -a \"\$with_$feature\" != no" ; then
-      echo "configure: warning: --with-$feature ignored:  Not valid without Mule support" >&2
-    fi
-    eval "with_$feature=no"
-  done
-fi
-
-#
-# set defaults for finding WNN includes and libs
-#
-if test "${with_wnn}" = "yes" ; then
-  for arg in "-I${wnn_includes}" "-I/usr/X11R6/include/wnn" "-I/usr/include/wnn"
-  do
-    if test -f `echo "${arg}/wnnerror.h" | sed 's/^\-I//'` ; then
-      C_SWITCH_SITE="${C_SWITCH_SITE} ${arg}"
-      wnn_includes=${arg}
-      break
-    fi
-  done
-  for arg in "-L${wnn_libraries}" "-L/usr/X11R6/lib" "-L/usr/lib"
-  do
-    if test -f `echo "${arg}/libwnn.a" | sed 's/^\-L//'` ; then
-      LD_SWITCH_SITE="${LD_SWITCH_SITE} ${arg}"
-      wnn_libraries=${arg}
-      break
-    fi
-  done
-fi
-
-#
-# set defaults for finding Canna includes and libs
-#
-if test "${with_canna}" = "yes" ; then
-  for arg in "-I${canna_includes}" "-I/usr/X11R6/include"
-  do
-    if test -f `echo "${arg}/canna/RK.h" | sed 's/^\-I//'` ; then
-      C_SWITCH_SITE="${C_SWITCH_SITE} ${arg}"
-      canna_includes=${arg}
-      break
-    fi
-  done
-  for arg in "-L${canna_libraries}" "-L/usr/X11R6/lib"
-  do
-    if test -f `echo "${arg}/libcanna.a" | sed 's/^\-L//'` ; then
-      LD_SWITCH_SITE="${LD_SWITCH_SITE} ${arg}"
-      canna_libraries=${arg}
-      break
-    fi
-  done
-fi
-
-# If netdb.h doesn't declare h_errno, we must declare it by hand.
-test -n "$silent" || echo "checking for declaration of h_errno in netdb.h"
-cat > conftest.${ac_ext} <<EOF
+if { (eval echo configure:6205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+
+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'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_func
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+}
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
+test "$ac_cv_func_realpath" = "yes" && extra_objs="$extra_objs realpath.o"
+
+echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
+echo "configure:6236: checking whether netdb declares h_errno" >&5
+cat > conftest.$ac_ext <<EOF
+#line 6238 "configure"
 #include "confdefs.h"
 #include <netdb.h>
-int main() { return 0; }
-int t() { int i = h_errno;; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining HAVE_H_ERRNO"
-echo "#define" HAVE_H_ERRNO "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_H_ERRNO=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_H_ERRNO\${ac_dB}HAVE_H_ERRNO\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_H_ERRNO\${ac_uB}HAVE_H_ERRNO\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_H_ERRNO\${ac_eB}HAVE_H_ERRNO\${ac_eC}1\${ac_eD}
-"
-}
-
-
-fi
-rm -f conftest*
-
-
-test -n "$silent" || echo "checking for sigsetjmp"
-cat > conftest.${ac_ext} <<EOF
+int main() {
+return h_errno;
+; return 0; }
+EOF
+if { (eval echo configure:6245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6
+   { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_H_ERRNO
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_H_ERRNO 1
+EOF
+}
+
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
+fi
+rm -f conftest*
+
+echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
+echo "configure:6265: checking for sigsetjmp" >&5
+cat > conftest.$ac_ext <<EOF
+#line 6267 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
-int main() { return 0; }
-int t() { sigjmp_buf bar; sigsetjmp (bar, 0);; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining HAVE_SIGSETJMP"
-echo "#define" HAVE_SIGSETJMP "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_SIGSETJMP=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_SIGSETJMP\${ac_dB}HAVE_SIGSETJMP\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_SIGSETJMP\${ac_uB}HAVE_SIGSETJMP\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_SIGSETJMP\${ac_eB}HAVE_SIGSETJMP\${ac_eC}1\${ac_eD}
-"
-}
-
-
-fi
-rm -f conftest*
-
-
-test -n "$silent" || echo "checking whether localtime caches TZ"
-emacs_cv_localtime_cache=
-test -n "$silent" || echo "checking whether cross-compiling"
-# If we cannot run a trivial program, we must be cross compiling.
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-main(){exit(0);}
-EOF
-eval $ac_compile
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
-  :
-else
-  cross_compiling=1
-fi
-rm -fr conftest*
-
-if test -n "$cross_compiling"
-then
-  # If we have tzset, assume the worst when cross-compiling.
-emacs_cv_localtime_cache=yes
-else
-cat > conftest.${ac_ext} <<EOF
+int main() {
+sigjmp_buf bar; sigsetjmp (bar, 0);
+; return 0; }
+EOF
+if { (eval echo configure:6274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6
+   { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_SIGSETJMP
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_SIGSETJMP 1
+EOF
+}
+
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
+fi
+rm -f conftest*
+
+echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
+echo "configure:6294: checking whether localtime caches TZ" >&5
+
+if test "$ac_cv_func_tzset" = "yes"; then
+cat > conftest.$ac_ext <<EOF
+#line 6298 "configure"
 #include "confdefs.h"
 #include <time.h>
-#if 1 /* STDC_HEADERS */
+#if STDC_HEADERS
 # include <stdlib.h>
 #endif
 extern char **environ;
@@ -4709,16 +6308,18 @@
     if (! (to[0][0] == 'T' && to[0][1] == 'Z' && to[0][2] == '='))
       to++;
 }
+char TZ_GMT0[] = "TZ=GMT0";
+char TZ_PST8[] = "TZ=PST8";
 main()
 {
   time_t now = time ((time_t *) 0);
   int hour_GMT0, hour_unset;
-  if (putenv ("TZ=GMT0") != 0)
+  if (putenv (TZ_GMT0) != 0)
     exit (1);
   hour_GMT0 = localtime (&now)->tm_hour;
   unset_TZ ();
   hour_unset = localtime (&now)->tm_hour;
-  if (putenv ("TZ=PST8") != 0)
+  if (putenv (TZ_PST8) != 0)
     exit (1);
   if (localtime (&now)->tm_hour == hour_GMT0)
     exit (1);
@@ -4728,34 +6329,38 @@
   exit (0);
 }
 EOF
-eval $ac_compile
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
+if { (eval echo configure:6333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
   emacs_cv_localtime_cache=no
-
-else
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
   emacs_cv_localtime_cache=yes
 fi
-fi
 rm -fr conftest*
-test -n "$verbose" && echo "	"$emacs_cv_localtime_cache""
-if test x$emacs_cv_localtime_cache = xyes; then
-  
-{
-test -n "$verbose" && \
-echo "	defining LOCALTIME_CACHE"
-echo "#define" LOCALTIME_CACHE "1" >> confdefs.h
-DEFS="$DEFS -DLOCALTIME_CACHE=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}LOCALTIME_CACHE\${ac_dB}LOCALTIME_CACHE\${ac_dC}1\${ac_dD}
-\${ac_uA}LOCALTIME_CACHE\${ac_uB}LOCALTIME_CACHE\${ac_uC}1\${ac_uD}
-\${ac_eA}LOCALTIME_CACHE\${ac_eB}LOCALTIME_CACHE\${ac_eC}1\${ac_eD}
-"
-}
-
-fi
-
-if test "x$HAVE_TIMEVAL" = xyes; then
-test -n "$silent" || echo "checking for whether gettimeofday can't accept two arguments"
-cat > conftest.${ac_ext} <<EOF
+else
+	# If we lack tzset, report that localtime does not cache TZ,
+	# since we can't invalidate the cache if we don't have tzset.
+	emacs_cv_localtime_cache=no
+fi
+echo "$ac_t""$emacs_cv_localtime_cache" 1>&6
+if test $emacs_cv_localtime_cache = yes; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining LOCALTIME_CACHE
+EOF
+cat >> confdefs.h <<\EOF
+#define LOCALTIME_CACHE 1
+EOF
+}
+
+fi
+
+if test "$HAVE_TIMEVAL" = "yes"; then
+echo $ac_n "checking whether gettimeofday cannot accept two arguments""... $ac_c" 1>&6
+echo "configure:6362: checking whether gettimeofday cannot accept two arguments" >&5
+cat > conftest.$ac_ext <<EOF
+#line 6364 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -4769,301 +6374,279 @@
 #endif
 #endif
   
-int main() { return 0; }
-int t() { 
+int main() {
+
   struct timeval time;
   struct timezone dummy;
   gettimeofday (&time, &dummy);
+
 ; return 0; }
 EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  test -n "$verbose" && echo "	no"
-
-else
-  rm -rf conftest*
-  test -n "$verbose" && echo "	yes"
-   
-{
-test -n "$verbose" && \
-echo "	defining GETTIMEOFDAY_ONE_ARGUMENT"
-echo "#define" GETTIMEOFDAY_ONE_ARGUMENT "1" >> confdefs.h
-DEFS="$DEFS -DGETTIMEOFDAY_ONE_ARGUMENT=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}GETTIMEOFDAY_ONE_ARGUMENT\${ac_dB}GETTIMEOFDAY_ONE_ARGUMENT\${ac_dC}1\${ac_dD}
-\${ac_uA}GETTIMEOFDAY_ONE_ARGUMENT\${ac_uB}GETTIMEOFDAY_ONE_ARGUMENT\${ac_uC}1\${ac_uD}
-\${ac_eA}GETTIMEOFDAY_ONE_ARGUMENT\${ac_eB}GETTIMEOFDAY_ONE_ARGUMENT\${ac_eC}1\${ac_eD}
-"
-}
-
-fi
-rm -f conftest*
-
-fi
-
-test -n "$silent" || echo "checking for whether inline functions are supported"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { 
-inline int
-foo ()
-{
-  return 0;
-}
+if { (eval echo configure:6386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6
+   { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining GETTIMEOFDAY_ONE_ARGUMENT
+EOF
+cat >> confdefs.h <<\EOF
+#define GETTIMEOFDAY_ONE_ARGUMENT 1
+EOF
+}
+
+fi
+rm -f conftest*
+fi
+
+
+echo $ac_n "checking for inline""... $ac_c" 1>&6
+echo "configure:6408: checking for inline" >&5
+
+ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+  cat > conftest.$ac_ext <<EOF
+#line 6413 "configure"
+#include "confdefs.h"
+
+int main() {
+} $ac_kw foo() {
 ; return 0; }
 EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining HAVE_INLINE"
-echo "#define" HAVE_INLINE "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_INLINE=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_INLINE\${ac_dB}HAVE_INLINE\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_INLINE\${ac_uB}HAVE_INLINE\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_INLINE\${ac_eB}HAVE_INLINE\${ac_eC}1\${ac_eD}
-"
-}
-
-
-fi
-rm -f conftest*
-
-
-# This does all sorts of magic to make sure alloca() works OK.
-# It might even add some junk to the top of <config.h>.
-# (I don't understand what goes on here, but it seems to work.)
+if { (eval echo configure:6420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_inline=$ac_kw; break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+done
+
+
+echo "$ac_t""$ac_cv_c_inline" 1>&6
+case "$ac_cv_c_inline" in
+  inline | yes) ;;
+  no) { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining inline = 
+EOF
+cat >> confdefs.h <<\EOF
+#define inline 
+EOF
+}
+ ;;
+  *)  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining inline = $ac_cv_c_inline
+EOF
+cat >> confdefs.h <<EOF
+#define inline $ac_cv_c_inline
+EOF
+}
+ ;;
+esac
+
+test "$ac_cv_c_inline" != "no" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_INLINE
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_INLINE 1
+EOF
+}
+
+
+
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-test -n "$silent" || echo "checking for working alloca.h"
-cat > conftest.${ac_ext} <<EOF
+echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+echo "configure:6465: checking for working alloca.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6468 "configure"
 #include "confdefs.h"
 #include <alloca.h>
-int main() { return 0; }
-int t() { char *p = alloca(2 * sizeof(int));; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining HAVE_ALLOCA_H"
-echo "#define" HAVE_ALLOCA_H "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_ALLOCA_H=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_ALLOCA_H\${ac_dB}HAVE_ALLOCA_H\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_ALLOCA_H\${ac_uB}HAVE_ALLOCA_H\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_ALLOCA_H\${ac_eB}HAVE_ALLOCA_H\${ac_eC}1\${ac_eD}
-"
-}
-
-
-fi
-rm -f conftest*
-
-ac_decl="#ifdef __GNUC__
-#define alloca __builtin_alloca
-#else
-#if HAVE_ALLOCA_H
-#include <alloca.h>
-#else
-#ifdef _AIX
- #pragma alloca
-#else
-char *alloca ();
-#endif
-#endif
-#endif
-"
-test -n "$silent" || echo "checking for alloca"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-$ac_decl
-int main() { return 0; }
-int t() { char *p = (char *) alloca(1);; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining HAVE_ALLOCA"
-echo "#define" HAVE_ALLOCA "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_ALLOCA=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_ALLOCA\${ac_dB}HAVE_ALLOCA\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_ALLOCA\${ac_uB}HAVE_ALLOCA\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_ALLOCA\${ac_eB}HAVE_ALLOCA\${ac_eC}1\${ac_eD}
-"
-}
-
-
-else
-  rm -rf conftest*
-  ac_alloca_missing=1
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-#if defined(CRAY) && ! defined(CRAY2)
-winnitude
-#else
-lossage
-#endif
-
-EOF
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "winnitude" conftest.out >/dev/null 2>&1; then
-  rm -rf conftest*
-  test -n "$silent" || echo "checking for _getb67"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() { 
-/* 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__getb67) || defined (__stub____getb67)
-choke me
-#else
-/* Override any gcc2 internal prototype to avoid an error.  */
-extern char _getb67(); _getb67();
-#endif
+int main() {
+char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  {
-test -n "$verbose" && \
-echo "	defining" CRAY_STACKSEG_END to be "_getb67"
-echo "#define" CRAY_STACKSEG_END "_getb67" >> confdefs.h
-DEFS="$DEFS -DCRAY_STACKSEG_END=_getb67"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}CRAY_STACKSEG_END\${ac_dB}CRAY_STACKSEG_END\${ac_dC}_getb67\${ac_dD}
-\${ac_uA}CRAY_STACKSEG_END\${ac_uB}CRAY_STACKSEG_END\${ac_uC}_getb67\${ac_uD}
-\${ac_eA}CRAY_STACKSEG_END\${ac_eB}CRAY_STACKSEG_END\${ac_eC}_getb67\${ac_eD}
-"
-}
-
-
-else
-  rm -rf conftest*
-  test -n "$silent" || echo "checking for GETB67"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() { 
-/* 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_GETB67) || defined (__stub___GETB67)
-choke me
+if { (eval echo configure:6475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_header_alloca_h=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_alloca_h=no
+fi
+rm -f conftest*
+
+echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
+if test $ac_cv_header_alloca_h = yes; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_ALLOCA_H
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_ALLOCA_H 1
+EOF
+}
+
+fi
+
+echo $ac_n "checking for alloca""... $ac_c" 1>&6
+echo "configure:6499: checking for alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6502 "configure"
+#include "confdefs.h"
+
+#ifdef __GNUC__
+# define alloca __builtin_alloca
 #else
-/* Override any gcc2 internal prototype to avoid an error.  */
-extern char GETB67(); GETB67();
+# if HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+ #pragma alloca
+#  else
+#   ifndef alloca /* predefined by HP cc +Olibcalls */
+char *alloca ();
+#   endif
+#  endif
+# endif
 #endif
+
+int main() {
+char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  {
-test -n "$verbose" && \
-echo "	defining" CRAY_STACKSEG_END to be "GETB67"
-echo "#define" CRAY_STACKSEG_END "GETB67" >> confdefs.h
-DEFS="$DEFS -DCRAY_STACKSEG_END=GETB67"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}CRAY_STACKSEG_END\${ac_dB}CRAY_STACKSEG_END\${ac_dC}GETB67\${ac_dD}
-\${ac_uA}CRAY_STACKSEG_END\${ac_uB}CRAY_STACKSEG_END\${ac_uC}GETB67\${ac_uD}
-\${ac_eA}CRAY_STACKSEG_END\${ac_eB}CRAY_STACKSEG_END\${ac_eC}GETB67\${ac_eD}
-"
-}
-
-
-else
-  rm -rf conftest*
-  test -n "$silent" || echo "checking for getb67"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() { 
-/* 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_getb67) || defined (__stub___getb67)
-choke me
-#else
-/* Override any gcc2 internal prototype to avoid an error.  */
-extern char getb67(); getb67();
-#endif
-; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  {
-test -n "$verbose" && \
-echo "	defining" CRAY_STACKSEG_END to be "getb67"
-echo "#define" CRAY_STACKSEG_END "getb67" >> confdefs.h
-DEFS="$DEFS -DCRAY_STACKSEG_END=getb67"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}CRAY_STACKSEG_END\${ac_dB}CRAY_STACKSEG_END\${ac_dC}getb67\${ac_dD}
-\${ac_uA}CRAY_STACKSEG_END\${ac_uB}CRAY_STACKSEG_END\${ac_uC}getb67\${ac_uD}
-\${ac_eA}CRAY_STACKSEG_END\${ac_eB}CRAY_STACKSEG_END\${ac_eC}getb67\${ac_eD}
-"
-}
-
-
-fi
-rm -f conftest*
-
-fi
-rm -f conftest*
-
-fi
-rm -f conftest*
-
-
-fi
-rm -f conftest*
-
-
-fi
-rm -f conftest*
-
-if test -n "$ac_alloca_missing"; then
+if { (eval echo configure:6525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  ac_cv_func_alloca_works=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_func_alloca_works=no
+fi
+rm -f conftest*
+
+echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
+if test $ac_cv_func_alloca_works = yes; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_ALLOCA
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_ALLOCA 1
+EOF
+}
+
+fi
+
+if test $ac_cv_func_alloca_works = no; then
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
   # that cause trouble.  Some versions do not even contain alloca or
   # contain a buggy version.  If you still want to use their alloca,
   # use ar to extract alloca.o from them instead of compiling alloca.c.
   ALLOCA=alloca.o
-  
-{
-test -n "$verbose" && \
-echo "	defining C_ALLOCA"
-echo "#define" C_ALLOCA "1" >> confdefs.h
-DEFS="$DEFS -DC_ALLOCA=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}C_ALLOCA\${ac_dB}C_ALLOCA\${ac_dC}1\${ac_dD}
-\${ac_uA}C_ALLOCA\${ac_uB}C_ALLOCA\${ac_uC}1\${ac_uD}
-\${ac_eA}C_ALLOCA\${ac_eB}C_ALLOCA\${ac_eC}1\${ac_eD}
-"
-}
-
-
-  test -n "$silent" || echo "checking stack direction for C alloca"
-  if test -n "$cross_compiling"
-then
-  
-{
-test -n "$verbose" && \
-echo "	defining" STACK_DIRECTION to be "0"
-echo "#define" STACK_DIRECTION "0" >> confdefs.h
-DEFS="$DEFS -DSTACK_DIRECTION=0"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}STACK_DIRECTION\${ac_dB}STACK_DIRECTION\${ac_dC}0\${ac_dD}
-\${ac_uA}STACK_DIRECTION\${ac_uB}STACK_DIRECTION\${ac_uC}0\${ac_uD}
-\${ac_eA}STACK_DIRECTION\${ac_eB}STACK_DIRECTION\${ac_eC}0\${ac_eD}
-"
-}
-
-else
-cat > conftest.${ac_ext} <<EOF
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining C_ALLOCA
+EOF
+cat >> confdefs.h <<\EOF
+#define C_ALLOCA 1
+EOF
+}
+
+
+echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+echo "configure:6564: checking whether alloca needs Cray hooks" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6567 "configure"
+#include "confdefs.h"
+#if defined(CRAY) && ! defined(CRAY2)
+webecray
+#else
+wenotbecray
+#endif
+
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "webecray" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_os_cray=yes
+else
+  rm -rf conftest*
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+
+echo "$ac_t""$ac_cv_os_cray" 1>&6
+if test $ac_cv_os_cray = yes; then
+for ac_func in _getb67 GETB67 getb67; do
+  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:6591: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6594 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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() {
+
+/* 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();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:6617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining CRAY_STACKSEG_END = $ac_func
+EOF
+cat >> confdefs.h <<EOF
+#define CRAY_STACKSEG_END $ac_func
+EOF
+}
+
+  break
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+done
+fi
+
+echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+echo "configure:6647: checking stack direction for C alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6650 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -5082,127 +6665,158 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-eval $ac_compile
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
-  
-{
-test -n "$verbose" && \
-echo "	defining" STACK_DIRECTION to be "1"
-echo "#define" STACK_DIRECTION "1" >> confdefs.h
-DEFS="$DEFS -DSTACK_DIRECTION=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}STACK_DIRECTION\${ac_dB}STACK_DIRECTION\${ac_dC}1\${ac_dD}
-\${ac_uA}STACK_DIRECTION\${ac_uB}STACK_DIRECTION\${ac_uC}1\${ac_uD}
-\${ac_eA}STACK_DIRECTION\${ac_eB}STACK_DIRECTION\${ac_eC}1\${ac_eD}
-"
-}
-
-
-else
-  
-{
-test -n "$verbose" && \
-echo "	defining" STACK_DIRECTION to be "-1"
-echo "#define" STACK_DIRECTION "-1" >> confdefs.h
-DEFS="$DEFS -DSTACK_DIRECTION=-1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}STACK_DIRECTION\${ac_dB}STACK_DIRECTION\${ac_dC}-1\${ac_dD}
-\${ac_uA}STACK_DIRECTION\${ac_uB}STACK_DIRECTION\${ac_uC}-1\${ac_uD}
-\${ac_eA}STACK_DIRECTION\${ac_eB}STACK_DIRECTION\${ac_eC}-1\${ac_eD}
-"
-}
-
-fi
+if { (eval echo configure:6669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_c_stack_direction=1
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_c_stack_direction=-1
 fi
 rm -fr conftest*
-fi
-
-
-# Check whether vfork exists and works correctly. (This does more
-# than just check for its existence.) If so, it defines HAVE_VFORK_H.
-# If not, it defines vfork to be fork.
-test -n "$silent" || echo "checking for pid_t in sys/types.h"
-echo '#include "confdefs.h"
-#include <sys/types.h>' > conftest.${ac_ext}
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "pid_t" conftest.out >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining" pid_t to be "int"
-echo "#define" pid_t "int" >> confdefs.h
-DEFS="$DEFS -Dpid_t=int"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}pid_t\${ac_dB}pid_t\${ac_dC}int\${ac_dD}
-\${ac_uA}pid_t\${ac_uB}pid_t\${ac_uC}int\${ac_uD}
-\${ac_eA}pid_t\${ac_eB}pid_t\${ac_eC}int\${ac_eD}
-"
-}
-
-fi
-rm -f conftest*
-
-test -n "$silent" || echo "checking for vfork.h"
-cat > conftest.${ac_ext} <<EOF
+
+echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining STACK_DIRECTION = $ac_cv_c_stack_direction
+EOF
+cat >> confdefs.h <<EOF
+#define STACK_DIRECTION $ac_cv_c_stack_direction
+EOF
+}
+
+fi
+
+test -n "$ALLOCA" && extra_objs="$extra_objs $ALLOCA"
+
+echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+echo "configure:6694: checking for pid_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6697 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_pid_t=yes
+else
+  rm -rf conftest*
+  ac_cv_type_pid_t=no
+fi
+rm -f conftest*
+
+echo "$ac_t""$ac_cv_type_pid_t" 1>&6
+if test $ac_cv_type_pid_t = no; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining pid_t = int
+EOF
+cat >> confdefs.h <<\EOF
+#define pid_t int
+EOF
+}
+
+fi
+
+ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
+echo "configure:6729: checking for vfork.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6732 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:6737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining HAVE_VFORK_H"
-echo "#define" HAVE_VFORK_H "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_VFORK_H=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_VFORK_H\${ac_dB}HAVE_VFORK_H\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_VFORK_H\${ac_uB}HAVE_VFORK_H\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_VFORK_H\${ac_eB}HAVE_VFORK_H\${ac_eC}1\${ac_eD}
-"
-}
-
-
-fi
-rm -f conftest*
-
-test -n "$silent" || echo "checking for working vfork"
-
-cat > conftest.${ac_ext} <<EOF
+  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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_VFORK_H
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_VFORK_H 1
+EOF
+}
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking for working vfork""... $ac_c" 1>&6
+echo "configure:6765: checking for working vfork" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6768 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <signal.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #ifdef HAVE_VFORK_H
 #include <vfork.h>
 #endif
-static int signalled;
-static RETSIGTYPE catch (s) int s; { signalled = 1; }
+/* On some sparc systems, changes by the child to local and incoming
+   argument registers are propagated back to the parent.
+   The compiler is told about this with #include <vfork.h>,
+   but some compilers (e.g. gcc -O) don't grok <vfork.h>.
+   Test for this by using a static variable whose address
+   is put into a register that is clobbered by the vfork.  */
+static
+#ifdef __cplusplus
+sparc_address_test (int arg)
+#else
+sparc_address_test (arg) int arg;
+#endif
+{
+  static pid_t child;
+  if (!child) {
+    child = vfork ();
+    if (child < 0) {
+      perror ("vfork");
+      _exit(2);
+    }
+    if (!child) {
+      arg = getpid();
+      write(-1, "", 0);
+      _exit (arg);
+    }
+  }
+}
 main() {
   pid_t parent = getpid ();
   pid_t child;
 
-  signal (SIGINT, catch);
+  sparc_address_test ();
 
   child = vfork ();
 
   if (child == 0) {
-    /* On sparc systems, changes by the child to local and incoming
-       argument registers are propagated back to the parent.
-       The compiler is told about this with #include <vfork.h>,
-       but some compilers (e.g. gcc -O) don't grok <vfork.h>.
-       Test for this by using lots of local variables, at least
+    /* Here is another test for sparc vfork register problems.
+       This test uses lots of local variables, at least
        as many local variables as main has allocated so far
        including compiler temporaries.  4 locals are enough for
-       gcc 1.40.3 on a sparc, but we use 8 to be safe.
+       gcc 1.40.3 on a Solaris 4.1.3 sparc, but we use 8 to be safe.
        A buggy compiler should reuse the register of parent
        for one of the local variables, since it will think that
        parent can't possibly be used any more in this routine.
@@ -5217,12 +6831,6 @@
 	|| p != p5 || p != p6 || p != p7)
       _exit(1);
 
-    /* On some systems (e.g. SunOS 5.2), if the parent is catching
-       a signal, the child ignores the signal before execing,
-       and the parent later receives that signal, the parent dumps core.
-       Test for this by ignoring SIGINT in the child.  */
-    signal (SIGINT, SIG_IGN);
-
     /* On some systems (e.g. IRIX 3.3),
        vfork doesn't separate parent from child file descriptors.
        If the child closes a descriptor before it execs or exits,
@@ -5245,46 +6853,41 @@
 	 /* Did the vfork/compiler bug occur?  */
 	 || parent != getpid()
 
-	 /* Did the signal handling bug occur?  */
-	 || kill(parent, SIGINT) != 0
-	 || signalled != 1
-
 	 /* Did the file descriptor bug occur?  */
 	 || fstat(fileno(stdout), &st) != 0
 	 );
   }
 }
 EOF
-eval $ac_compile
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
-  :
-else
-  
-{
-test -n "$verbose" && \
-echo "	defining" vfork to be "fork"
-echo "#define" vfork "fork" >> confdefs.h
-DEFS="$DEFS -Dvfork=fork"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}vfork\${ac_dB}vfork\${ac_dC}fork\${ac_dD}
-\${ac_uA}vfork\${ac_uB}vfork\${ac_uC}fork\${ac_uD}
-\${ac_eA}vfork\${ac_eB}vfork\${ac_eC}fork\${ac_eD}
-"
-}
-
+if { (eval echo configure:6863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_func_vfork_works=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_func_vfork_works=no
 fi
 rm -fr conftest*
 
-
-# Check whether mmap exists and works correctly. (This does more
-# than just check for its existence.) If so, it defines HAVE_MMAP.
-# Actually, this seems to rule out some cases where mmap() can
-# work fine for our purposes (e.g. HPUX).  We get a big win out
-# of using mmap(), so let's go back to the old way.
-
-# Check whether strcoll exists and works correctly. (This does more
-# than just check for its existence.) If so, it defines HAVE_STRCOLL.
-test -n "$silent" || echo "checking for strcoll"
-cat > conftest.${ac_ext} <<EOF
+echo "$ac_t""$ac_cv_func_vfork_works" 1>&6
+if test $ac_cv_func_vfork_works = no; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining vfork = fork
+EOF
+cat >> confdefs.h <<\EOF
+#define vfork fork
+EOF
+}
+
+fi
+
+
+echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
+echo "configure:6888: checking for working strcoll" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6891 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -5294,26 +6897,35 @@
 	strcoll ("123", "456") >= 0);
 }
 EOF
-eval $ac_compile
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
-  
-{
-test -n "$verbose" && \
-echo "	defining HAVE_STRCOLL"
-echo "#define" HAVE_STRCOLL "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_STRCOLL=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_STRCOLL\${ac_dB}HAVE_STRCOLL\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_STRCOLL\${ac_uB}HAVE_STRCOLL\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_STRCOLL\${ac_eB}HAVE_STRCOLL\${ac_eC}1\${ac_eD}
-"
-}
-
-
+if { (eval echo configure:6901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_func_strcoll_works=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_func_strcoll_works=no
 fi
 rm -fr conftest*
 
-test -n "$silent" || echo "checking size of short"
-cat > conftest.${ac_ext} <<EOF
+echo "$ac_t""$ac_cv_func_strcoll_works" 1>&6
+if test $ac_cv_func_strcoll_works = yes; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_STRCOLL
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_STRCOLL 1
+EOF
+}
+
+fi
+
+
+echo $ac_n "checking size of short""... $ac_c" 1>&6
+echo "configure:6926: checking size of short" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6929 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -5324,28 +6936,31 @@
   exit(0);
 }
 EOF
-eval $ac_compile
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
-  ac_size=`cat conftestval`
-
-else
-  echo "configure: can not determine size of short" >&2; exit 1
+if { (eval echo configure:6940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_short=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_short=0
 fi
 rm -fr conftest*
-
-{
-test -n "$verbose" && \
-echo "	defining" SIZEOF_SHORT to be "$ac_size"
-echo "#define" SIZEOF_SHORT "$ac_size" >> confdefs.h
-DEFS="$DEFS -DSIZEOF_SHORT=$ac_size"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}SIZEOF_SHORT\${ac_dB}SIZEOF_SHORT\${ac_dC}$ac_size\${ac_dD}
-\${ac_uA}SIZEOF_SHORT\${ac_uB}SIZEOF_SHORT\${ac_uC}$ac_size\${ac_uD}
-\${ac_eA}SIZEOF_SHORT\${ac_eB}SIZEOF_SHORT\${ac_eC}$ac_size\${ac_eD}
-"
-}
-
-test -n "$silent" || echo "checking size of int"
-cat > conftest.${ac_ext} <<EOF
+echo "$ac_t""$ac_cv_sizeof_short" 1>&6
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining SIZEOF_SHORT = $ac_cv_sizeof_short
+EOF
+cat >> confdefs.h <<EOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+EOF
+}
+
+
+echo $ac_n "checking size of int""... $ac_c" 1>&6
+echo "configure:6961: checking size of int" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6964 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -5356,28 +6971,31 @@
   exit(0);
 }
 EOF
-eval $ac_compile
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
-  ac_size=`cat conftestval`
-
-else
-  echo "configure: can not determine size of int" >&2; exit 1
+if { (eval echo configure:6975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_int=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_int=0
 fi
 rm -fr conftest*
-
-{
-test -n "$verbose" && \
-echo "	defining" SIZEOF_INT to be "$ac_size"
-echo "#define" SIZEOF_INT "$ac_size" >> confdefs.h
-DEFS="$DEFS -DSIZEOF_INT=$ac_size"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}SIZEOF_INT\${ac_dB}SIZEOF_INT\${ac_dC}$ac_size\${ac_dD}
-\${ac_uA}SIZEOF_INT\${ac_uB}SIZEOF_INT\${ac_uC}$ac_size\${ac_uD}
-\${ac_eA}SIZEOF_INT\${ac_eB}SIZEOF_INT\${ac_eC}$ac_size\${ac_eD}
-"
-}
-
-test -n "$silent" || echo "checking size of long"
-cat > conftest.${ac_ext} <<EOF
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining SIZEOF_INT = $ac_cv_sizeof_int
+EOF
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+EOF
+}
+
+
+echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:6996: checking size of long" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6999 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -5388,488 +7006,688 @@
   exit(0);
 }
 EOF
-eval $ac_compile
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
-  ac_size=`cat conftestval`
-
-else
-  echo "configure: can not determine size of long" >&2; exit 1
+if { (eval echo configure:7010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_long=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_long=0
 fi
 rm -fr conftest*
-
-{
-test -n "$verbose" && \
-echo "	defining" SIZEOF_LONG to be "$ac_size"
-echo "#define" SIZEOF_LONG "$ac_size" >> confdefs.h
-DEFS="$DEFS -DSIZEOF_LONG=$ac_size"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}SIZEOF_LONG\${ac_dB}SIZEOF_LONG\${ac_dC}$ac_size\${ac_dD}
-\${ac_uA}SIZEOF_LONG\${ac_uB}SIZEOF_LONG\${ac_uC}$ac_size\${ac_uD}
-\${ac_eA}SIZEOF_LONG\${ac_eB}SIZEOF_LONG\${ac_eC}$ac_size\${ac_eD}
-"
-}
-
-
-# FSF 19.29 does this:
-# # fmod, logb, and frexp are found in -lm on most systems.
-# # On HPUX 9.01, -lm does not contain logb, so check for sqrt.
-# A C_CHECK_LIB(m, sqrt)
-
-for ac_func in acosh asinh atanh cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random realpath rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask strcasecmp strerror tzset utimes waitpid
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining SIZEOF_LONG = $ac_cv_sizeof_long
+EOF
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+EOF
+}
+
+
+
+for ac_hdr in unistd.h
 do
-ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
-test -n "$silent" || echo "checking for ${ac_func}"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() { 
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:7035: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7038 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+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"
+fi
+rm -f conftest*
+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___%'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_hdr
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+}
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+for ac_func in getpagesize
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:7075: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7078 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* 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() {
+
 /* 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})
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-/* Override any gcc2 internal prototype to avoid an error.  */
-extern char ${ac_func}(); ${ac_func}();
+$ac_func();
 #endif
+
 ; return 0; }
 EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  {
-test -n "$verbose" && \
-echo "	defining ${ac_tr_func}"
-echo "#define" ${ac_tr_func} "1" >> confdefs.h
-DEFS="$DEFS -D${ac_tr_func}=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}${ac_tr_func}\${ac_dB}${ac_tr_func}\${ac_dC}1\${ac_dD}
-\${ac_uA}${ac_tr_func}\${ac_uB}${ac_tr_func}\${ac_uC}1\${ac_uD}
-\${ac_eA}${ac_tr_func}\${ac_eB}${ac_tr_func}\${ac_eC}1\${ac_eD}
-"
-}
-
-
-fi
-rm -f conftest*
+if { (eval echo configure:7101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+
+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'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_func
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+}
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
 done
 
-
-# Check for mmap.
-found_mmap=true
-test -n "$silent" || echo "checking for mmap"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() { 
-/* 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_mmap) || defined (__stub___mmap)
-choke me
+echo $ac_n "checking for working mmap""... $ac_c" 1>&6
+echo "configure:7129: checking for working mmap" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7132 "configure"
+#include "confdefs.h"
+
+/* Thanks to Mike Haertel and Jim Avera for this test.
+   Here is a matrix of mmap possibilities:
+	mmap private not fixed
+	mmap private fixed at somewhere currently unmapped
+	mmap private fixed at somewhere already mapped
+	mmap shared not fixed
+	mmap shared fixed at somewhere currently unmapped
+	mmap shared fixed at somewhere already mapped
+   For private mappings, we should verify that changes cannot be read()
+   back from the file, nor mmap's back from the file at a different
+   address.  (There have been systems where private was not correctly
+   implemented like the infamous i386 svr4.0, and systems where the
+   VM page cache was not coherent with the filesystem buffer cache
+   like early versions of FreeBSD and possibly contemporary NetBSD.)
+   For shared mappings, we should conversely verify that changes get
+   propogated back to all the places they're supposed to be.
+
+   Grep wants private fixed already mapped.
+   The main things grep needs to know about mmap are:
+   * does it exist and is it safe to write into the mmap'd area
+   * how to use it (BSD variants)  */
+#include <sys/types.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+
+/* This mess was copied from the GNU getpagesize.h.  */
+#ifndef HAVE_GETPAGESIZE
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
+
+/* Assume that all systems that can run configure have sys/param.h.  */
+# ifndef HAVE_SYS_PARAM_H
+#  define HAVE_SYS_PARAM_H 1
+# endif
+
+# ifdef _SC_PAGESIZE
+#  define getpagesize() sysconf(_SC_PAGESIZE)
+# else /* no _SC_PAGESIZE */
+#  ifdef HAVE_SYS_PARAM_H
+#   include <sys/param.h>
+#   ifdef EXEC_PAGESIZE
+#    define getpagesize() EXEC_PAGESIZE
+#   else /* no EXEC_PAGESIZE */
+#    ifdef NBPG
+#     define getpagesize() NBPG * CLSIZE
+#     ifndef CLSIZE
+#      define CLSIZE 1
+#     endif /* no CLSIZE */
+#    else /* no NBPG */
+#     ifdef NBPC
+#      define getpagesize() NBPC
+#     else /* no NBPC */
+#      ifdef PAGESIZE
+#       define getpagesize() PAGESIZE
+#      endif /* PAGESIZE */
+#     endif /* no NBPC */
+#    endif /* no NBPG */
+#   endif /* no EXEC_PAGESIZE */
+#  else /* no HAVE_SYS_PARAM_H */
+#   define getpagesize() 8192	/* punt totally */
+#  endif /* no HAVE_SYS_PARAM_H */
+# endif /* no _SC_PAGESIZE */
+
+#endif /* no HAVE_GETPAGESIZE */
+
+#ifdef __cplusplus
+extern "C" { void *malloc(unsigned); }
 #else
-/* Override any gcc2 internal prototype to avoid an error.  */
-extern char mmap(); mmap();
+char *malloc();
 #endif
-; return 0; }
-EOF
-if eval $ac_compile; then
-  :
-else
-  rm -rf conftest*
-  found_mmap=
-fi
-rm -f conftest*
-
-test -n "$found_mmap" && 
+
+int
+main()
 {
-test -n "$verbose" && \
-echo "	defining HAVE_MMAP"
-echo "#define" HAVE_MMAP "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_MMAP=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_MMAP\${ac_dB}HAVE_MMAP\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_MMAP\${ac_uB}HAVE_MMAP\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_MMAP\${ac_eB}HAVE_MMAP\${ac_eC}1\${ac_eD}
-"
-}
-
-
-test "${GNU_MALLOC}" != "yes"   -a "${found_mmap}" != "true" && rel_alloc=no
-test "${rel_alloc}" = "default" -a "${found_mmap}"  = "true" && rel_alloc=yes
-
-# Check for Internet sockets.
-
-ok_so_far=true
-test -n "$silent" || echo "checking for socket"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() { 
+	char *data, *data2, *data3;
+	int i, pagesize;
+	int fd;
+
+	pagesize = getpagesize();
+
+	/*
+	 * First, make a file with some known garbage in it.
+	 */
+	data = malloc(pagesize);
+	if (!data)
+		exit(1);
+	for (i = 0; i < pagesize; ++i)
+		*(data + i) = rand();
+	umask(0);
+	fd = creat("conftestmmap", 0600);
+	if (fd < 0)
+		exit(1);
+	if (write(fd, data, pagesize) != pagesize)
+		exit(1);
+	close(fd);
+
+	/*
+	 * Next, try to mmap the file at a fixed address which
+	 * already has something else allocated at it.  If we can,
+	 * also make sure that we see the same garbage.
+	 */
+	fd = open("conftestmmap", O_RDWR);
+	if (fd < 0)
+		exit(1);
+	data2 = malloc(2 * pagesize);
+	if (!data2)
+		exit(1);
+	data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
+	if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE,
+	    MAP_PRIVATE | MAP_FIXED, fd, 0L))
+		exit(1);
+	for (i = 0; i < pagesize; ++i)
+		if (*(data + i) != *(data2 + i))
+			exit(1);
+
+	/*
+	 * Finally, make sure that changes to the mapped area
+	 * do not percolate back to the file as seen by read().
+	 * (This is a bug on some variants of i386 svr4.0.)
+	 */
+	for (i = 0; i < pagesize; ++i)
+		*(data2 + i) = *(data2 + i) + 1;
+	data3 = malloc(pagesize);
+	if (!data3)
+		exit(1);
+	if (read(fd, data3, pagesize) != pagesize)
+		exit(1);
+	for (i = 0; i < pagesize; ++i)
+		if (*(data + i) != *(data3 + i))
+			exit(1);
+	close(fd);
+	unlink("conftestmmap");
+	exit(0);
+}
+
+EOF
+if { (eval echo configure:7272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_func_mmap_fixed_mapped=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_func_mmap_fixed_mapped=no
+fi
+rm -fr conftest*
+
+echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6
+if test $ac_cv_func_mmap_fixed_mapped = yes; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_MMAP
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_MMAP 1
+EOF
+}
+
+fi
+
+
+test "$GNU_MALLOC" != "yes"   -a "$ac_cv_func_mmap_fixed_mapped" != "yes" && rel_alloc=no
+test "$rel_alloc" = "default" -a "$ac_cv_func_mmap_fixed_mapped"  = "yes" && rel_alloc=yes
+test "$rel_alloc" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining REL_ALLOC
+EOF
+cat >> confdefs.h <<\EOF
+#define REL_ALLOC 1
+EOF
+}
+
+
+echo $ac_n "checking for socket""... $ac_c" 1>&6
+echo "configure:7308: checking for socket" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7311 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char socket(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char socket();
+
+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_socket) || defined (__stub___socket)
 choke me
 #else
-/* Override any gcc2 internal prototype to avoid an error.  */
-extern char socket(); socket();
+socket();
 #endif
+
 ; return 0; }
 EOF
-if eval $ac_compile; then
-  :
-else
-  rm -rf conftest*
-  ok_so_far=
-fi
-rm -f conftest*
-
-test -n "$ok_so_far" && { test -n "$silent" || echo "checking for netinet/in.h"
-cat > conftest.${ac_ext} <<EOF
+if { (eval echo configure:7334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_func_socket=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_socket=no"
+fi
+rm -f conftest*
+
+if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
+echo "configure:7349: checking for netinet/in.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7352 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
-  :
-else
-  rm -rf conftest*
-  ok_so_far=
-fi
-rm -f conftest*
- }
-test -n "$ok_so_far" && { test -n "$silent" || echo "checking for arpa/inet.h"
-cat > conftest.${ac_ext} <<EOF
+  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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
+echo "configure:7374: checking for arpa/inet.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7377 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
-  :
-else
-  rm -rf conftest*
-  ok_so_far=
-fi
-rm -f conftest*
- }
-if test -n "$ok_so_far"; 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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
   
-{
-test -n "$verbose" && \
-echo "	defining HAVE_SOCKETS"
-echo "#define" HAVE_SOCKETS "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_SOCKETS=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_SOCKETS\${ac_dB}HAVE_SOCKETS\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_SOCKETS\${ac_uB}HAVE_SOCKETS\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_SOCKETS\${ac_eB}HAVE_SOCKETS\${ac_eC}1\${ac_eD}
-"
-}
-
-  # Check for the sun_len member in struct sockaddr_un.
-
-  test -n "$silent" || echo "checking for sun_len member in struct sockaddr_un"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_SOCKETS
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_SOCKETS 1
+EOF
+}
+
+      echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
+echo "configure:7407: checking "for sun_len member in struct sockaddr_un"" >&5
+      cat > conftest.$ac_ext <<EOF
+#line 7409 "configure"
+#include "confdefs.h"
+
 #include <sys/types.h>
-  #include <sys/socket.h>
-  #include <sys/un.h>
-int main() { return 0; }
-int t() { static struct sockaddr_un x; x.sun_len = 1;; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining HAVE_SOCKADDR_SUN_LEN"
-echo "#define" HAVE_SOCKADDR_SUN_LEN "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_SOCKADDR_SUN_LEN=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_SOCKADDR_SUN_LEN\${ac_dB}HAVE_SOCKADDR_SUN_LEN\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_SOCKADDR_SUN_LEN\${ac_uB}HAVE_SOCKADDR_SUN_LEN\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_SOCKADDR_SUN_LEN\${ac_eB}HAVE_SOCKADDR_SUN_LEN\${ac_eC}1\${ac_eD}
-"
-}
-
-
-fi
-rm -f conftest*
-
-fi
-
-# Check for SYS V IPC. (Inferior to sockets.)
-
-if test -z "$ok_so_far"; then
-  ok_so_far=true
-  test -n "$silent" || echo "checking for msgget"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() { 
+#include <sys/socket.h>
+#include <sys/un.h>
+      
+int main() {
+static struct sockaddr_un x; x.sun_len = 1;
+; return 0; }
+EOF
+if { (eval echo configure:7420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_SOCKADDR_SUN_LEN
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_SOCKADDR_SUN_LEN 1
+EOF
+}
+
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
+fi
+rm -f conftest*
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+echo $ac_n "checking for msgget""... $ac_c" 1>&6
+echo "configure:7451: checking for msgget" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7454 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char msgget(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char msgget();
+
+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_msgget) || defined (__stub___msgget)
 choke me
 #else
-/* Override any gcc2 internal prototype to avoid an error.  */
-extern char msgget(); msgget();
+msgget();
 #endif
+
 ; return 0; }
 EOF
-if eval $ac_compile; then
-  :
-else
-  rm -rf conftest*
-  ok_so_far=
-fi
-rm -f conftest*
-
-  test -n "$ok_so_far" && { test -n "$silent" || echo "checking for sys/ipc.h"
-cat > conftest.${ac_ext} <<EOF
+if { (eval echo configure:7477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_func_msgget=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_msgget=no"
+fi
+rm -f conftest*
+
+if eval "test \"`echo '$ac_cv_func_'msgget`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6
+echo "configure:7492: checking for sys/ipc.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7495 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
-  :
-else
-  rm -rf conftest*
-  ok_so_far=
-fi
-rm -f conftest*
- }
-  test -n "$ok_so_far" && { test -n "$silent" || echo "checking for sys/msg.h"
-cat > conftest.${ac_ext} <<EOF
+  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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
+echo "configure:7517: checking for sys/msg.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7520 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
-  :
-else
-  rm -rf conftest*
-  ok_so_far=
-fi
-rm -f conftest*
- }
-  test -n "$ok_so_far" &&   
-{
-test -n "$verbose" && \
-echo "	defining HAVE_SYSVIPC"
-echo "#define" HAVE_SYSVIPC "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_SYSVIPC=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_SYSVIPC\${ac_dB}HAVE_SYSVIPC\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_SYSVIPC\${ac_uB}HAVE_SYSVIPC\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_SYSVIPC\${ac_eB}HAVE_SYSVIPC\${ac_eC}1\${ac_eD}
-"
-}
-
-fi
-
-# Check for directory variants
-
-sysv_system_dir=
-nonsystem_dir_library=
-test -n "$silent" || echo "checking for dirent.h"
-cat > conftest.${ac_ext} <<EOF
+  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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_SYSVIPC
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_SYSVIPC 1
+EOF
+}
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
+echo "configure:7563: checking for dirent.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7566 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
-  sysv_system_dir=yes
-
-fi
-rm -f conftest*
-
-test -z "$sysv_system_dir" &&
-  { test -n "$silent" || echo "checking for sys/dir.h"
-cat > conftest.${ac_ext} <<EOF
+  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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining SYSV_SYSTEM_DIR
+EOF
+cat >> confdefs.h <<\EOF
+#define SYSV_SYSTEM_DIR 1
+EOF
+}
+
+else
+  echo "$ac_t""no" 1>&6
+ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6
+echo "configure:7598: checking for sys/dir.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7601 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
   :
 else
-  rm -rf conftest*
-  nonsystem_dir_library=yes
-fi
-rm -f conftest*
- }
-if   test -n "$sysv_system_dir"       ; then 
-{
-test -n "$verbose" && \
-echo "	defining SYSV_SYSTEM_DIR"
-echo "#define" SYSV_SYSTEM_DIR "1" >> confdefs.h
-DEFS="$DEFS -DSYSV_SYSTEM_DIR=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}SYSV_SYSTEM_DIR\${ac_dB}SYSV_SYSTEM_DIR\${ac_dC}1\${ac_dD}
-\${ac_uA}SYSV_SYSTEM_DIR\${ac_uB}SYSV_SYSTEM_DIR\${ac_uC}1\${ac_uD}
-\${ac_eA}SYSV_SYSTEM_DIR\${ac_eB}SYSV_SYSTEM_DIR\${ac_eC}1\${ac_eD}
-"
-}
-
-elif test -n "$nonsystem_dir_library" ; then 
-{
-test -n "$verbose" && \
-echo "	defining NONSYSTEM_DIR_LIBRARY"
-echo "#define" NONSYSTEM_DIR_LIBRARY "1" >> confdefs.h
-DEFS="$DEFS -DNONSYSTEM_DIR_LIBRARY=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}NONSYSTEM_DIR_LIBRARY\${ac_dB}NONSYSTEM_DIR_LIBRARY\${ac_dC}1\${ac_dD}
-\${ac_uA}NONSYSTEM_DIR_LIBRARY\${ac_uB}NONSYSTEM_DIR_LIBRARY\${ac_uC}1\${ac_uD}
-\${ac_eA}NONSYSTEM_DIR_LIBRARY\${ac_eB}NONSYSTEM_DIR_LIBRARY\${ac_eC}1\${ac_eD}
-"
-}
-
-fi
-
-
-echo "checking how to do terminal I/O"
-
-have_termios=
-have_termio=
-test -n "$silent" || echo "checking for termios.h"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <termios.h>
-EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  have_termios=yes
-
-fi
-rm -f conftest*
-
-test -z "$have_termios" && { test -n "$silent" || echo "checking for termio.h"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <termio.h>
-EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  have_termio=yes
-
-fi
-rm -f conftest*
- }
-if   test -n "$have_termios" ; then 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_TERMIOS"
-echo "#define" HAVE_TERMIOS "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_TERMIOS=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_TERMIOS\${ac_dB}HAVE_TERMIOS\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_TERMIOS\${ac_uB}HAVE_TERMIOS\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_TERMIOS\${ac_eB}HAVE_TERMIOS\${ac_eC}1\${ac_eD}
-"
-}
-
-elif test -n "$have_termio"  ; then 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_TERMIO"
-echo "#define" HAVE_TERMIO "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_TERMIO=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_TERMIO\${ac_dB}HAVE_TERMIO\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_TERMIO\${ac_uB}HAVE_TERMIO\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_TERMIO\${ac_eB}HAVE_TERMIO\${ac_eC}1\${ac_eD}
-"
-}
-
-fi
-
-# Check for nlist.h
-test -n "$silent" || echo "checking for nlist.h"
-cat > conftest.${ac_ext} <<EOF
+  echo "$ac_t""no" 1>&6
+{ test "$extra_verbose" = "yes" && cat << \EOF
+    Defining NONSYSTEM_DIR_LIBRARY
+EOF
+cat >> confdefs.h <<\EOF
+#define NONSYSTEM_DIR_LIBRARY 1
+EOF
+}
+
+fi
+
+fi
+
+
+ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
+echo "configure:7639: checking for nlist.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7642 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
-  
-{
-test -n "$verbose" && \
-echo "	defining NLIST_STRUCT"
-echo "#define" NLIST_STRUCT "1" >> confdefs.h
-DEFS="$DEFS -DNLIST_STRUCT=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}NLIST_STRUCT\${ac_dB}NLIST_STRUCT\${ac_dC}1\${ac_dD}
-\${ac_uA}NLIST_STRUCT\${ac_uB}NLIST_STRUCT\${ac_uC}1\${ac_uD}
-\${ac_eA}NLIST_STRUCT\${ac_eB}NLIST_STRUCT\${ac_eC}1\${ac_eD}
-"
-}
-
-
-fi
-rm -f conftest*
-
-
-# AIX export list
-if test -f /usr/lpp/X11/bin/smt.exp ; then
-  
-{
-test -n "$verbose" && \
-echo "	defining" AIX_SMT_EXP to be "-bI:/usr/lpp/X11/bin/smt.exp"
-echo "#define" AIX_SMT_EXP "-bI:/usr/lpp/X11/bin/smt.exp" >> confdefs.h
-DEFS="$DEFS -DAIX_SMT_EXP=-bI:/usr/lpp/X11/bin/smt.exp"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}AIX_SMT_EXP\${ac_dB}AIX_SMT_EXP\${ac_dC}-bI:/usr/lpp/X11/bin/smt.exp\${ac_dD}
-\${ac_uA}AIX_SMT_EXP\${ac_uB}AIX_SMT_EXP\${ac_uC}-bI:/usr/lpp/X11/bin/smt.exp\${ac_uD}
-\${ac_eA}AIX_SMT_EXP\${ac_eB}AIX_SMT_EXP\${ac_eC}-bI:/usr/lpp/X11/bin/smt.exp\${ac_eD}
-"
-}
-
-elif test -f /usr/bin/X11/smt.exp ; then
-  
-{
-test -n "$verbose" && \
-echo "	defining" AIX_SMT_EXP to be "-bI:/usr/bin/X11/smt.exp"
-echo "#define" AIX_SMT_EXP "-bI:/usr/bin/X11/smt.exp" >> confdefs.h
-DEFS="$DEFS -DAIX_SMT_EXP=-bI:/usr/bin/X11/smt.exp"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}AIX_SMT_EXP\${ac_dB}AIX_SMT_EXP\${ac_dC}-bI:/usr/bin/X11/smt.exp\${ac_dD}
-\${ac_uA}AIX_SMT_EXP\${ac_uB}AIX_SMT_EXP\${ac_uC}-bI:/usr/bin/X11/smt.exp\${ac_uD}
-\${ac_eA}AIX_SMT_EXP\${ac_eB}AIX_SMT_EXP\${ac_eC}-bI:/usr/bin/X11/smt.exp\${ac_eD}
-"
-}
-
-fi
+  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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining NLIST_STRUCT
+EOF
+cat >> confdefs.h <<\EOF
+#define NLIST_STRUCT 1
+EOF
+}
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+for f in "/usr/lpp/X11/bin/smt.exp" "/usr/bin/X11/smt.exp" ; do
+  if test -r $f; then { test "$extra_verbose" = "yes" && cat << EOF
+    Defining AIX_SMT_EXP = -bI:$f
+EOF
+cat >> confdefs.h <<EOF
+#define AIX_SMT_EXP -bI:$f
+EOF
+}
+ break; fi
+done
 
 CFLAGS="$REAL_CFLAGS"
 
-file="${srcdir}/lisp/version.el"
+file="$srcdir/lisp/version.el"
 version=`sed -ne 's/^(defconst emacs-version "\(.*\)".*/\1/p' "$file"`
-if test  -z "${version}"; then
-  echo "${progname}: can't find current emacs version in \"$file\"." >&2
+if test  -z "$version"; then
+  echo "$progname: can't find current emacs version in \"$file\"." >&2
   exit 1
 fi
 beta=`sed -ne 's/^.*XEmacs Lucid (beta\([0-9][0-9]*\)).*$/\1/p' "$file"`
@@ -5877,1316 +7695,1643 @@
 
 
 
-# the following needs to be fixed for SGI.
-if test -z "${native_sound_lib}" ; then
-  if   test -r /usr/demo/SOUND/lib/libaudio.a; then
-    native_sound_lib=/usr/demo/SOUND/lib/libaudio.a
-  elif test -r /usr/demo/SOUND/libaudio.a ; then
-    native_sound_lib=/usr/demo/SOUND/libaudio.a
+echo "checking "for sound support"" 1>&6
+echo "configure:7700: checking "for sound support"" >&5
+case "$with_sound" in
+  native | both ) with_native_sound=yes;;
+  nas    | no   ) with_native_sound=no;;
+esac
+if test "$with_native_sound" != "no"; then
+    if test -d "/usr/demo/SOUND"; then
+    sound_found="yes" extra_objs="$extra_objs sunplay.o"
+    if test -d "/usr/demo/SOUND/include"
+      then sound_cflags="-I/usr/demo/SOUND/include"
+      else sound_cflags="-I/usr/demo/SOUND"
+    fi
+    if test -z "$native_sound_lib" ; then
+      if test -r "/usr/demo/SOUND/lib/libaudio.a"
+        then native_sound_lib="/usr/demo/SOUND/lib/libaudio.a"
+        else native_sound_lib="/usr/demo/SOUND/libaudio.a"
+      fi
+    fi
   else
-    case "${canonical}" in
-      *-sgi-*        ) ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -laudio"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -laudio"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; native_sound_lib="-laudio"
-else
-   :; 
-fi
- ;;
-      hppa*-hp-hpux* ) ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lAlib"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lAlib"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; native_sound_lib="-lAlib"
-else
-   :; 
-fi
-  ;;
+    case "$canonical" in \
+    *-sgi-* )
+      
+echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
+echo "configure:7723: checking for ALopenport in -laudio" >&5
+ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -laudio "
+cat > conftest.$ac_ext <<EOF
+#line 7728 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char ALopenport();
+
+int main() {
+ALopenport()
+; return 0; }
+EOF
+if { (eval echo configure:7739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  native_sound_lib="-laudio"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+      if test "$native_sound_lib" = "-laudio"; then
+        sound_found="yes" extra_objs="$extra_objs sgiplay.o" sound_cflags=""
+      fi ;;
+    hppa*-hp-hpux* )
+      
+echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
+echo "configure:7765: checking for AOpenAudio in -lAlib" >&5
+ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lAlib "
+cat > conftest.$ac_ext <<EOF
+#line 7770 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char AOpenAudio();
+
+int main() {
+AOpenAudio()
+; return 0; }
+EOF
+if { (eval echo configure:7781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  native_sound_lib="-lAlib"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+      if test "$native_sound_lib" = "-lAlib"; then
+        sound_found="yes" extra_objs="$extra_objs hpplay.o"
+        if test "$with_gcc" = "yes" # Kludge city
+          then sound_cflags="-Dconst= -Dvolatile= -I/usr/audio/examples"
+          else sound_cflags="+e -I/usr/audio/examples"
+        fi
+      fi ;;
     esac
   fi
-fi
-test -z "${with_sound}" -a -n "${native_sound_lib}" && with_sound="native";
-
-#### If the nas library doesn't contain the error jump point, then
-#### we force safer behaviour.
-
-if test "${with_sound}" = "nas" -o \
-        "${with_sound}" = "both"; then
-  echo '#include "confdefs.h"
-#include <audio/Xtutil.h>' > conftest.${ac_ext}
-eval "$ac_cpp conftest.${ac_ext} > conftest.out 2>&1"
-if egrep "AuXtErrorJump" conftest.out >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  old_nas=true
-fi
-rm -f conftest*
-
-fi
-
-if test "${with_cde}" = "yes" ; then
-  if test -f "/usr/dt/include/Dt/Dt.h" ; then
-    C_SWITCH_X_SITE="${C_SWITCH_X_SITE} -I/usr/dt/include"
+
+  if test -z "$sound_found"; then
+    for dir in "machine" "sys" "linux"; do
+      ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6
+echo "configure:7815: checking for ${dir}/soundcard.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7818 "configure"
+#include "confdefs.h"
+#include <${dir}/soundcard.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  sound_found=yes
+        extra_objs="$extra_objs linuxplay.o"
+        { test "$extra_verbose" = "yes" && cat << EOF
+    Defining SOUNDCARD_H_PATH = "${dir}/soundcard.h"
+EOF
+cat >> confdefs.h <<EOF
+#define SOUNDCARD_H_PATH "${dir}/soundcard.h"
+EOF
+}
+
+        break
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    done
   fi
-  if test -f "/usr/dt/lib/libDtSvc.a" ; then
-    LD_SWITCH_X_SITE="${LD_SWITCH_X_SITE} -L/usr/dt/lib"
+
+  test "$sound_found" = "yes" && with_native_sound=yes
+fi
+
+if test -z "$with_sound"; then
+  if test "$with_native_sound" = "yes" -o -n "$native_sound_lib"; then
+    with_sound=native
   fi
 fi
 
-if test "${with_tooltalk}" = "yes" ; then
-  for arg in "-I/usr/include/desktop" "-I${OPENWINHOME-/usr/openwin}/include/desktop" "-I/usr/dt/include/Tt"
-  do
-    if test -f `echo "${arg}/tt_c.h" | sed 's/^\-I//'` ; then
-      C_SWITCH_X_SITE="${C_SWITCH_X_SITE} ${arg}"
-    fi
-  done
-  for arg in "-L/usr/lib" "-L${OPENWINHOME-/usr/openwin}/lib" "-L/usr/dt/lib"
-  do
-    case "${arg}" in
-	-L*) if test -f `echo "${arg}/libtt.a" | sed 's/^\-L//'` ; then
-		 dash_r=''
-		 if test "${add_runtime_flag}" = "yes" ; then
-		     dash_r=`echo ${arg} | sed "s/^-L */${runtime_arg}/"`
-		 fi
-		 LD_SWITCH_X_SITE="${LD_SWITCH_X_SITE} ${arg} ${dash_r}"
-	     fi
-	     ;;
-    esac
-  done
-fi
-
-
-if test "${with_tty}" != "no"  ; then
-  ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lncurses"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lncurses"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; have_ncurses=yes
-else
-   :; have_ncurses=no
-fi
-
-  if test "${have_ncurses}" = "yes"  ; then
+if test "$with_native_sound" = "yes"; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_NATIVE_SOUND
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_NATIVE_SOUND 1
+EOF
+}
+
+  test -n "$native_sound_lib" && LIBS="$LIBS $native_sound_lib"
+fi
+
+case "$with_sound" in both | nas )
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_NAS_SOUND
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_NAS_SOUND 1
+EOF
+}
+
+  extra_objs="$extra_objs nas.o"
+  LIBS="$LIBS -laudio"
+      cat > conftest.$ac_ext <<EOF
+#line 7889 "configure"
+#include "confdefs.h"
+#include <audio/Xtutil.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "AuXtErrorJump" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining NAS_NO_ERROR_JUMP
+EOF
+cat >> confdefs.h <<\EOF
+#define NAS_NO_ERROR_JUMP 1
+EOF
+}
+
+fi
+rm -f conftest*
+
+esac
+
+
+
+
+echo "checking "how to do terminal I/O"" 1>&6
+echo "configure:7915: checking "how to do terminal I/O"" >&5
+
+test -z "$with_tty" && with_tty=yes
+
+if test "$with_tty" = "yes"  ; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_TTY
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_TTY 1
+EOF
+}
+
+
+      ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for termios.h""... $ac_c" 1>&6
+echo "configure:7931: checking for termios.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7934 "configure"
+#include "confdefs.h"
+#include <termios.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_TERMIOS
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_TERMIOS 1
+EOF
+}
+
+else
+  echo "$ac_t""no" 1>&6
+ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for termio.h""... $ac_c" 1>&6
+echo "configure:7966: checking for termio.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7969 "configure"
+#include "confdefs.h"
+#include <termio.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_TERMIO
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_TERMIO 1
+EOF
+}
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+
+    #### Attn: Bill Perry:  Remove next line when GPM support is added
+  test -z "$with_gpm" && with_gpm=no
+
+  test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for gpm.h""... $ac_c" 1>&6
+echo "configure:8009: checking for gpm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8012 "configure"
+#include "confdefs.h"
+#include <gpm.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_gpm=no
+fi
+ }
+  test -z "$with_gpm" && { 
+echo $ac_n "checking for connect_to_gpm in -lgpm""... $ac_c" 1>&6
+echo "configure:8040: checking for connect_to_gpm in -lgpm" >&5
+ac_lib_var=`echo gpm'_'connect_to_gpm | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lgpm "
+cat > conftest.$ac_ext <<EOF
+#line 8045 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char connect_to_gpm();
+
+int main() {
+connect_to_gpm()
+; return 0; }
+EOF
+if { (eval echo configure:8056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  with_gpm=yes
+else
+  echo "$ac_t""no" 1>&6
+with_gpm=no
+fi
+
+ }
+  if test "$with_gpm" = "yes"; then
+    { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_GPM
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_GPM 1
+EOF
+}
+
+    extra_objs="$extra_objs gpmevent.o"
+    LIBS="$LIBS -lgpm"
+  fi
+
+    if test -z "$with_ncurses"; then
     
-{
-test -n "$verbose" && \
-echo "	defining HAVE_NCURSES"
-echo "#define" HAVE_NCURSES "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_NCURSES=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_NCURSES\${ac_dB}HAVE_NCURSES\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_NCURSES\${ac_uB}HAVE_NCURSES\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_NCURSES\${ac_eB}HAVE_NCURSES\${ac_eC}1\${ac_eD}
-"
-}
-
-    test -n "$silent" || echo "checking for ncurses/term.h"
-cat > conftest.${ac_ext} <<EOF
+echo $ac_n "checking for tparm in -lncurses""... $ac_c" 1>&6
+echo "configure:8093: checking for tparm in -lncurses" >&5
+ac_lib_var=`echo ncurses'_'tparm | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lncurses "
+cat > conftest.$ac_ext <<EOF
+#line 8098 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char tparm();
+
+int main() {
+tparm()
+; return 0; }
+EOF
+if { (eval echo configure:8109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  with_ncurses=yes
+else
+  echo "$ac_t""no" 1>&6
+with_ncurses=no
+fi
+
+
+  fi
+  if test "$with_ncurses" = "yes"; then
+    { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_NCURSES
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_NCURSES 1
+EOF
+}
+
+    ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
+echo "configure:8142: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8145 "configure"
+#include "confdefs.h"
+#include <ncurses/curses.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  curses_h_path=ncurses/curses.h
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
+echo "configure:8172: checking for ncurses/term.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8175 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
-  have_ncurses_term_h=yes
-
-else
-  rm -rf conftest*
-  have_ncurses_term_h=no
-fi
-rm -f conftest*
-
-    test "${have_ncurses_term_h}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_NCURSES_TERM_H"
-echo "#define" HAVE_NCURSES_TERM_H "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_NCURSES_TERM_H=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_NCURSES_TERM_H\${ac_dB}HAVE_NCURSES_TERM_H\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_NCURSES_TERM_H\${ac_uB}HAVE_NCURSES_TERM_H\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_NCURSES_TERM_H\${ac_eB}HAVE_NCURSES_TERM_H\${ac_eC}1\${ac_eD}
-"
-}
-
-    test -n "$silent" || echo "checking for ncurses/curses.h"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ncurses/curses.h>
-EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  have_ncurses_curses_h=yes
-
-else
-  rm -rf conftest*
-  have_ncurses_curses_h=no
-fi
-rm -f conftest*
-
-    if test "${have_ncurses_curses_h}" = "no"  ; then
-                        OLD_CPP="${CPP}"
-      CPP="${CPP} -I/usr/include/ncurses"
-      test -n "$silent" || echo "checking for ncurses/curses.h"
-cat > conftest.${ac_ext} <<EOF
+  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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  term_h_path=ncurses/term.h
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    extra_objs="$extra_objs terminfo.o"
+    LIBS="$LIBS -lncurses"
+
+    if test "$ac_cv_header_ncurses_curses_h" != "yes"  ; then
+                        save_c_switch_site="$c_switch_site"
+      c_switch_site="$c_switch_site -I/usr/include/ncurses"
+      ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
+echo "configure:8208: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8211 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
-ac_err=`eval "(exec $ac_cpp conftest.${ac_ext} >/dev/null) 2>&1"`
-if test "${extra_verbose}" = "yes"  && test -n "$ac_err"; then
-  echo "$ac_err"
-fi
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8216: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
-  have_ncurses_curses_h=yes
-
-else
-  rm -rf conftest*
-  have_ncurses_curses_h=no
-fi
-rm -f conftest*
-
-      if test "${have_ncurses_curses_h}" = "yes"  ; then
-        site_includes="${site_includes} /usr/include/ncurses"
-	C_SWITCH_SITE="${C_SWITCH_SITE} -I/usr/include/ncurses"
-	test -n "$verbose" && echo "	Your system has the bogus ncurses include bug."
-      else
-	CPP="${OLD_CPP}"
+  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"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  curses_h_path=ncurses/curses.h
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+      if test "$ac_cv_header_ncurses_curses_h" = "yes";
+        then echo "configure: warning: "Your system has the bogus ncurses include bug."" 1>&2
+        else c_switch_site="$save_c_switch_site"
+      fi
+    fi
+  else         
+echo $ac_n "checking for tgoto in -ltermlib""... $ac_c" 1>&6
+echo "configure:8243: checking for tgoto in -ltermlib" >&5
+ac_lib_var=`echo termlib'_'tgoto | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -ltermlib "
+cat > conftest.$ac_ext <<EOF
+#line 8248 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char tgoto();
+
+int main() {
+tgoto()
+; return 0; }
+EOF
+if { (eval echo configure:8259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  have_libtermlib=yes
+else
+  echo "$ac_t""no" 1>&6
+have_libtermlib=no
+fi
+
+
+    
+echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
+echo "configure:8282: checking for tgoto in -ltermcap" >&5
+ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -ltermcap "
+cat > conftest.$ac_ext <<EOF
+#line 8287 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char tgoto();
+
+int main() {
+tgoto()
+; return 0; }
+EOF
+if { (eval echo configure:8298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  have_libtermcap=yes
+else
+  echo "$ac_t""no" 1>&6
+have_libtermcap=no
+fi
+
+
+    
+echo $ac_n "checking for tparm in -lcurses""... $ac_c" 1>&6
+echo "configure:8321: checking for tparm in -lcurses" >&5
+ac_lib_var=`echo curses'_'tparm | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lcurses "
+cat > conftest.$ac_ext <<EOF
+#line 8326 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char tparm();
+
+int main() {
+tparm()
+; return 0; }
+EOF
+if { (eval echo configure:8337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  have_libcurses=yes
+else
+  echo "$ac_t""no" 1>&6
+have_libcurses=no
+fi
+
+
+
+    if test "$have_terminfo" = "yes"; then
+      extra_objs="$extra_objs terminfo.o"
+      if   test -n "$libs_termcap";         then LIBS="$LIBS $libs_termcap"
+      elif test "$have_libcurses"  = "yes"; then LIBS="$LIBS -lcurses"
+      elif test "$have_libtermlib" = "yes"; then LIBS="$LIBS -ltermlib"
+      elif test "$have_libtermcap" = "yes"; then LIBS="$LIBS -ltermcap"
+    fi
+    else       extra_objs="$extra_objs tparam.o"
+      if   test -n "$libs_termcap";         then LIBS="$LIBS $libs_termcap"
+      elif test "$have_libtermcap" = "yes"; then LIBS="$LIBS -ltermcap"
+      elif test "$have_libcurses"  = "yes"; then LIBS="$LIBS -lcurses"
+      else extra_objs="$extra_objs termcap.o"
       fi
     fi
-    test "${have_ncurses_curses_h}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_NCURSES_CURSES_H"
-echo "#define" HAVE_NCURSES_CURSES_H "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_NCURSES_CURSES_H=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_NCURSES_CURSES_H\${ac_dB}HAVE_NCURSES_CURSES_H\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_NCURSES_CURSES_H\${ac_uB}HAVE_NCURSES_CURSES_H\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_NCURSES_CURSES_H\${ac_eB}HAVE_NCURSES_CURSES_H\${ac_eC}1\${ac_eD}
-"
-}
+  fi
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining CURSES_H_PATH = "${curses_h_path-curses.h}"
+EOF
+cat >> confdefs.h <<EOF
+#define CURSES_H_PATH "${curses_h_path-curses.h}"
+EOF
+}
+
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining TERM_H_PATH = "${term_h_path-term.h}"
+EOF
+cat >> confdefs.h <<EOF
+#define TERM_H_PATH "${term_h_path-term.h}"
+EOF
+}
+
+else # "$with_tty" = "no"
+  for feature in ncurses gpm; do
+    if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then
+      echo "configure: warning: "--with-${feature} ignored:  Not valid without TTY support"" 1>&2
+    fi
+    eval "with_${feature}=no"
+  done
+fi
+
+
+echo "checking for database support" 1>&6
+echo "configure:8401: checking for database support" >&5
+
+if test "$with_database_gnudbm" != "no"  ; then
+  
+echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
+echo "configure:8406: checking for dbm_open in -lgdbm" >&5
+ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lgdbm "
+cat > conftest.$ac_ext <<EOF
+#line 8411 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char dbm_open();
+
+int main() {
+dbm_open()
+; return 0; }
+EOF
+if { (eval echo configure:8422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  with_database_gnudbm=yes have_libgdbm=yes
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+  if test "$with_database_gnudbm" != "yes"; then
+    echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
+echo "configure:8444: checking for dbm_open" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8447 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dbm_open(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char dbm_open();
+
+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_dbm_open) || defined (__stub___dbm_open)
+choke me
+#else
+dbm_open();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:8470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_func_dbm_open=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_dbm_open=no"
+fi
+rm -f conftest*
+
+if eval "test \"`echo '$ac_cv_func_'dbm_open`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  with_database_gnudbm=yes
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+      fi
+  if test "$with_database_gnudbm" = "yes" ; then
+    { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_DBM
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_DBM 1
+EOF
+}
+
+    test "$have_libgdbm" = "yes" && LIBS="$LIBS -lgdbm"
+    with_database_dbm=no
+  else with_database_gnudbm=no
+  fi
+fi
+
+if test "$with_database_dbm" != "no"  ; then
+  echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
+echo "configure:8506: checking for dbm_open" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8509 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dbm_open(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char dbm_open();
+
+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_dbm_open) || defined (__stub___dbm_open)
+choke me
+#else
+dbm_open();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:8532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_func_dbm_open=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_dbm_open=no"
+fi
+rm -f conftest*
+
+if eval "test \"`echo '$ac_cv_func_'dbm_open`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  with_database_dbm=yes need_libdbm=no
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  if test "$need_libdbm" != "no"; then
+    
+echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
+echo "configure:8553: checking for dbm_open in -ldbm" >&5
+ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -ldbm "
+cat > conftest.$ac_ext <<EOF
+#line 8558 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char dbm_open();
+
+int main() {
+dbm_open()
+; return 0; }
+EOF
+if { (eval echo configure:8569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  with_database_dbm=yes need_libdbm=yes
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 
   fi
-fi
-
-
-
-if test "${with_database_berkdb}" != "no"  ; then
-  ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -ldb"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -ldb"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; have_libdb=yes
-else
-   :; have_libdb=no
-fi
-
-  test "${have_libdb}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_LIBDB"
-echo "#define" HAVE_LIBDB "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_LIBDB=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_LIBDB\${ac_dB}HAVE_LIBDB\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_LIBDB\${ac_uB}HAVE_LIBDB\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_LIBDB\${ac_eB}HAVE_LIBDB\${ac_eC}1\${ac_eD}
-"
-}
-
-  if test "${with_database_berkdb}" != "yes"  ; then
-    if test "${have_libdb}" = "yes"  ; then
-      with_database_berkdb=yes
-    else
-      test -n "$silent" || echo "checking for dbopen"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() { 
+  if test "$with_database_dbm" = "yes"  ; then
+    { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_DBM
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_DBM 1
+EOF
+}
+
+    test "$need_libdbm" = "yes" && LIBS="$LIBS -ldbm"
+  else with_database_dbm=no
+  fi
+fi
+
+if test "$with_database_berkdb" != "no"; then
+  echo $ac_n "checking for dbopen""... $ac_c" 1>&6
+echo "configure:8606: checking for dbopen" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8609 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dbopen(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char dbopen();
+
+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_dbopen) || defined (__stub___dbopen)
 choke me
 #else
-/* Override any gcc2 internal prototype to avoid an error.  */
-extern char dbopen(); dbopen();
+dbopen();
 #endif
+
 ; return 0; }
 EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  with_database_berkdb=yes
-
-else
-  rm -rf conftest*
-  with_database_berkdb=no
-fi
-rm -f conftest*
-
-    fi
-  fi
-fi
-test "${with_database_berkdb}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_BERKELEY_DB"
-echo "#define" HAVE_BERKELEY_DB "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_BERKELEY_DB=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_BERKELEY_DB\${ac_dB}HAVE_BERKELEY_DB\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_BERKELEY_DB\${ac_uB}HAVE_BERKELEY_DB\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_BERKELEY_DB\${ac_eB}HAVE_BERKELEY_DB\${ac_eC}1\${ac_eD}
-"
-}
-
-
-if test "${with_database_gnudbm}" != "no"  ; then
-  ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -lgdbm"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -lgdbm"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; have_libgdbm=yes
-else
-   :; have_libgdbm=no
-fi
-
-  test "${have_libgdbm}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_LIBGDBM"
-echo "#define" HAVE_LIBGDBM "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_LIBGDBM=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_LIBGDBM\${ac_dB}HAVE_LIBGDBM\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_LIBGDBM\${ac_uB}HAVE_LIBGDBM\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_LIBGDBM\${ac_eB}HAVE_LIBGDBM\${ac_eC}1\${ac_eD}
-"
-}
-
-  test -z "${with_database_gnudbm}" && with_database_gnudbm="${have_libgdbm}"
-fi
-if test "${with_database_gnudbm}" = "yes" ; then
-  
-{
-test -n "$verbose" && \
-echo "	defining HAVE_DBM"
-echo "#define" HAVE_DBM "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_DBM=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_DBM\${ac_dB}HAVE_DBM\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_DBM\${ac_uB}HAVE_DBM\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_DBM\${ac_eB}HAVE_DBM\${ac_eC}1\${ac_eD}
-"
-}
-
-  
-{
-test -n "$verbose" && \
-echo "	defining HAVE_GNU_DBM"
-echo "#define" HAVE_GNU_DBM "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_GNU_DBM=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_GNU_DBM\${ac_dB}HAVE_GNU_DBM\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_GNU_DBM\${ac_uB}HAVE_GNU_DBM\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_GNU_DBM\${ac_eB}HAVE_GNU_DBM\${ac_eC}1\${ac_eD}
-"
-}
-
-  with_database_dbm=no
-fi
-
-if test "${with_database_dbm}" != "no"  ; then
-  ac_save_LIBS="${LIBS}"
-LIBS="${LIBS} -ldbm"
-ac_have_lib=""
-test -n "$silent" || echo "checking for -ldbm"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() { main();; return 0; }
-EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  ac_have_lib="1"
-
-fi
-rm -f conftest*
-LIBS="${ac_save_LIBS}"
-if test -n "${ac_have_lib}"; then
-   :; have_libdbm=yes
-else
-   :; have_libdbm=no
-fi
-
-  test "${have_libdbm}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_LIBDBM"
-echo "#define" HAVE_LIBDBM "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_LIBDBM=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_LIBDBM\${ac_dB}HAVE_LIBDBM\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_LIBDBM\${ac_uB}HAVE_LIBDBM\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_LIBDBM\${ac_eB}HAVE_LIBDBM\${ac_eC}1\${ac_eD}
-"
-}
-
-  if test "${with_database_dbm}" != "yes"  ; then
-    if test "${have_libdbm}" = "yes"  ; then
-      with_database_dbm=yes
-    else
-      test -n "$silent" || echo "checking for dbm_open"
-cat > conftest.${ac_ext} <<EOF
-#include "confdefs.h"
-#include <ctype.h>
-int main() { return 0; }
-int t() { 
-/* 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_dbm_open) || defined (__stub___dbm_open)
-choke me
-#else
+if { (eval echo configure:8632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_func_dbopen=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_dbopen=no"
+fi
+rm -f conftest*
+
+if eval "test \"`echo '$ac_cv_func_'dbopen`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  with_database_berkdb=yes need_libdb=no
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  if test "$need_libdb" != "no"; then
+    
+echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6
+echo "configure:8653: checking for dbopen in -ldb" >&5
+ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -ldb "
+cat > conftest.$ac_ext <<EOF
+#line 8658 "configure"
+#include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
-extern char dbm_open(); dbm_open();
-#endif
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char dbopen();
+
+int main() {
+dbopen()
 ; return 0; }
 EOF
-if eval $ac_compile; then
-  rm -rf conftest*
-  with_database_dbm=yes
-
-else
-  rm -rf conftest*
-  with_database_dbm=no
-fi
-rm -f conftest*
+if { (eval echo configure:8669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  with_database_berkdb=yes need_libdb=yes
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 
     fi
+  if test "$with_database_berkdb" = "yes"; then
+    for path in "db/db.h" "db.h"; do
+cat > conftest.$ac_ext <<EOF
+#line 8693 "configure"
+#include "confdefs.h"
+#ifdef HAVE_INTTYPES_H
+#define __BIT_TYPES_DEFINED__
+#include <inttypes.h>
+typedef uint8_t  u_int8_t;
+typedef uint16_t u_int16_t;
+typedef uint32_t u_int32_t;
+#ifdef WE_DONT_NEED_QUADS
+typedef uint64_t u_int64_t;
+#endif
+#endif
+#include <$path>
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:8711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  db_h_path="$path"; break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    done
+    test -z "$db_h_path" && with_database_berkdb=no
   fi
-fi
-test "${with_database_dbm}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_DBM"
-echo "#define" HAVE_DBM "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_DBM=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_DBM\${ac_dB}HAVE_DBM\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_DBM\${ac_uB}HAVE_DBM\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_DBM\${ac_eB}HAVE_DBM\${ac_eC}1\${ac_eD}
-"
-}
-
-
-
-############################################################################
-#									   #
-#                     Substitute into Makefile and config.h                #
-#									   #
-############################################################################
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{
-test -n "$verbose" && \
-echo "	defining" EMACS_VERSION to be ""${version}""
-echo "#define" EMACS_VERSION ""${version}"" >> confdefs.h
-DEFS="$DEFS -DEMACS_VERSION="${version}""
-ac_sed_defs="${ac_sed_defs}\${ac_dA}EMACS_VERSION\${ac_dB}EMACS_VERSION\${ac_dC}"${version}"\${ac_dD}
-\${ac_uA}EMACS_VERSION\${ac_uB}EMACS_VERSION\${ac_uC}"${version}"\${ac_uD}
-\${ac_eA}EMACS_VERSION\${ac_eB}EMACS_VERSION\${ac_eC}"${version}"\${ac_eD}
-"
-}
-
-
-{
-test -n "$verbose" && \
-echo "	defining" EMACS_CONFIGURATION to be ""\"${canonical}\"""
-echo "#define" EMACS_CONFIGURATION ""\"${canonical}\""" >> confdefs.h
-DEFS="$DEFS -DEMACS_CONFIGURATION="\"${canonical}\"""
-ac_sed_defs="${ac_sed_defs}\${ac_dA}EMACS_CONFIGURATION\${ac_dB}EMACS_CONFIGURATION\${ac_dC}"\"${canonical}\""\${ac_dD}
-\${ac_uA}EMACS_CONFIGURATION\${ac_uB}EMACS_CONFIGURATION\${ac_uC}"\"${canonical}\""\${ac_uD}
-\${ac_eA}EMACS_CONFIGURATION\${ac_eB}EMACS_CONFIGURATION\${ac_eC}"\"${canonical}\""\${ac_eD}
-"
-}
-
-
-{
-test -n "$verbose" && \
-echo "	defining" config_machfile to be ""\"${machfile}\"""
-echo "#define" config_machfile ""\"${machfile}\""" >> confdefs.h
-DEFS="$DEFS -Dconfig_machfile="\"${machfile}\"""
-ac_sed_defs="${ac_sed_defs}\${ac_dA}config_machfile\${ac_dB}config_machfile\${ac_dC}"\"${machfile}\""\${ac_dD}
-\${ac_uA}config_machfile\${ac_uB}config_machfile\${ac_uC}"\"${machfile}\""\${ac_uD}
-\${ac_eA}config_machfile\${ac_eB}config_machfile\${ac_eC}"\"${machfile}\""\${ac_eD}
-"
-}
-
-
-{
-test -n "$verbose" && \
-echo "	defining" config_opsysfile to be ""\"${opsysfile}\"""
-echo "#define" config_opsysfile ""\"${opsysfile}\""" >> confdefs.h
-DEFS="$DEFS -Dconfig_opsysfile="\"${opsysfile}\"""
-ac_sed_defs="${ac_sed_defs}\${ac_dA}config_opsysfile\${ac_dB}config_opsysfile\${ac_dC}"\"${opsysfile}\""\${ac_dD}
-\${ac_uA}config_opsysfile\${ac_uB}config_opsysfile\${ac_uC}"\"${opsysfile}\""\${ac_uD}
-\${ac_eA}config_opsysfile\${ac_eB}config_opsysfile\${ac_eC}"\"${opsysfile}\""\${ac_eD}
-"
-}
-
-
-{
-test -n "$verbose" && \
-echo "	defining" LD_SWITCH_X_SITE to be "${LD_SWITCH_X_SITE}"
-echo "#define" LD_SWITCH_X_SITE "${LD_SWITCH_X_SITE}" >> confdefs.h
-DEFS="$DEFS -DLD_SWITCH_X_SITE=${LD_SWITCH_X_SITE}"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}LD_SWITCH_X_SITE\${ac_dB}LD_SWITCH_X_SITE\${ac_dC}${LD_SWITCH_X_SITE}\${ac_dD}
-\${ac_uA}LD_SWITCH_X_SITE\${ac_uB}LD_SWITCH_X_SITE\${ac_uC}${LD_SWITCH_X_SITE}\${ac_uD}
-\${ac_eA}LD_SWITCH_X_SITE\${ac_eB}LD_SWITCH_X_SITE\${ac_eC}${LD_SWITCH_X_SITE}\${ac_eD}
-"
-}
-
-
-{
-test -n "$verbose" && \
-echo "	defining" LD_SWITCH_X_SITE_AUX to be "${LD_SWITCH_X_SITE_AUX}"
-echo "#define" LD_SWITCH_X_SITE_AUX "${LD_SWITCH_X_SITE_AUX}" >> confdefs.h
-DEFS="$DEFS -DLD_SWITCH_X_SITE_AUX=${LD_SWITCH_X_SITE_AUX}"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}LD_SWITCH_X_SITE_AUX\${ac_dB}LD_SWITCH_X_SITE_AUX\${ac_dC}${LD_SWITCH_X_SITE_AUX}\${ac_dD}
-\${ac_uA}LD_SWITCH_X_SITE_AUX\${ac_uB}LD_SWITCH_X_SITE_AUX\${ac_uC}${LD_SWITCH_X_SITE_AUX}\${ac_uD}
-\${ac_eA}LD_SWITCH_X_SITE_AUX\${ac_eB}LD_SWITCH_X_SITE_AUX\${ac_eC}${LD_SWITCH_X_SITE_AUX}\${ac_eD}
-"
-}
-
-
-{
-test -n "$verbose" && \
-echo "	defining" C_SWITCH_X_SITE to be "${C_SWITCH_X_SITE}"
-echo "#define" C_SWITCH_X_SITE "${C_SWITCH_X_SITE}" >> confdefs.h
-DEFS="$DEFS -DC_SWITCH_X_SITE=${C_SWITCH_X_SITE}"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}C_SWITCH_X_SITE\${ac_dB}C_SWITCH_X_SITE\${ac_dC}${C_SWITCH_X_SITE}\${ac_dD}
-\${ac_uA}C_SWITCH_X_SITE\${ac_uB}C_SWITCH_X_SITE\${ac_uC}${C_SWITCH_X_SITE}\${ac_uD}
-\${ac_eA}C_SWITCH_X_SITE\${ac_eB}C_SWITCH_X_SITE\${ac_eC}${C_SWITCH_X_SITE}\${ac_eD}
-"
-}
-
-
-{
-test -n "$verbose" && \
-echo "	defining" LD_SWITCH_SITE to be "${LD_SWITCH_SITE}"
-echo "#define" LD_SWITCH_SITE "${LD_SWITCH_SITE}" >> confdefs.h
-DEFS="$DEFS -DLD_SWITCH_SITE=${LD_SWITCH_SITE}"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}LD_SWITCH_SITE\${ac_dB}LD_SWITCH_SITE\${ac_dC}${LD_SWITCH_SITE}\${ac_dD}
-\${ac_uA}LD_SWITCH_SITE\${ac_uB}LD_SWITCH_SITE\${ac_uC}${LD_SWITCH_SITE}\${ac_uD}
-\${ac_eA}LD_SWITCH_SITE\${ac_eB}LD_SWITCH_SITE\${ac_eC}${LD_SWITCH_SITE}\${ac_eD}
-"
-}
-
-
-{
-test -n "$verbose" && \
-echo "	defining" C_SWITCH_SITE to be "${C_SWITCH_SITE}"
-echo "#define" C_SWITCH_SITE "${C_SWITCH_SITE}" >> confdefs.h
-DEFS="$DEFS -DC_SWITCH_SITE=${C_SWITCH_SITE}"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}C_SWITCH_SITE\${ac_dB}C_SWITCH_SITE\${ac_dC}${C_SWITCH_SITE}\${ac_dD}
-\${ac_uA}C_SWITCH_SITE\${ac_uB}C_SWITCH_SITE\${ac_uC}${C_SWITCH_SITE}\${ac_uD}
-\${ac_eA}C_SWITCH_SITE\${ac_eB}C_SWITCH_SITE\${ac_eC}${C_SWITCH_SITE}\${ac_eD}
-"
-}
-
-
-{
-test -n "$verbose" && \
-echo "	defining" UNEXEC_SRC to be "${UNEXEC_SRC}"
-echo "#define" UNEXEC_SRC "${UNEXEC_SRC}" >> confdefs.h
-DEFS="$DEFS -DUNEXEC_SRC=${UNEXEC_SRC}"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}UNEXEC_SRC\${ac_dB}UNEXEC_SRC\${ac_dC}${UNEXEC_SRC}\${ac_dD}
-\${ac_uA}UNEXEC_SRC\${ac_uB}UNEXEC_SRC\${ac_uC}${UNEXEC_SRC}\${ac_uD}
-\${ac_eA}UNEXEC_SRC\${ac_eB}UNEXEC_SRC\${ac_eC}${UNEXEC_SRC}\${ac_eD}
-"
-}
-
-
-
-test -n "${puresize}" && 
-{
-test -n "$verbose" && \
-echo "	defining" RAW_PURESIZE to be "${puresize}"
-echo "#define" RAW_PURESIZE "${puresize}" >> confdefs.h
-DEFS="$DEFS -DRAW_PURESIZE=${puresize}"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}RAW_PURESIZE\${ac_dB}RAW_PURESIZE\${ac_dC}${puresize}\${ac_dD}
-\${ac_uA}RAW_PURESIZE\${ac_uB}RAW_PURESIZE\${ac_uC}${puresize}\${ac_uD}
-\${ac_eA}RAW_PURESIZE\${ac_eB}RAW_PURESIZE\${ac_eC}${puresize}\${ac_eD}
-"
-}
-
-test "${HAVE_X_WINDOWS}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_X_WINDOWS"
-echo "#define" HAVE_X_WINDOWS "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_X_WINDOWS=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_X_WINDOWS\${ac_dB}HAVE_X_WINDOWS\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_X_WINDOWS\${ac_uB}HAVE_X_WINDOWS\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_X_WINDOWS\${ac_eB}HAVE_X_WINDOWS\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${HAVE_XFREE386}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_XFREE386"
-echo "#define" HAVE_XFREE386 "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_XFREE386=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_XFREE386\${ac_dB}HAVE_XFREE386\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_XFREE386\${ac_uB}HAVE_XFREE386\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_XFREE386\${ac_eB}HAVE_XFREE386\${ac_eC}1\${ac_eD}
-"
-}
-
-
-if test "${GNU_MALLOC}"  = yes; then 
-{
-test -n "$verbose" && \
-echo "	defining GNU_MALLOC"
-echo "#define" GNU_MALLOC "1" >> confdefs.h
-DEFS="$DEFS -DGNU_MALLOC=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}GNU_MALLOC\${ac_dB}GNU_MALLOC\${ac_dC}1\${ac_dD}
-\${ac_uA}GNU_MALLOC\${ac_uB}GNU_MALLOC\${ac_uC}1\${ac_uD}
-\${ac_eA}GNU_MALLOC\${ac_eB}GNU_MALLOC\${ac_eC}1\${ac_eD}
-"
-}
-
-elif test "${use_system_malloc}" = yes; then 
-{
-test -n "$verbose" && \
-echo "	defining USE_SYSTEM_MALLOC"
-echo "#define" USE_SYSTEM_MALLOC "1" >> confdefs.h
-DEFS="$DEFS -DUSE_SYSTEM_MALLOC=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}USE_SYSTEM_MALLOC\${ac_dB}USE_SYSTEM_MALLOC\${ac_dC}1\${ac_dD}
-\${ac_uA}USE_SYSTEM_MALLOC\${ac_uB}USE_SYSTEM_MALLOC\${ac_uC}1\${ac_uD}
-\${ac_eA}USE_SYSTEM_MALLOC\${ac_eB}USE_SYSTEM_MALLOC\${ac_eC}1\${ac_eD}
-"
-}
-
-fi
-test "${rel_alloc}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining REL_ALLOC"
-echo "#define" REL_ALLOC "1" >> confdefs.h
-DEFS="$DEFS -DREL_ALLOC=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}REL_ALLOC\${ac_dB}REL_ALLOC\${ac_dC}1\${ac_dD}
-\${ac_uA}REL_ALLOC\${ac_uB}REL_ALLOC\${ac_uC}1\${ac_uD}
-\${ac_eA}REL_ALLOC\${ac_eB}REL_ALLOC\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${LISP_FLOAT_TYPE}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining LISP_FLOAT_TYPE"
-echo "#define" LISP_FLOAT_TYPE "1" >> confdefs.h
-DEFS="$DEFS -DLISP_FLOAT_TYPE=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}LISP_FLOAT_TYPE\${ac_dB}LISP_FLOAT_TYPE\${ac_dC}1\${ac_dD}
-\${ac_uA}LISP_FLOAT_TYPE\${ac_uB}LISP_FLOAT_TYPE\${ac_uC}1\${ac_uD}
-\${ac_eA}LISP_FLOAT_TYPE\${ac_eB}LISP_FLOAT_TYPE\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_motif}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining LWLIB_USES_MOTIF"
-echo "#define" LWLIB_USES_MOTIF "1" >> confdefs.h
-DEFS="$DEFS -DLWLIB_USES_MOTIF=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}LWLIB_USES_MOTIF\${ac_dB}LWLIB_USES_MOTIF\${ac_dC}1\${ac_dD}
-\${ac_uA}LWLIB_USES_MOTIF\${ac_uB}LWLIB_USES_MOTIF\${ac_uC}1\${ac_uD}
-\${ac_eA}LWLIB_USES_MOTIF\${ac_eB}LWLIB_USES_MOTIF\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_athena}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining LWLIB_USES_ATHENA"
-echo "#define" LWLIB_USES_ATHENA "1" >> confdefs.h
-DEFS="$DEFS -DLWLIB_USES_ATHENA=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}LWLIB_USES_ATHENA\${ac_dB}LWLIB_USES_ATHENA\${ac_dC}1\${ac_dD}
-\${ac_uA}LWLIB_USES_ATHENA\${ac_uB}LWLIB_USES_ATHENA\${ac_uC}1\${ac_uD}
-\${ac_eA}LWLIB_USES_ATHENA\${ac_eB}LWLIB_USES_ATHENA\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_toolbars}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_TOOLBARS"
-echo "#define" HAVE_TOOLBARS "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_TOOLBARS=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_TOOLBARS\${ac_dB}HAVE_TOOLBARS\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_TOOLBARS\${ac_uB}HAVE_TOOLBARS\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_TOOLBARS\${ac_eB}HAVE_TOOLBARS\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_tty}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_TTY"
-echo "#define" HAVE_TTY "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_TTY=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_TTY\${ac_dB}HAVE_TTY\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_TTY\${ac_uB}HAVE_TTY\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_TTY\${ac_eB}HAVE_TTY\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_tooltalk}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining TOOLTALK"
-echo "#define" TOOLTALK "1" >> confdefs.h
-DEFS="$DEFS -DTOOLTALK=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}TOOLTALK\${ac_dB}TOOLTALK\${ac_dC}1\${ac_dD}
-\${ac_uA}TOOLTALK\${ac_uB}TOOLTALK\${ac_uC}1\${ac_uD}
-\${ac_eA}TOOLTALK\${ac_eB}TOOLTALK\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_i18n3}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining I18N3"
-echo "#define" I18N3 "1" >> confdefs.h
-DEFS="$DEFS -DI18N3=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}I18N3\${ac_dB}I18N3\${ac_dC}1\${ac_dD}
-\${ac_uA}I18N3\${ac_uB}I18N3\${ac_uC}1\${ac_uD}
-\${ac_eA}I18N3\${ac_eB}I18N3\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_mule}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining MULE"
-echo "#define" MULE "1" >> confdefs.h
-DEFS="$DEFS -DMULE=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}MULE\${ac_dB}MULE\${ac_dC}1\${ac_dD}
-\${ac_uA}MULE\${ac_uB}MULE\${ac_uC}1\${ac_uD}
-\${ac_eA}MULE\${ac_eB}MULE\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_canna}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_CANNA"
-echo "#define" HAVE_CANNA "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_CANNA=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_CANNA\${ac_dB}HAVE_CANNA\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_CANNA\${ac_uB}HAVE_CANNA\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_CANNA\${ac_eB}HAVE_CANNA\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_wnn}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_WNN"
-echo "#define" HAVE_WNN "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_WNN=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_WNN\${ac_dB}HAVE_WNN\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_WNN\${ac_uB}HAVE_WNN\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_WNN\${ac_eB}HAVE_WNN\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_wnn6}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining WNN6"
-echo "#define" WNN6 "1" >> confdefs.h
-DEFS="$DEFS -DWNN6=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}WNN6\${ac_dB}WNN6\${ac_dC}1\${ac_dD}
-\${ac_uA}WNN6\${ac_uB}WNN6\${ac_uC}1\${ac_uD}
-\${ac_eA}WNN6\${ac_eB}WNN6\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_mock}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining MOCKLISP_SUPPORT"
-echo "#define" MOCKLISP_SUPPORT "1" >> confdefs.h
-DEFS="$DEFS -DMOCKLISP_SUPPORT=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}MOCKLISP_SUPPORT\${ac_dB}MOCKLISP_SUPPORT\${ac_dC}1\${ac_dD}
-\${ac_uA}MOCKLISP_SUPPORT\${ac_uB}MOCKLISP_SUPPORT\${ac_uC}1\${ac_uD}
-\${ac_eA}MOCKLISP_SUPPORT\${ac_eB}MOCKLISP_SUPPORT\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_sparcworks}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining SUNPRO"
-echo "#define" SUNPRO "1" >> confdefs.h
-DEFS="$DEFS -DSUNPRO=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}SUNPRO\${ac_dB}SUNPRO\${ac_dC}1\${ac_dD}
-\${ac_uA}SUNPRO\${ac_uB}SUNPRO\${ac_uC}1\${ac_uD}
-\${ac_eA}SUNPRO\${ac_eB}SUNPRO\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${usage_tracking}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining USAGE_TRACKING"
-echo "#define" USAGE_TRACKING "1" >> confdefs.h
-DEFS="$DEFS -DUSAGE_TRACKING=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}USAGE_TRACKING\${ac_dB}USAGE_TRACKING\${ac_dC}1\${ac_dD}
-\${ac_uA}USAGE_TRACKING\${ac_uB}USAGE_TRACKING\${ac_uC}1\${ac_uD}
-\${ac_eA}USAGE_TRACKING\${ac_eB}USAGE_TRACKING\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${need_dynodump}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining DYNODUMP"
-echo "#define" DYNODUMP "1" >> confdefs.h
-DEFS="$DEFS -DDYNODUMP=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}DYNODUMP\${ac_dB}DYNODUMP\${ac_dC}1\${ac_dD}
-\${ac_uA}DYNODUMP\${ac_uB}DYNODUMP\${ac_uC}1\${ac_uD}
-\${ac_eA}DYNODUMP\${ac_eB}DYNODUMP\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${need_xildoff}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining NEED_XILDOFF"
-echo "#define" NEED_XILDOFF "1" >> confdefs.h
-DEFS="$DEFS -DNEED_XILDOFF=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}NEED_XILDOFF\${ac_dB}NEED_XILDOFF\${ac_dC}1\${ac_dD}
-\${ac_uA}NEED_XILDOFF\${ac_uB}NEED_XILDOFF\${ac_uC}1\${ac_uD}
-\${ac_eA}NEED_XILDOFF\${ac_eB}NEED_XILDOFF\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_gcc}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining USE_GCC"
-echo "#define" USE_GCC "1" >> confdefs.h
-DEFS="$DEFS -DUSE_GCC=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}USE_GCC\${ac_dB}USE_GCC\${ac_dC}1\${ac_dD}
-\${ac_uA}USE_GCC\${ac_uB}USE_GCC\${ac_uC}1\${ac_uD}
-\${ac_eA}USE_GCC\${ac_eB}USE_GCC\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_lcc}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining USE_LCC"
-echo "#define" USE_LCC "1" >> confdefs.h
-DEFS="$DEFS -DUSE_LCC=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}USE_LCC\${ac_dB}USE_LCC\${ac_dC}1\${ac_dD}
-\${ac_uA}USE_LCC\${ac_uB}USE_LCC\${ac_uC}1\${ac_uD}
-\${ac_eA}USE_LCC\${ac_eB}USE_LCC\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_socks}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_SOCKS"
-echo "#define" HAVE_SOCKS "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_SOCKS=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_SOCKS\${ac_dB}HAVE_SOCKS\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_SOCKS\${ac_uB}HAVE_SOCKS\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_SOCKS\${ac_eB}HAVE_SOCKS\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_term}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_TERM"
-echo "#define" HAVE_TERM "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_TERM=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_TERM\${ac_dB}HAVE_TERM\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_TERM\${ac_uB}HAVE_TERM\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_TERM\${ac_eB}HAVE_TERM\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${external_widget}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining EXTERNAL_WIDGET"
-echo "#define" EXTERNAL_WIDGET "1" >> confdefs.h
-DEFS="$DEFS -DEXTERNAL_WIDGET=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}EXTERNAL_WIDGET\${ac_dB}EXTERNAL_WIDGET\${ac_dC}1\${ac_dD}
-\${ac_uA}EXTERNAL_WIDGET\${ac_uB}EXTERNAL_WIDGET\${ac_uC}1\${ac_uD}
-\${ac_eA}EXTERNAL_WIDGET\${ac_eB}EXTERNAL_WIDGET\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_gnu_make}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining USE_GNU_MAKE"
-echo "#define" USE_GNU_MAKE "1" >> confdefs.h
-DEFS="$DEFS -DUSE_GNU_MAKE=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}USE_GNU_MAKE\${ac_dB}USE_GNU_MAKE\${ac_dC}1\${ac_dD}
-\${ac_uA}USE_GNU_MAKE\${ac_uB}USE_GNU_MAKE\${ac_uC}1\${ac_uD}
-\${ac_eA}USE_GNU_MAKE\${ac_eB}USE_GNU_MAKE\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${no_doc_file}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining NO_DOC_FILE"
-echo "#define" NO_DOC_FILE "1" >> confdefs.h
-DEFS="$DEFS -DNO_DOC_FILE=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}NO_DOC_FILE\${ac_dB}NO_DOC_FILE\${ac_dC}1\${ac_dD}
-\${ac_uA}NO_DOC_FILE\${ac_uB}NO_DOC_FILE\${ac_uC}1\${ac_uD}
-\${ac_eA}NO_DOC_FILE\${ac_eB}NO_DOC_FILE\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${const_is_losing}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining CONST_IS_LOSING"
-echo "#define" CONST_IS_LOSING "1" >> confdefs.h
-DEFS="$DEFS -DCONST_IS_LOSING=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}CONST_IS_LOSING\${ac_dB}CONST_IS_LOSING\${ac_dC}1\${ac_dD}
-\${ac_uA}CONST_IS_LOSING\${ac_uB}CONST_IS_LOSING\${ac_uC}1\${ac_uD}
-\${ac_eA}CONST_IS_LOSING\${ac_eB}CONST_IS_LOSING\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${use_assertions}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining USE_ASSERTIONS"
-echo "#define" USE_ASSERTIONS "1" >> confdefs.h
-DEFS="$DEFS -DUSE_ASSERTIONS=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}USE_ASSERTIONS\${ac_dB}USE_ASSERTIONS\${ac_dC}1\${ac_dD}
-\${ac_uA}USE_ASSERTIONS\${ac_uB}USE_ASSERTIONS\${ac_uC}1\${ac_uD}
-\${ac_eA}USE_ASSERTIONS\${ac_eB}USE_ASSERTIONS\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${debug}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining DEBUG_XEMACS"
-echo "#define" DEBUG_XEMACS "1" >> confdefs.h
-DEFS="$DEFS -DDEBUG_XEMACS=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}DEBUG_XEMACS\${ac_dB}DEBUG_XEMACS\${ac_dC}1\${ac_dD}
-\${ac_uA}DEBUG_XEMACS\${ac_uB}DEBUG_XEMACS\${ac_uC}1\${ac_uD}
-\${ac_eA}DEBUG_XEMACS\${ac_eB}DEBUG_XEMACS\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${quantify}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining QUANTIFY"
-echo "#define" QUANTIFY "1" >> confdefs.h
-DEFS="$DEFS -DQUANTIFY=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}QUANTIFY\${ac_dB}QUANTIFY\${ac_dC}1\${ac_dD}
-\${ac_uA}QUANTIFY\${ac_uB}QUANTIFY\${ac_uC}1\${ac_uD}
-\${ac_eA}QUANTIFY\${ac_eB}QUANTIFY\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${memory_usage_stats}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining MEMORY_USAGE_STATS"
-echo "#define" MEMORY_USAGE_STATS "1" >> confdefs.h
-DEFS="$DEFS -DMEMORY_USAGE_STATS=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}MEMORY_USAGE_STATS\${ac_dB}MEMORY_USAGE_STATS\${ac_dC}1\${ac_dD}
-\${ac_uA}MEMORY_USAGE_STATS\${ac_uB}MEMORY_USAGE_STATS\${ac_uC}1\${ac_uD}
-\${ac_eA}MEMORY_USAGE_STATS\${ac_eB}MEMORY_USAGE_STATS\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_pop}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining MAIL_USE_POP"
-echo "#define" MAIL_USE_POP "1" >> confdefs.h
-DEFS="$DEFS -DMAIL_USE_POP=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}MAIL_USE_POP\${ac_dB}MAIL_USE_POP\${ac_dC}1\${ac_dD}
-\${ac_uA}MAIL_USE_POP\${ac_uB}MAIL_USE_POP\${ac_uC}1\${ac_uD}
-\${ac_eA}MAIL_USE_POP\${ac_eB}MAIL_USE_POP\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_kerberos}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining KERBEROS"
-echo "#define" KERBEROS "1" >> confdefs.h
-DEFS="$DEFS -DKERBEROS=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}KERBEROS\${ac_dB}KERBEROS\${ac_dC}1\${ac_dD}
-\${ac_uA}KERBEROS\${ac_uB}KERBEROS\${ac_uC}1\${ac_uD}
-\${ac_eA}KERBEROS\${ac_eB}KERBEROS\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_hesiod}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining HESIOD"
-echo "#define" HESIOD "1" >> confdefs.h
-DEFS="$DEFS -DHESIOD=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HESIOD\${ac_dB}HESIOD\${ac_dC}1\${ac_dD}
-\${ac_uA}HESIOD\${ac_uB}HESIOD\${ac_uC}1\${ac_uD}
-\${ac_eA}HESIOD\${ac_eB}HESIOD\${ac_eC}1\${ac_eD}
-"
-}
-
-
-test "${error_check_extents}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining ERROR_CHECK_EXTENTS"
-echo "#define" ERROR_CHECK_EXTENTS "1" >> confdefs.h
-DEFS="$DEFS -DERROR_CHECK_EXTENTS=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}ERROR_CHECK_EXTENTS\${ac_dB}ERROR_CHECK_EXTENTS\${ac_dC}1\${ac_dD}
-\${ac_uA}ERROR_CHECK_EXTENTS\${ac_uB}ERROR_CHECK_EXTENTS\${ac_uC}1\${ac_uD}
-\${ac_eA}ERROR_CHECK_EXTENTS\${ac_eB}ERROR_CHECK_EXTENTS\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${error_check_typecheck}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining ERROR_CHECK_TYPECHECK"
-echo "#define" ERROR_CHECK_TYPECHECK "1" >> confdefs.h
-DEFS="$DEFS -DERROR_CHECK_TYPECHECK=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}ERROR_CHECK_TYPECHECK\${ac_dB}ERROR_CHECK_TYPECHECK\${ac_dC}1\${ac_dD}
-\${ac_uA}ERROR_CHECK_TYPECHECK\${ac_uB}ERROR_CHECK_TYPECHECK\${ac_uC}1\${ac_uD}
-\${ac_eA}ERROR_CHECK_TYPECHECK\${ac_eB}ERROR_CHECK_TYPECHECK\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${error_check_bufpos}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining ERROR_CHECK_BUFPOS"
-echo "#define" ERROR_CHECK_BUFPOS "1" >> confdefs.h
-DEFS="$DEFS -DERROR_CHECK_BUFPOS=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}ERROR_CHECK_BUFPOS\${ac_dB}ERROR_CHECK_BUFPOS\${ac_dC}1\${ac_dD}
-\${ac_uA}ERROR_CHECK_BUFPOS\${ac_uB}ERROR_CHECK_BUFPOS\${ac_uC}1\${ac_uD}
-\${ac_eA}ERROR_CHECK_BUFPOS\${ac_eB}ERROR_CHECK_BUFPOS\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${error_check_gc}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining ERROR_CHECK_GC"
-echo "#define" ERROR_CHECK_GC "1" >> confdefs.h
-DEFS="$DEFS -DERROR_CHECK_GC=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}ERROR_CHECK_GC\${ac_dB}ERROR_CHECK_GC\${ac_dC}1\${ac_dD}
-\${ac_uA}ERROR_CHECK_GC\${ac_uB}ERROR_CHECK_GC\${ac_uC}1\${ac_uD}
-\${ac_eA}ERROR_CHECK_GC\${ac_eB}ERROR_CHECK_GC\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${error_check_malloc}" = yes && 
-{
-test -n "$verbose" && \
-echo "	defining ERROR_CHECK_MALLOC"
-echo "#define" ERROR_CHECK_MALLOC "1" >> confdefs.h
-DEFS="$DEFS -DERROR_CHECK_MALLOC=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}ERROR_CHECK_MALLOC\${ac_dB}ERROR_CHECK_MALLOC\${ac_dC}1\${ac_dD}
-\${ac_uA}ERROR_CHECK_MALLOC\${ac_uB}ERROR_CHECK_MALLOC\${ac_uC}1\${ac_uD}
-\${ac_eA}ERROR_CHECK_MALLOC\${ac_eB}ERROR_CHECK_MALLOC\${ac_eC}1\${ac_eD}
-"
-}
-
-
-if test "${with_energize}" = yes; then
+  if test "$with_database_berkdb" = "yes"; then
+    { test "$extra_verbose" = "yes" && cat << EOF
+    Defining DB_H_PATH = "$db_h_path"
+EOF
+cat >> confdefs.h <<EOF
+#define DB_H_PATH "$db_h_path"
+EOF
+}
+
+    { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_BERKELEY_DB
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_BERKELEY_DB 1
+EOF
+}
+
+    test "$need_libdb" = "yes" && LIBS="$LIBS -ldb"
+  else with_database_berkdb=no
+  fi
+fi
+
+if test "$with_database_gnudbm" = "yes" -o \
+        "$with_database_dbm"    = "yes" -o \
+        "$with_database_berkdb" = "yes"; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_DATABASE
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_DATABASE 1
+EOF
+}
+
+  extra_objs="$extra_objs database.o"
+fi
+
+if test "$with_socks" = "yes"; then
+  
+echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
+echo "configure:8761: checking for SOCKSinit in -lsocks" >&5
+ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lsocks "
+cat > conftest.$ac_ext <<EOF
+#line 8766 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char SOCKSinit();
+
+int main() {
+SOCKSinit()
+; return 0; }
+EOF
+if { (eval echo configure:8777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo socks | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_lib
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+}
+
+  LIBS="-lsocks $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+  test -n "$ac_cv_lib_socks_SOCKSinit" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_SOCKS
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_SOCKS 1
+EOF
+}
+
+fi
+
+if test "$usage_tracking" = "yes"; then
+  { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining USAGE_TRACKING
+EOF
+cat >> confdefs.h <<\EOF
+#define USAGE_TRACKING 1
+EOF
+}
+
+  LIBS="$LIBS -Bstatic -lut -Bdynamic"
+fi
+
+
+if   test "$dynamic" = "no"; then add_runtime_path=no
+elif test -n "$LD_RUN_PATH"; then add_runtime_path=yes
+else case "$canonical" in
+       *-solaris2.* | *-sgi-irix* ) add_runtime_path=yes ;;
+       * ) add_runtime_path=no ;;
+     esac
+fi
+
+if test "$add_runtime_path" = "yes"; then
+      echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
+echo "configure:8841: checking "for runtime libraries flag"" >&5
+  dash_r=""
+  for try_dash_r in "-R" "-R " "-rpath "; do
+    xe_check_libs="${try_dash_r}/no/such/file-or-directory"
+    cat > conftest.$ac_ext <<EOF
+#line 8846 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:8853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  dash_r="$try_dash_r"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    xe_check_libs=""
+    test -n "$dash_r" && break
+  done
+  if test -n "$dash_r";
+    then echo "$ac_t"""\"${dash_r}\""" 1>&6
+    else echo "$ac_t""NONE" 1>&6
+  fi
+fi
+
+if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
+    ld_switch_site="`echo $ld_switch_site     | sed \"s/${dash_r}[^ ]*//\"`"
+  ld_switch_x_site="`echo $ld_switch_x_site | sed \"s/${dash_r}[^ ]*//\"`"
   
-{
-test -n "$verbose" && \
-echo "	defining ENERGIZE"
-echo "#define" ENERGIZE "1" >> confdefs.h
-DEFS="$DEFS -DENERGIZE=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}ENERGIZE\${ac_dB}ENERGIZE\${ac_dC}1\${ac_dD}
-\${ac_uA}ENERGIZE\${ac_uB}ENERGIZE\${ac_uC}1\${ac_uD}
-\${ac_eA}ENERGIZE\${ac_eB}ENERGIZE\${ac_eC}1\${ac_eD}
-"
-}
-
-  test "${energize_version}" = "2.X" && 
-{
-test -n "$verbose" && \
-echo "	defining ENERGIZE_2"
-echo "#define" ENERGIZE_2 "1" >> confdefs.h
-DEFS="$DEFS -DENERGIZE_2=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}ENERGIZE_2\${ac_dB}ENERGIZE_2\${ac_dC}1\${ac_dD}
-\${ac_uA}ENERGIZE_2\${ac_uB}ENERGIZE_2\${ac_uC}1\${ac_uD}
-\${ac_eA}ENERGIZE_2\${ac_eB}ENERGIZE_2\${ac_eC}1\${ac_eD}
-"
-}
-
-  test "${energize_version}" = "3.X" && 
-{
-test -n "$verbose" && \
-echo "	defining ENERGIZE_3"
-echo "#define" ENERGIZE_3 "1" >> confdefs.h
-DEFS="$DEFS -DENERGIZE_3=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}ENERGIZE_3\${ac_dB}ENERGIZE_3\${ac_dC}1\${ac_dD}
-\${ac_uA}ENERGIZE_3\${ac_uB}ENERGIZE_3\${ac_uC}1\${ac_uD}
-\${ac_eA}ENERGIZE_3\${ac_eB}ENERGIZE_3\${ac_eC}1\${ac_eD}
-"
-}
-
-fi
-
-test "${with_sound}" = "native" -o "${with_sound}" = "both" && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_NATIVE_SOUND"
-echo "#define" HAVE_NATIVE_SOUND "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_NATIVE_SOUND=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_NATIVE_SOUND\${ac_dB}HAVE_NATIVE_SOUND\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_NATIVE_SOUND\${ac_uB}HAVE_NATIVE_SOUND\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_NATIVE_SOUND\${ac_eB}HAVE_NATIVE_SOUND\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${with_sound}" = "nas"    -o "${with_sound}" = "both" && 
-{
-test -n "$verbose" && \
-echo "	defining HAVE_NAS_SOUND"
-echo "#define" HAVE_NAS_SOUND "1" >> confdefs.h
-DEFS="$DEFS -DHAVE_NAS_SOUND=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}HAVE_NAS_SOUND\${ac_dB}HAVE_NAS_SOUND\${ac_dC}1\${ac_dD}
-\${ac_uA}HAVE_NAS_SOUND\${ac_uB}HAVE_NAS_SOUND\${ac_uC}1\${ac_uD}
-\${ac_eA}HAVE_NAS_SOUND\${ac_eB}HAVE_NAS_SOUND\${ac_eC}1\${ac_eD}
-"
-}
-
-test "${old_nas}"    = "true" && 
-{
-test -n "$verbose" && \
-echo "	defining NAS_NO_ERROR_JUMP"
-echo "#define" NAS_NO_ERROR_JUMP "1" >> confdefs.h
-DEFS="$DEFS -DNAS_NO_ERROR_JUMP=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}NAS_NO_ERROR_JUMP\${ac_dB}NAS_NO_ERROR_JUMP\${ac_dC}1\${ac_dD}
-\${ac_uA}NAS_NO_ERROR_JUMP\${ac_uB}NAS_NO_ERROR_JUMP\${ac_uC}1\${ac_uD}
-\${ac_eA}NAS_NO_ERROR_JUMP\${ac_eB}NAS_NO_ERROR_JUMP\${ac_eC}1\${ac_eD}
-"
-}
-
-
-test "${use_union_type}"    != yes && 
-{
-test -n "$verbose" && \
-echo "	defining NO_UNION_TYPE"
-echo "#define" NO_UNION_TYPE "1" >> confdefs.h
-DEFS="$DEFS -DNO_UNION_TYPE=1"
-ac_sed_defs="${ac_sed_defs}\${ac_dA}NO_UNION_TYPE\${ac_dB}NO_UNION_TYPE\${ac_dC}1\${ac_dD}
-\${ac_uA}NO_UNION_TYPE\${ac_uB}NO_UNION_TYPE\${ac_uC}1\${ac_uD}
-\${ac_eA}NO_UNION_TYPE\${ac_eB}NO_UNION_TYPE\${ac_eC}1\${ac_eD}
-"
+        if test -n "$LD_RUN_PATH"; then
+    runpath="$LD_RUN_PATH"
+  else
+        runpath=""
+    for arg in $ld_switch_site $ld_switch_x_site; do
+      case "$arg" in -L* )
+	dir=`echo $arg | sed 's/^-L//'`
+	if test -n "`ls ${dir}/*.so 2>/dev/null`"; then
+	  test -n "$runpath" && runpath="${runpath}:"
+	  runpath="${runpath}${dir}"
+        fi
+	;;
+      esac
+    done
+        case "$canonical" in  *-solaris2.* )
+      test "$have_motif" = "yes" && runpath="${runpath}:/opt/SUNWdt/lib" ;;
+    esac
+  fi
+
+  if test -n "$runpath"; then
+    ld_switch_site="$ld_switch_site ${dash_r}${runpath}"
+    test "$extra_verbose" = "yes" && echo "Setting runpath to $runpath"
+  fi
+fi
+
+c_switch_general="-DHAVE_CONFIG_H $c_switch_site $c_switch_machine $c_switch_system"
+c_switch_window_system="$c_switch_x_site $X_CFLAGS"
+c_switch_all="$c_switch_general $c_switch_window_system"
+ld_switch_general="$ld_switch_site $ld_switch_machine $ld_switch_system"
+ld_switch_window_system="$ld_switch_x_site"
+ld_switch_all="$ld_switch_general $ld_switch_window_system"
+ld_libs_general="$LIBS $libs_machine $libs_system $libs_standard"
+ld_libs_window_system="$X_PRE_LIBS $libs_x $X_EXTRA_LIBS"
+ld_libs_all="$ld_libs_window_system $ld_libs_general"
+
+internal_makefile_list="Makefile"
+SUBDIR_MAKEFILES=''
+for dir in $MAKE_SUBDIR; do
+  SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES $dir/Makefile"
+  internal_makefile_list="$internal_makefile_list $dir/Makefile.in"
+done
+
+
+
+if test "$extra_verbose" = "yes"; then
+  echo "" 
+  echo "extra_objs = $extra_objs"
+echo "c_switch_general = $c_switch_general"
+echo "c_switch_window_system = $c_switch_window_system"
+echo "c_switch_all = $c_switch_all"
+echo "ld_switch_general = $ld_switch_general"
+echo "ld_switch_window_system = $ld_switch_window_system"
+echo "ld_switch_all = $ld_switch_all"
+echo "ld_libs_general = $ld_libs_general"
+echo "ld_libs_window_system = $ld_libs_window_system"
+echo "ld_libs_all = $ld_libs_all"
+  echo ""
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining EMACS_VERSION = $version
+EOF
+cat >> confdefs.h <<EOF
+#define EMACS_VERSION $version
+EOF
+}
+
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining EMACS_CONFIGURATION = "$canonical"
+EOF
+cat >> confdefs.h <<EOF
+#define EMACS_CONFIGURATION "$canonical"
+EOF
+}
+
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining config_machfile = "$machfile"
+EOF
+cat >> confdefs.h <<EOF
+#define config_machfile "$machfile"
+EOF
+}
+
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining config_opsysfile = "$opsysfile"
+EOF
+cat >> confdefs.h <<EOF
+#define config_opsysfile "$opsysfile"
+EOF
+}
+
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining UNEXEC_SRC = $UNEXEC_SRC
+EOF
+cat >> confdefs.h <<EOF
+#define UNEXEC_SRC $UNEXEC_SRC
+EOF
+}
+
+
+
+null_string=""
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining LD_SWITCH_X_SITE = $null_string
+EOF
+cat >> confdefs.h <<EOF
+#define LD_SWITCH_X_SITE $null_string
+EOF
+}
+
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining LD_SWITCH_X_SITE_AUX = $null_string
+EOF
+cat >> confdefs.h <<EOF
+#define LD_SWITCH_X_SITE_AUX $null_string
+EOF
+}
+
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining C_SWITCH_X_SITE = $null_string
+EOF
+cat >> confdefs.h <<EOF
+#define C_SWITCH_X_SITE $null_string
+EOF
+}
+
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining LD_SWITCH_SITE = $null_string
+EOF
+cat >> confdefs.h <<EOF
+#define LD_SWITCH_SITE $null_string
+EOF
+}
+
+{ test "$extra_verbose" = "yes" && cat << EOF
+    Defining C_SWITCH_SITE = $null_string
+EOF
+cat >> confdefs.h <<EOF
+#define C_SWITCH_SITE $null_string
+EOF
+}
+
+
+
+test -n "$puresize" && { test "$extra_verbose" = "yes" && cat << EOF
+    Defining RAW_PURESIZE = $puresize
+EOF
+cat >> confdefs.h <<EOF
+#define RAW_PURESIZE $puresize
+EOF
+}
+
+
+if   test "$GNU_MALLOC"        = "yes"; then { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining GNU_MALLOC
+EOF
+cat >> confdefs.h <<\EOF
+#define GNU_MALLOC 1
+EOF
+}
+
+elif test "$use_system_malloc" = "yes"; then { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining USE_SYSTEM_MALLOC
+EOF
+cat >> confdefs.h <<\EOF
+#define USE_SYSTEM_MALLOC 1
+EOF
+}
+
+fi
+test "$with_motif"         = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining LWLIB_USES_MOTIF
+EOF
+cat >> confdefs.h <<\EOF
+#define LWLIB_USES_MOTIF 1
+EOF
+}
+
+test "$with_i18n3"         = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining I18N3
+EOF
+cat >> confdefs.h <<\EOF
+#define I18N3 1
+EOF
+}
+
+test "$with_mocklisp"      = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining MOCKLISP_SUPPORT
+EOF
+cat >> confdefs.h <<\EOF
+#define MOCKLISP_SUPPORT 1
+EOF
+}
+
+test "$with_gcc"           = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining USE_GCC
+EOF
+cat >> confdefs.h <<\EOF
+#define USE_GCC 1
+EOF
+}
+
+test "$with_term"          = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HAVE_TERM
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_TERM 1
+EOF
+}
+
+test "$external_widget"    = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining EXTERNAL_WIDGET
+EOF
+cat >> confdefs.h <<\EOF
+#define EXTERNAL_WIDGET 1
+EOF
+}
+
+test "$with_gnu_make"      = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining USE_GNU_MAKE
+EOF
+cat >> confdefs.h <<\EOF
+#define USE_GNU_MAKE 1
+EOF
+}
+
+test "$no_doc_file"        = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining NO_DOC_FILE
+EOF
+cat >> confdefs.h <<\EOF
+#define NO_DOC_FILE 1
+EOF
+}
+
+test "$const_is_losing"    = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining CONST_IS_LOSING
+EOF
+cat >> confdefs.h <<\EOF
+#define CONST_IS_LOSING 1
+EOF
+}
+
+test "$use_assertions"     = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining USE_ASSERTIONS
+EOF
+cat >> confdefs.h <<\EOF
+#define USE_ASSERTIONS 1
+EOF
+}
+
+test "$debug"              = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining DEBUG_XEMACS
+EOF
+cat >> confdefs.h <<\EOF
+#define DEBUG_XEMACS 1
+EOF
+}
+
+test "$with_quantify"      = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining QUANTIFY
+EOF
+cat >> confdefs.h <<\EOF
+#define QUANTIFY 1
+EOF
+}
+
+test "$memory_usage_stats" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining MEMORY_USAGE_STATS
+EOF
+cat >> confdefs.h <<\EOF
+#define MEMORY_USAGE_STATS 1
+EOF
+}
+
+test "$with_pop"           = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining MAIL_USE_POP
+EOF
+cat >> confdefs.h <<\EOF
+#define MAIL_USE_POP 1
+EOF
+}
+
+test "$with_kerberos"      = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining KERBEROS
+EOF
+cat >> confdefs.h <<\EOF
+#define KERBEROS 1
+EOF
+}
+
+test "$with_hesiod"        = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining HESIOD
+EOF
+cat >> confdefs.h <<\EOF
+#define HESIOD 1
+EOF
+}
+
+
+test "$error_check_extents"   = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining ERROR_CHECK_EXTENTS
+EOF
+cat >> confdefs.h <<\EOF
+#define ERROR_CHECK_EXTENTS 1
+EOF
+}
+
+test "$error_check_typecheck" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining ERROR_CHECK_TYPECHECK
+EOF
+cat >> confdefs.h <<\EOF
+#define ERROR_CHECK_TYPECHECK 1
+EOF
+}
+
+test "$error_check_bufpos"    = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining ERROR_CHECK_BUFPOS
+EOF
+cat >> confdefs.h <<\EOF
+#define ERROR_CHECK_BUFPOS 1
+EOF
+}
+
+test "$error_check_gc"        = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining ERROR_CHECK_GC
+EOF
+cat >> confdefs.h <<\EOF
+#define ERROR_CHECK_GC 1
+EOF
+}
+
+test "$error_check_malloc"    = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining ERROR_CHECK_MALLOC
+EOF
+cat >> confdefs.h <<\EOF
+#define ERROR_CHECK_MALLOC 1
+EOF
+}
+
+
+test "$use_union_type" != yes && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining NO_UNION_TYPE
+EOF
+cat >> confdefs.h <<\EOF
+#define NO_UNION_TYPE 1
+EOF
 }
 
 
 
 (
-if test -f /etc/osversion; then
-	# SONY NEWS-OS
-	echo "osversion: `cat /etc/osversion`"
-eles
-	echo "uname -a: `uname -a`" 
-fi
-echo "" 
-echo "$0 $quoted_arguments" 
+if test -f /etc/osversion; then   echo "osversion: `cat /etc/osversion`"
+else
+  echo "uname -a: `uname -a`"
+fi
+echo ""
+echo "$0 $quoted_arguments"
 ) >> Installation
-# Start stdout redirection to '| tee -a Installation'
+
 (
 echo "
 
-Configured for \`${canonical}'.
-
-  Where should the build process find the source code?    ${srcdir}
-  What installation prefix should install use?		  ${prefix}
+Configured for \`$canonical'.
+
+  Where should the build process find the source code?    $srcdir
+  What installation prefix should install use?		  $prefix
   What operating system and machine description files should XEmacs use?
-        \`${opsysfile}' and \`${machfile}'
-  What compiler should XEmacs be built with?              ${CC} ${CFLAGS}
+        \`$opsysfile' and \`$machfile'
+  What compiler should XEmacs be built with?              $CC $CFLAGS
   Should XEmacs use the GNU version of malloc?            ${GNU_MALLOC}${GNU_MALLOC_reason}
-  Should XEmacs use the relocating allocator for buffers? ${rel_alloc}
-  What window system should XEmacs use?                   ${window_system}${x_includes+
-  Where do we find X Windows header files?                }${x_includes}${x_libraries+
-  Where do we find X Windows libraries?                   }${x_libraries}"
-
+  Should XEmacs use the relocating allocator for buffers? $rel_alloc
+  What window system should XEmacs use?                   ${window_system}"
+if test "$with_x11" = "yes"; then
+  echo "  Where do we find X Windows header files?                $x_includes"
+  echo "  Where do we find X Windows libraries?                   $x_libraries"
+fi
 if test -n "$site_includes"; then
-  echo "  Additional header files:                                ${site_includes}"
-fi
-
-if test -n "$site_libraries" -a -n "$site_runtime_libraries"; then
-  echo "  Additional libraries:                                   ${site_libraries} ${site_runtime_libraries}"
-elif test -n "$site_libraries"; then
-  echo "  Additional libraries:                                   ${site_libraries}"
-elif test -n "$site_runtime_libraries"; then
-  echo "  Additional libraries:                                   ${site_runtime_libraries}"
+  echo "  Additional header files:                                $site_includes"
+fi
+if test -n "$site_libraries"; then
+  echo "  Additional libraries:                                   $site_libraries"
+fi
+if test -n "$runpath"; then
+  echo "  Runtime library search path:                            $runpath"
 fi
 test "$with_dnet"  = yes && echo "  Compiling in support for DNET."
 test "$with_socks" = yes && echo "  Compiling in support for SOCKS."
 test "$with_term"  = yes && echo "  Compiling in support for TERM."
 test "$with_xauth" = yes && echo "  Compiling in support for XAUTH."
-test "$with_xpm"   = yes && echo "  Compiling in support for XPM."
-if test "$with_xmu" != yes -a "$window_system" != none; then
+if test "$with_xmu" != yes -a "$with_x11" = yes; then
   echo "  No Xmu; substituting equivalent routines."
 fi
-test "$with_xface" = yes && echo "  Compiling in support for X-Face headers."
+
 test "$with_gif"   = yes && echo "  Compiling in support for GIF image conversion."
+test "$with_xpm"   = yes && echo "  Compiling in support for XPM images."
+test "$with_xface" = yes && echo "  Compiling in support for X-Face message headers."
 test "$with_jpeg"  = yes && echo "  Compiling in support for JPEG image conversion."
-if test "$with_png"   = yes -o "$with_png" = gnuz; then
-  echo "  Compiling in support for PNG image conversion."
-fi
-if test "$with_png" = gnuz; then
-  echo "  (Using -lgz instead of -lz.)"
-fi
+test "$with_png"   = yes && echo "  Compiling in support for PNG image conversion."
 test "$with_tiff"  = yes && echo "  Compiling in support for TIFF image conversion (not implemented)."
 
-test "$with_sound" = nas    && echo "  Compiling in network sound support."
-test "$with_sound" = native && echo "  Compiling in native sound support."
-test "$with_sound" = both   && echo "  Compiling in both network and native sound support."
-test "$old_nas"    = true   && echo "        nas library lacks error trapping, will play synchronously"
+case "$with_sound" in
+  nas    ) echo "  Compiling in network sound (NAS) support." ;;
+  native ) echo "  Compiling in native sound support." ;;
+  both   ) echo "  Compiling in both network and native sound support." ;;
+esac
+test "$old_nas" = yes && echo "        nas library lacks error trapping, will play synchronously"
 
 test "$with_database_berkdb" = yes && echo "  Compiling in support for Berkeley DB."
 test "$with_database_dbm"    = yes && echo "  Compiling in support for DBM."
 test "$with_database_gnudbm" = yes && echo "  Compiling in support for GNU DBM."
 
-test "$have_ncurses"  = yes && echo "  Compiling in support for ncurses."
-test "$with_socks"    = yes && echo "  Compiling in support for SOCKS."
+test "$with_ncurses"  = yes && echo "  Compiling in support for ncurses."
+test "$with_gpm"      = yes && echo "  Compiling in support for GPM (General Purpose Mouse)."
 
 test "$with_mule"     = yes && echo "  Compiling in Mule (multi-lingual) support."
 test "$with_xim"      != no && echo "  Compiling in XIM (X11R5+ I18N input method) support."
@@ -7196,8 +9341,6 @@
 if test "$with_wnn" = yes; then
   echo "  Compiling in support for the WNN input method on Mule."
   test "$with_wnn6" = yes && echo "    WNN support for version 6."
-  echo "    Finding WNN includes with:                          ${wnn_includes}"
-  echo "    Finding WNN libs with:                              ${wnn_libraries}"
 fi
 test "$with_i18n3"    = yes && echo "  Compiling in I18N support, level 3 (doesn't currently work)."
 
@@ -7205,30 +9348,34 @@
 test "$with_tooltalk" = yes && echo "  Compiling in support for ToolTalk."
 test "$with_offix"    = yes && echo "  Compiling in support for OffiX."
 test "$with_mocklisp" = yes && echo "  Compiling in support for Mocklisp."
-test "$with_sparcworks" = yes && echo "  Compiling in support for SparcWorks."
+test "$with_workshop" = yes && echo "  Compiling in support for Sun WorkShop."
 test "$with_energize" = yes && echo "  Compiling in support for Lucid Energize (doesn't currently work)."
-test "$with_menubars" = "lucid" && echo "  Using the Lucid menubar."
-if test "$with_menubars" = "motif"; then
-  echo "  Using the Motif menubar."
-  echo " *WARNING*  The Motif menubar is currently buggy.  We recommend"
-  echo "            that you use the Lucid menubar instead.  Re-run"
-  echo "            configure with --with-menubars='lucid'."
-fi
-test "$with_scrollbars" = lucid  && echo "  Using the Lucid scrollbar."
-test "$with_scrollbars" = motif  && echo "  Using the Motif scrollbar."
-test "$with_scrollbars" = athena && echo "  Using the Athena scrollbar."
-test "$with_scrollbars" = athena3d && echo "  Using the Athena-3d scrollbar."
-test "$with_dialogs"    = motif  && echo "  Using the Motif dialog boxes."
-test "$with_dialogs"    = athena && echo "  Using the Athena dialog boxes."
-test "$with_dialogs"    = athena3d && echo "  Using the Athena-3d dialog boxes."
+case  "$with_menubars" in
+  lucid ) echo "  Using the Lucid menubar." ;;
+  motif ) echo "  Using the Motif menubar."
+          echo "  *WARNING*  The Motif menubar is currently buggy."
+          echo "             We recommend using the Lucid menubar instead."
+          echo "             Re-run configure with --with-menubars='lucid'." ;;
+esac
+case "$with_scrollbars" in
+  lucid    ) echo "  Using the Lucid scrollbar."     ;;
+  motif    ) echo "  Using the Motif scrollbar."     ;;
+  athena   ) echo "  Using the Athena scrollbar."    ;;
+  athena3d ) echo "  Using the Athena-3d scrollbar." ;;
+esac
+case "$with_dialogs" in
+  motif    ) echo "  Using the Motif dialog boxes."     ;;
+  athena   ) echo "  Using the Athena dialog boxes."    ;;
+  athena3d ) echo "  Using the Athena-3d dialog boxes." ;;
+esac
 test "$with_pop"	= yes && echo "  Using POP for mail access"
 test "$with_kerberos"	= yes && echo "  Using Kerberos for POP authentication"
 test "$with_hesiod"	= yes && echo "  Using Hesiod to get POP server host"
 
-test "${use_union_type}"     = yes && echo "  Using the union type for Lisp_Objects."
-test "${debug}"              = yes && echo "  Compiling in extra code for debugging."
-test "${memory_usage_stats}" = yes && echo "  Compiling in code for checking XEmacs memory usage."
-test "$usage_tracking"       = yes && echo "  Compiling with usage tracking active (Sun internal)."
+test "$use_union_type"     = yes && echo "  Using the union type for Lisp_Objects."
+test "$debug"              = yes && echo "  Compiling in extra code for debugging."
+test "$memory_usage_stats" = yes && echo "  Compiling in code for checking XEmacs memory usage."
+test "$usage_tracking"     = yes && echo "  Compiling with usage tracking active (Sun internal)."
 echo ""
 ) | tee -a Installation
 echo 'The above configure report is appended to "Installation" file.'
@@ -7237,24 +9384,19 @@
 
 
 # Remove any trailing slashes in these variables.
-test -n "${prefix}" &&
-  prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'`
-test -n "${exec_prefix}" &&
-  exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`
-
-
-# The preferred way to propogate these variables is regular @ substitutions.
-if test -n "$prefix"; then
-  ac_prsub="s%^prefix\\([ 	]*\\)=\\([ 	]*\\).*$%prefix\\1=\\2$prefix%"
-else
-  prefix=/usr/local
-fi
-if test -n "$exec_prefix"; then
-  ac_prsub="$ac_prsub
-s%^exec_prefix\\([ 	]*\\)=\\([ 	]*\\).*$%exec_prefix\\1=\\2$exec_prefix%"
-else
-  exec_prefix='${prefix}' # Let make expand it.
-fi
+test -n "$prefix" &&
+  prefix=`echo "$prefix" | sed 's,\([^/]\)/*$,\1,'`
+test -n "$exec_prefix" &&
+  exec_prefix=`echo "$exec_prefix" | sed 's,\([^/]\)/*$,\1,'`
+
+
+trap '' 1 2 15
+
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# 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.
@@ -7263,36 +9405,36 @@
   ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
 fi
 
-# Quote sed substitution magic chars in DEFS.
-cat >conftest.def <<EOF
-$DEFS
-EOF
-ac_escape_ampersand_and_backslash='s%[&\\]%\\&%g'
-DEFS=`sed "$ac_escape_ampersand_and_backslash" <conftest.def`
-rm -f conftest.def
-# Substitute for predefined variables.
-
-trap 'rm -f config.status; exit 1' 1 2 15
-echo creating config.status
-rm -f config.status
-cat > config.status <<EOF
-#!/bin/sh
+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}
+
+echo creating $CONFIG_STATUS
+rm -f $CONFIG_STATUS
+cat > $CONFIG_STATUS <<EOF
+#! /bin/sh
 # Generated automatically by configure.
 # 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 $quoted_arguments
-
-ac_cs_usage="Usage: config.status [--recheck] [--version] [--help]"
+# $0 $ac_configure_args
+#
+# Compiler output produced by configure, useful for debugging
+# configure, is in ./config.log if it exists.
+
+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
 for ac_option
 do
   case "\$ac_option" in
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo running \${CONFIG_SHELL-/bin/sh} $0 $quoted_arguments --no-create
-    exec \${CONFIG_SHELL-/bin/sh} $0 $quoted_arguments --no-create ;;
+    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 1.11"
+    echo "$CONFIG_STATUS generated by autoconf version 2.12"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -7300,122 +9442,59 @@
   esac
 done
 
-trap 'rm -fr $internal_makefile_list src/config.h conftest*; exit 1' 1 2 15
-LN_S='$LN_S'
-CC='$CC'
-CPP='$CPP'
-RANLIB='$RANLIB'
-INSTALL='$INSTALL'
-INSTALL_PROGRAM='$INSTALL_PROGRAM'
-INSTALL_DATA='$INSTALL_DATA'
-YACC='$YACC'
-SET_MAKE='$SET_MAKE'
-ALLOCA='$ALLOCA'
-version='$version'
-configuration='$configuration'
-canonical='$canonical'
-srcdir='$srcdir'
-prefix='$prefix'
-exec_prefix='$exec_prefix'
-bindir='$bindir'
-datadir='$datadir'
-statedir='$statedir'
-libdir='$libdir'
-mandir='$mandir'
-infodir='$infodir'
-infodir_user_defined='$infodir_user_defined'
-lispdir='$lispdir'
-lispdir_user_defined='$lispdir_user_defined'
-sitelispdir='$sitelispdir'
-etcdir='$etcdir'
-etcdir_user_defined='$etcdir_user_defined'
-lockdir='$lockdir'
-lockdir_user_defined='$lockdir_user_defined'
-archlibdir='$archlibdir'
-archlibdir_user_defined='$archlibdir_user_defined'
-docdir='$docdir'
-bitmapdir='$bitmapdir'
-c_switch_system='$c_switch_system'
-c_switch_machine='$c_switch_machine'
-libsrc_libs='$libsrc_libs'
-LD_SWITCH_X_SITE='$LD_SWITCH_X_SITE'
-LD_SWITCH_X_SITE_AUX='$LD_SWITCH_X_SITE_AUX'
-C_SWITCH_X_SITE='$C_SWITCH_X_SITE'
-LD_SWITCH_SITE='$LD_SWITCH_SITE'
-C_SWITCH_SITE='$C_SWITCH_SITE'
-CFLAGS='$CFLAGS'
-native_sound_lib='$native_sound_lib'
-machfile='$machfile'
-opsysfile='$opsysfile'
-dynodump_arch='$dynodump_arch'
-internal_makefile_list='$internal_makefile_list'
-LIBS='$LIBS'
-top_srcdir='$top_srcdir'
-ac_prsub='$ac_prsub'
-ac_vpsub='$ac_vpsub'
-extrasub='$extrasub'
-EOF
-cat >> config.status <<\EOF
-
 ac_given_srcdir=$srcdir
-
-CONFIG_FILES=${CONFIG_FILES-"$internal_makefile_list"}
-for ac_file in .. ${CONFIG_FILES}; do if test "x$ac_file" != x..; then
-  # 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="/$ac_dir"
-  else
-    ac_dir_suffix=
-  fi
-
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dir_suffix"; 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" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  comment_str="Generated automatically from `echo $ac_file|sed 's|.*/||'`.in by configure."
-  case "$ac_file" in
-    *.c | *.h | *.C | *.cc | *.m )  echo "/* $comment_str */" > "$ac_file" ;;
-    * )          echo "# $comment_str"     > "$ac_file" ;;
-  esac
-  sed -e "
-$ac_prsub
+ac_given_INSTALL="$INSTALL"
+
+trap 'rm -fr `echo "$internal_makefile_list src/config.h lwlib/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%@CFLAGS@%$CFLAGS%g
+s%@CPPFLAGS@%$CPPFLAGS%g
+s%@CXXFLAGS@%$CXXFLAGS%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%@LN_S@%$LN_S%g
 s%@CC@%$CC%g
 s%@CPP@%$CPP%g
 s%@RANLIB@%$RANLIB%g
-s%@INSTALL@%$INSTALL%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@YACC@%$YACC%g
 s%@SET_MAKE@%$SET_MAKE%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%@ALLOCA@%$ALLOCA%g
+s%@MAKE_SUBDIR@%$MAKE_SUBDIR%g
+s%@SUBDIR_MAKEFILES@%$SUBDIR_MAKEFILES%g
 s%@version@%$version%g
 s%@configuration@%$configuration%g
 s%@canonical@%$canonical%g
 s%@srcdir@%$srcdir%g
-s%@prefix@%$prefix%g
-s%@exec_prefix@%$exec_prefix%g
-s%@bindir@%$bindir%g
-s%@datadir@%$datadir%g
 s%@statedir@%$statedir%g
-s%@libdir@%$libdir%g
-s%@mandir@%$mandir%g
-s%@infodir@%$infodir%g
 s%@infodir_user_defined@%$infodir_user_defined%g
 s%@lispdir@%$lispdir%g
 s%@lispdir_user_defined@%$lispdir_user_defined%g
@@ -7428,300 +9507,278 @@
 s%@archlibdir_user_defined@%$archlibdir_user_defined%g
 s%@docdir@%$docdir%g
 s%@bitmapdir@%$bitmapdir%g
-s%@c_switch_system@%$c_switch_system%g
-s%@c_switch_machine@%$c_switch_machine%g
-s%@libsrc_libs@%$libsrc_libs%g
-s%@LD_SWITCH_X_SITE@%$LD_SWITCH_X_SITE%g
-s%@LD_SWITCH_X_SITE_AUX@%$LD_SWITCH_X_SITE_AUX%g
-s%@C_SWITCH_X_SITE@%$C_SWITCH_X_SITE%g
-s%@LD_SWITCH_SITE@%$LD_SWITCH_SITE%g
-s%@C_SWITCH_SITE@%$C_SWITCH_SITE%g
-s%@CFLAGS@%$CFLAGS%g
-s%@native_sound_lib@%$native_sound_lib%g
+s%@extra_objs@%$extra_objs%g
 s%@machfile@%$machfile%g
 s%@opsysfile@%$opsysfile%g
+s%@c_switch_general@%$c_switch_general%g
+s%@c_switch_window_system@%$c_switch_window_system%g
+s%@c_switch_all@%$c_switch_all%g
+s%@ld_switch_general@%$ld_switch_general%g
+s%@ld_switch_window_system@%$ld_switch_window_system%g
+s%@ld_switch_all@%$ld_switch_all%g
+s%@ld_libs_general@%$ld_libs_general%g
+s%@ld_libs_window_system@%$ld_libs_window_system%g
+s%@ld_libs_all@%$ld_libs_all%g
+s%@libsrc_libs@%$libsrc_libs%g
+s%@native_sound_lib@%$native_sound_lib%g
+s%@sound_cflags@%$sound_cflags%g
 s%@dynodump_arch@%$dynodump_arch%g
 s%@internal_makefile_list@%$internal_makefile_list%g
-s%@LIBS@%$LIBS%g
+
+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
+  fi
+  if test ! -s conftest.s$ac_file; then
+    ac_more_lines=false
+    rm -f conftest.s$ac_file
+  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`
+  fi
+done
+if test -z "$ac_sed_cmds"; then
+  ac_sed_cmds=cat
+fi
+EOF
+
+cat >> $CONFIG_STATUS <<EOF
+
+CONFIG_FILES=\${CONFIG_FILES-"$internal_makefile_list"}
+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" ;;
+  esac
+
+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+
+  # 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=
+  fi
+
+  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" ;;
+  esac
+
+  case "$ac_given_INSTALL" in
+  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+  esac
+
+  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= ;;
+  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%@DEFS@%-DHAVE_CONFIG_H%" $ac_given_srcdir/${ac_file}.in >> $ac_file
+s%@INSTALL@%$INSTALL%g
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
 fi; done
-
-# These sed commands are put into ac_sed_defs when defining a macro.
-# They are broken into pieces to make the sed script easier to manage.
-# They 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.
-# Each defining turns into a single global substitution command.
-# Hopefully no one uses "!" as a variable value.
-# Other candidates for the sed separators, like , and @, do get used.
+rm -f conftest.s*
+
+# 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.
 #
 # ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s!^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
-ac_dB='\([ 	][ 	]*\)[^ 	]*!\1#\2'
+ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
+ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
 ac_dC='\3'
-ac_dD='!g'
+ac_dD='%g'
 # ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-ac_uA='s!^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_uB='\([ 	]\)!\1#\2define\3'
+ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
+ac_uB='\([ 	]\)%\1#\2define\3'
 ac_uC=' '
-ac_uD='\4!g'
+ac_uD='\4%g'
 # ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s!^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_eB='$!\1#\2define\3'
+ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
+ac_eB='$%\1#\2define\3'
 ac_eC=' '
-ac_eD='!g'
-rm -f conftest.sed
-EOF
-# Turn off quoting long enough to insert the sed commands.
-rm -f conftest.sh
-cat > conftest.sh <<EOF
-$ac_sed_defs
-EOF
-
-# Break up $ac_sed_defs (now in conftest.sh) because some shells have a limit
-# on the size of here documents.
-
-# Maximum number of lines to put in a single here document.
-ac_max_sh_lines=9
-
+ac_eD='%g'
+
+if test "${CONFIG_HEADERS+set}" != set; then
+EOF
+cat >> $CONFIG_STATUS <<EOF
+  CONFIG_HEADERS="src/config.h lwlib/config.h"
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+fi
+for ac_file in .. $CONFIG_HEADERS; 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" ;;
+  esac
+
+  echo creating $ac_file
+
+  rm -f conftest.frag conftest.in conftest.out
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+  cat $ac_file_inputs > conftest.in
+
+EOF
+
+# Transform confdefs.h into a sed script conftest.vals that substitutes
+# the proper values into config.h.in to produce config.h.  And first:
+# Protect against being on the right side of a sed subst in config.status.
+# Protect against being in an unquoted here document in config.status.
+rm -f conftest.vals
+cat > conftest.hdr <<\EOF
+s/[\\&%]/\\&/g
+s%[\\$`]%\\&%g
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
+s%ac_d%ac_u%gp
+s%ac_u%ac_e%gp
+EOF
+sed -n -f conftest.hdr confdefs.h > conftest.vals
+rm -f conftest.hdr
+
+# 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.
+
+rm -f conftest.tail
 while :
 do
-  # wc gives bogus results for an empty file on some AIX systems.
-  ac_lines=`grep -c . conftest.sh`
+  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
-  rm -f conftest.s1 conftest.s2
-  sed ${ac_max_sh_lines}q conftest.sh > conftest.s1 # Like head -9.
-  sed 1,${ac_max_sh_lines}d conftest.sh > conftest.s2 # Like tail +10.
-  # Write a limited-size here document to append to conftest.sed.
-  echo 'cat >> conftest.sed <<CONFEOF' >> config.status
-  cat conftest.s1 >> config.status
-  echo 'CONFEOF' >> config.status
-  rm -f conftest.s1 conftest.sh
-  mv conftest.s2 conftest.sh
+  # 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
+  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.sh
-
-# Now back to your regularly scheduled config.status.
-cat >> config.status <<\EOF
-# This sed command replaces #undef's 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 in
-# src/config.h.
-cat >> conftest.sed <<\CONFEOF
-s,^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-CONFEOF
-rm -f conftest.h
-# Break up the sed commands because old seds have small limits.
-ac_max_sed_lines=20
-
-CONFIG_HEADERS=${CONFIG_HEADERS-"src/config.h"}
-for ac_file in .. ${CONFIG_HEADERS}; do if test "x$ac_file" != x..; then
-  echo creating $ac_file
-
-  cp $ac_given_srcdir/$ac_file.in conftest.h1
-  cp conftest.sed conftest.stm
-  while :
-  do
-    ac_lines=`grep -c . conftest.stm`
-    if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-    rm -f conftest.s1 conftest.s2 conftest.h2
-    sed ${ac_max_sed_lines}q conftest.stm > conftest.s1 # Like head -20.
-    sed 1,${ac_max_sed_lines}d conftest.stm > conftest.s2 # Like tail +21.
-    sed -f conftest.s1 < conftest.h1 > conftest.h2
-    rm -f conftest.s1 conftest.h1 conftest.stm
-    mv conftest.h2 conftest.h1
-    mv conftest.s2 conftest.stm
-  done
-  rm -f conftest.stm conftest.h
+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.h1 >> conftest.h
-  rm -f conftest.h1
+  cat conftest.in >> conftest.h
+  rm -f conftest.in
   if cmp -s $ac_file conftest.h 2>/dev/null; then
-    # The file exists and we would not be changing it.
     echo "$ac_file is unchanged"
     rm -f conftest.h
   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"
+    fi
     rm -f $ac_file
     mv conftest.h $ac_file
   fi
 fi; done
-rm -f conftest.sed
-
-
+
+EOF
+cat >> $CONFIG_STATUS <<EOF
+CPP="$CPP"
+ CPPFLAGS="$CPPFLAGS"
+ top_srcdir="$srcdir"
+ MAKE_SUBDIR="$MAKE_SUBDIR"
+
+EOF
+cat >> $CONFIG_STATUS <<\EOF
+
+for dir in $MAKE_SUBDIR; do
+  echo creating $dir/Makefile
+  ( set -e
+    cd $dir
+    rm -f junk.c
+    sed -e 's/^# Generated.*//' -e 's%/\*\*/#.*%%' < Makefile.in > junk.c;
+    $CPP -I. -I${top_srcdir}/src $CPPFLAGS junk.c > junk.cpp;
+    < junk.cpp				\
+      sed -e 's/^#.*//'			\
+	-e 's/^[ \f\t][ \f\t]*$//'	\
+	-e 's/^ /	/'		\
+	| sed -n -e '/^..*$/p'		\
+	> Makefile.new
+    chmod 444 Makefile.new
+    mv -f Makefile.new Makefile
+    rm -f junk.c junk.cpp
+  )
+  test "$?" != 0 && exit "$?" # For debugging
+done
 
 exit 0
 EOF
-chmod +x config.status
-# Some shells look in PATH for config.status without the "./".
-test -n "$no_create" || ${CONFIG_SHELL-/bin/sh} ./config.status
-
-# Build:
-# src/Makefile      from ${srcdir}/src/Makefile.in
-# lwlib/Makefile    from ${srcdir}/lwlib/Makefile.in
-# lib-src/Makefile  from ${srcdir}/lib-src/Makefile.in
-# dynodump/Makefile from ${srcdir}/dynodump/Makefile.in
-# and possibly
-# lwlib/energize/Makefile from ${srcdir}/lwlib/energize/Makefile.in.
-# This must be done after src/config.h is built, since we rely on that
-# file.  Only do the build if "config.status" is present, since its
-# non-presence indicates an error occured.
-status=$?
-if test ! -f ./config.status ; then
-   exit $status
-fi
-topsrcdir=${srcdir}
-  # We discard all lines in Makefile.in that start with `# Generated' or /**/#
-  # because some cpps get confused by them.
-  # Really we should preserve them somehow into Makefile,
-  # but that is beyond my level of shell programming.
-makefile_command='echo "creating src/Makefile";
-  topsrcdir='"${topsrcdir}"';
-( cd ./src;
-  rm -f junk.c;
-  sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
-  eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
-  < junk.cpp							'\
-'    sed -e '\''s/^#.*//'\''					'\
-'	-e '\''s/^[ \f\t][ \f\t]*$//'\''			'\
-'	-e '\''s/^ /	/'\'' 					'\
-'	| sed -n -e '\''/^..*$/p'\''				'\
-'	> Makefile.new;
-    chmod 444 Makefile.new;
-    mv -f Makefile.new Makefile;
-    rm -f junk.c junk.cpp;
-)'
-eval `echo $makefile_command`
-lwlib_makefile_command='echo "creating lwlib/Makefile";
-  topsrcdir='"${topsrcdir}"';
-( cd ./lwlib;
-  rm -f junk.c;
-  sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
-  eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
-  < junk.cpp							'\
-'    sed -e '\''s/^#.*//'\''					'\
-'	-e '\''s/^[ \f\t][ \f\t]*$//'\''			'\
-'	-e '\''s/^ /	/'\'' 					'\
-'	| sed -n -e '\''/^..*$/p'\''				'\
-'	> Makefile.new;
-    chmod 444 Makefile.new;
-    mv -f Makefile.new Makefile;
-    rm -f junk.c junk.cpp;
-)'
-eval `echo $lwlib_makefile_command`
-lib_src_makefile_command='echo "creating lib-src/Makefile";
-  topsrcdir='"${topsrcdir}"';
-( cd ./lib-src;
-  rm -f junk.c;
-  sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
-  eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
-  < junk.cpp							'\
-'    sed -e '\''s/^#.*//'\''					'\
-'	-e '\''s/^[ \f\t][ \f\t]*$//'\''			'\
-'	-e '\''s/^ /	/'\'' 					'\
-'	| sed -n -e '\''/^..*$/p'\''				'\
-'	> Makefile.new;
-    chmod 444 Makefile.new;
-    mv -f Makefile.new Makefile;
-    rm -f junk.c junk.cpp;
-)'
-eval `echo $lib_src_makefile_command`
-
-# Mule utilitity programs - currently disabled
-if test "${with_mule_util}" = "yes"; then
-lib_src_mule_makefile_command='echo "creating lib-src/mule/Makefile";
-  topsrcdir='"${topsrcdir}"';
-( cd ./lib-src/mule;
-  rm -f junk.c;
-  sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
-  eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
-  < junk.cpp							'\
-'    sed -e '\''s/^#.*//'\''					'\
-'	-e '\''s/^[ \f\t][ \f\t]*$//'\''			'\
-'	-e '\''s/^ /	/'\'' 					'\
-'	| sed -n -e '\''/^..*$/p'\''				'\
-'	> Makefile.new;
-    chmod 444 Makefile.new;
-    mv -f Makefile.new Makefile;
-    rm -f junk.c junk.cpp;
-)'
-eval `echo $lib_src_mule_makefile_command`
-fi # Mule
-
-dynodump_makefile_command='echo "creating dynodump/Makefile";
-  topsrcdir='"${topsrcdir}"';
-( cd ./dynodump;
-  rm -f junk.c;
-  sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
-  eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
-  < junk.cpp							'\
-'    sed -e '\''s/^#.*//'\''					'\
-'	-e '\''s/^[ \f\t][ \f\t]*$//'\''			'\
-'	-e '\''s/^ /	/'\'' 					'\
-'	| sed -n -e '\''/^..*$/p'\''				'\
-'	> Makefile.new;
-    chmod 444 Makefile.new;
-    mv -f Makefile.new Makefile;
-    rm -f junk.c junk.cpp;
-)'
-eval `echo $dynodump_makefile_command`
-if test "${with_energize}" = "yes" ; then
-energize_makefile_command='echo "creating lwlib/energize/Makefile";
-  topsrcdir='"${topsrcdir}"';
-( cd ./lwlib/energize;
-  rm -f junk.c;
-  sed -e '\''s/^# Generated.*//'\'' -e '\''s%/\*\*/#.*%%'\'' < Makefile.in > junk.c;
-  eval `echo ${CPP} -I. -I${topsrcdir}/src ${CPPFLAGS} junk.c \>junk.cpp`;
-  < junk.cpp							'\
-'    sed -e '\''s/^#.*//'\''					'\
-'	-e '\''s/^[ \f\t][ \f\t]*$//'\''			'\
-'	-e '\''s/^ /	/'\'' 					'\
-'	| sed -n -e '\''/^..*$/p'\''				'\
-'	> Makefile.new;
-    chmod 444 Makefile.new;
-    mv -f Makefile.new Makefile;
-    rm -f junk.c junk.cpp;
-)'
-eval `echo $energize_makefile_command`
-fi
-# AC-OUTPUT has created `config.status' already.  We need to add the
-# above commands to re-create `src/Makefile', `lwlib/Makefile',
-# `lib-src/Makefile', `dynodump/Makefile', and possibly
-# `lwlib/energize/Makefile', and we need to insert them before the final
-# "exit 0" which appears at the end of `config.status'.
-<config.status sed -e 's/^exit 0$//' >config.new
-echo $makefile_command >>config.new
-echo $lwlib_makefile_command >>config.new
-echo $lib_src_makefile_command >>config.new
-if test "${with_mule_util}" = "yes"; then
-  echo $lib_src_mule_makefile_command >>config.new
-fi
-echo $dynodump_makefile_command >>config.new
-echo $man_makefile_command >>config.new
-if test "${with_energize}" = "yes" ; then
-  echo $energize_makefile_command >>config.new
-fi
-echo exit 0 >>config.new
-mv -f config.new config.status
-chmod +x config.status
-# Don't let the fact that we just rewrote config.status make Makefile think
-# that it is now newer.  We have just rewritten all of the Makefiles as well.
-MFS="Makefile \
- src/Makefile      src/Makefile.in \
- lib-src/Makefile  lib-src/Makefile.in \
- dynodump/Makefile dynodump/Makefile.in \
- lwlib/Makefile    lwlib/Makefile.in"
-chmod a+w $MFS
-touch     $MFS
-chmod 444 $MFS
+chmod +x $CONFIG_STATUS
+rm -fr confdefs* $ac_clean_files
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+
 
 if test ! -f src/gdbinit && test -f $topsrcdir/src/gdbinit; then
-  echo creating src/gdbinit
-  echo source $topsrcdir/src/gdbinit > src/gdbinit
-fi
-
-exit 0
-
-
-# Local Variables:
-# eval: (modify-syntax-entry ?\" "\"")
-# End:
+  echo "creating src/gdbinit"
+  echo "source $topsrcdir/src/gdbinit" > src/gdbinit
+fi
+
+if test "$sunpro_c" = "yes"; then   cat < EOF > .sbinit
+# For use with Sun WorkShop's Source browser.
+# See sbquery(1) and sbinit(4) for more information
+import src
+import lwlib
+import lib-src
+import dynodump
+EOF
+fi