Regenerated.

author: Andreas Schwab 2001-10-19 12:33:10 +0000
committer: Andreas Schwab 2001-10-19 12:33:10 +0000
commit: 503d2be044b52f0e792dd51e3a31fed5c87447f1 (patch)
tree: fc3a2ebdcba3c47dd58b0ec6054de28a507dc9ea
parent: 96ac8fc97108b142159de3a8432a7a0b2d66d140 (diff)
download: emacs-503d2be044b52f0e792dd51e3a31fed5c87447f1.tar.gz
emacs-503d2be044b52f0e792dd51e3a31fed5c87447f1.zip
1 files changed, 8181 insertions, 4613 deletions
diff --git a/configure b/configure
index 2cd1a40949e..0cc12f936ce 100755
--- a/configure
+++ b/configure
@@ -1,57 +1,155 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
+# Generated by Autoconf 2.52.
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-# Defaults:
+# Avoid depending upon Character Ranges.
-ac_help=
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+as_executable_p="test -f"
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS="   $as_nl"
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+exec 6>&1
+#
+# Initializations.
+#
 ac_default_prefix=/usr/local
-# Any additions from configure.in:
+cross_compiling=no
-ac_help="$ac_help
+subdirs=
-  --without-gcc           don't use GCC to compile Emacs if GCC is found"
+MFLAGS= MAKEFLAGS=
-ac_help="$ac_help
+SHELL=${CONFIG_SHELL-/bin/sh}
-  --without-pop           don't support POP mail retrieval with movemail"
-ac_help="$ac_help
+# Maximum number of lines to put in a shell here document.
-  --with-kerberos         support Kerberos-authenticated POP"
+# This variable seems obsolete.  It should probably be removed, and
-ac_help="$ac_help
+# only ac_max_sed_lines should be used.
-  --with-kerberos5        support Kerberos version 5 authenticated POP"
+: ${ac_max_here_lines=38}
-ac_help="$ac_help
-  --with-hesiod           support Hesiod to get the POP server host"
+ac_unique_file="src/lisp.h"
-ac_help="$ac_help
+# Factoring default headers for most tests.
-  --with-x-toolkit=KIT    use an X toolkit (KIT = yes/lucid/athena/motif/no)"
+ac_includes_default="\
-ac_help="$ac_help
+#include <stdio.h>
-  --with-xpm              use -lXpm for displaying XPM images"
+#if HAVE_SYS_TYPES_H
-ac_help="$ac_help
+# include <sys/types.h>
-  --with-jpeg             use -ljpeg for displaying JPEG images"
+#endif
-ac_help="$ac_help
+#if HAVE_SYS_STAT_H
-  --with-tiff             use -ltiff for displaying TIFF images"
+# include <sys/stat.h>
-ac_help="$ac_help
+#endif
-  --with-gif              use -lungif for displaying GIF images"
+#if STDC_HEADERS
-ac_help="$ac_help
+# include <stdlib.h>
-  --with-png              use -lpng for displaying PNG images"
+# include <stddef.h>
-ac_help="$ac_help
+#else
-  --without-toolkit-scroll-bars
+# if HAVE_STDLIB_H
-                           don't use Motif or Xaw3d scroll bars"
+#  include <stdlib.h>
-ac_help="$ac_help
+# endif
-  --without-xim    don't use X11 XIM"
+#endif
-ac_help="$ac_help
+#if HAVE_STRING_H
-  --disable-largefile     omit support for large files"
+# if !STDC_HEADERS && HAVE_MEMORY_H
-ac_help="$ac_help
+#  include <memory.h>
-  --with-x                use the X Window System"
+# endif
+# include <string.h>
+#endif
+#if HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
 # Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
 # The variables have the same names as the options, with
 # dashes changed to underlines.
-build=NONE
+cache_file=/dev/null
-cache_file=./config.cache
 exec_prefix=NONE
-host=NONE
 no_create=
-nonopt=NONE
 no_recursion=
 prefix=NONE
 program_prefix=NONE
@@ -60,10 +158,15 @@ program_transform_name=s,x,x,
 silent=
 site=
 srcdir=
-target=NONE
 verbose=
 x_includes=NONE
 x_libraries=NONE
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
@@ -77,17 +180,16 @@ oldincludedir='/usr/include'
 infodir='${prefix}/info'
 mandir='${prefix}/man'
-# Initialize some other variables.
+# Identity of this package.
-subdirs=
+PACKAGE_NAME=
-MFLAGS= MAKEFLAGS=
+PACKAGE_TARNAME=
-SHELL=${CONFIG_SHELL-/bin/sh}
+PACKAGE_VERSION=
-# Maximum number of lines to put in a shell here document.
+PACKAGE_STRING=
-ac_max_here_lines=12
+PACKAGE_BUGREPORT=
 ac_prev=
 for ac_option
 do
  # If the previous option needs an argument, assign it.
  if test -n "$ac_prev"; then
    eval "$ac_prev=\$ac_option"
@@ -95,59 +197,59 @@ do
    continue
  fi
-  case "$ac_option" in
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
  # Accept the important Cygnus configure options, so we can diagnose typos.
-  case "$ac_option" in
+  case $ac_option in
  -bindir | --bindir | --bindi | --bind | --bin | --bi)
    ac_prev=bindir ;;
  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
+    bindir=$ac_optarg ;;
  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
+    ac_prev=build_alias ;;
  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
+    build_alias=$ac_optarg ;;
  -cache-file | --cache-file | --cache-fil | --cache-fi \
  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
    ac_prev=cache_file ;;
  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
+    cache_file=$ac_optarg ;;
+  --config-cache | -C)
+    cache_file=config.cache ;;
  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
    ac_prev=datadir ;;
  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
  | --da=*)
-    datadir="$ac_optarg" ;;
+    datadir=$ac_optarg ;;
  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-    fi
+   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
+    eval "enable_$ac_feature=no" ;;
  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
+      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-    fi
+   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case "$ac_option" in
+    case $ac_option in
-      *=*) ;;
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
      *) ac_optarg=yes ;;
    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
+    eval "enable_$ac_feature='$ac_optarg'" ;;
  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -156,95 +258,47 @@ do
  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
+    exec_prefix=$ac_optarg ;;
  -gas | --gas | --ga | --g)
    # Obsolete; use --with-gas.
    with_gas=yes ;;
-  -help | --help | --hel | --he)
+  -help | --help | --hel | --he | -h)
-    # Omit some internal or obsolete options to make the list less imposing.
+    ac_init_help=long ;;
-    # This message is too long to be a string in the A/UX 3.1 sh.
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    cat << EOF
+    ac_init_help=recursive ;;
-Usage: configure [options] [host]
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-Options: [defaults in brackets after descriptions]
+    ac_init_help=short ;;
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
  -host | --host | --hos | --ho)
-    ac_prev=host ;;
+    ac_prev=host_alias ;;
  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
+    host_alias=$ac_optarg ;;
  -includedir | --includedir | --includedi | --included | --include \
  | --includ | --inclu | --incl | --inc)
    ac_prev=includedir ;;
  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
+    includedir=$ac_optarg ;;
  -infodir | --infodir | --infodi | --infod | --info | --inf)
    ac_prev=infodir ;;
  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
+    infodir=$ac_optarg ;;
  -libdir | --libdir | --libdi | --libd)
    ac_prev=libdir ;;
  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
+    libdir=$ac_optarg ;;
  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
  | --libexe | --libex | --libe)
    ac_prev=libexecdir ;;
  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
+    libexecdir=$ac_optarg ;;
  -localstatedir | --localstatedir | --localstatedi | --localstated \
  | --localstate | --localstat | --localsta | --localst \
@@ -253,12 +307,12 @@ EOF
  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
+    localstatedir=$ac_optarg ;;
  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
    ac_prev=mandir ;;
  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
+    mandir=$ac_optarg ;;
  -nfp | --nfp | --nf)
    # Obsolete; use --without-fp.
@@ -279,26 +333,26 @@ EOF
  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
+    oldincludedir=$ac_optarg ;;
  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
    ac_prev=prefix ;;
  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
+    prefix=$ac_optarg ;;
  -program-prefix | --program-prefix | --program-prefi | --program-pref \
  | --program-pre | --program-pr | --program-p)
    ac_prev=program_prefix ;;
  -program-prefix=* | --program-prefix=* | --program-prefi=* \
  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
+    program_prefix=$ac_optarg ;;
  -program-suffix | --program-suffix | --program-suffi | --program-suff \
  | --program-suf | --program-su | --program-s)
    ac_prev=program_suffix ;;
  -program-suffix=* | --program-suffix=* | --program-suffi=* \
  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
+    program_suffix=$ac_optarg ;;
  -program-transform-name | --program-transform-name \
  | --program-transform-nam | --program-transform-na \
@@ -315,7 +369,7 @@ EOF
  | --program-transfo=* | --program-transf=* \
  | --program-trans=* | --program-tran=* \
  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
+    program_transform_name=$ac_optarg ;;
  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
  | -silent | --silent | --silen | --sile | --sil)
@@ -325,7 +379,7 @@ EOF
    ac_prev=sbindir ;;
  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
+    sbindir=$ac_optarg ;;
  -sharedstatedir | --sharedstatedir | --sharedstatedi \
  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
@@ -336,58 +390,57 @@ EOF
  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
+    sharedstatedir=$ac_optarg ;;
  -site | --site | --sit)
    ac_prev=site ;;
  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
+    site=$ac_optarg ;;
  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
    ac_prev=srcdir ;;
  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
+    srcdir=$ac_optarg ;;
  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
  | --syscon | --sysco | --sysc | --sys | --sy)
    ac_prev=sysconfdir ;;
  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
+    sysconfdir=$ac_optarg ;;
  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
+    ac_prev=target_alias ;;
  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
+    target_alias=$ac_optarg ;;
  -v | -verbose | --verbose | --verbos | --verbo | --verb)
    verbose=yes ;;
-  -version | --version | --versio | --versi | --vers)
+  -version | --version | --versio | --versi | --vers | -V)
-    echo "configure generated by autoconf version 2.13"
+    ac_init_version=: ;;
-    exit 0 ;;
  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
-    fi
+   { (exit 1); exit 1; }; }
    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
+    case $ac_option in
-      *=*) ;;
+      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
      *) ac_optarg=yes ;;
    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
+    eval "with_$ac_package='$ac_optarg'" ;;
  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
+      { echo "$as_me: error: invalid package name: $ac_package" >&2
-    fi
+   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
+    eval "with_$ac_package=no" ;;
  --x)
    # Obsolete; use --with-x.
@@ -398,98 +451,98 @@ EOF
    ac_prev=x_includes ;;
  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
+    x_includes=$ac_optarg ;;
  -x-libraries | --x-libraries | --x-librarie | --x-librari \
  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
    ac_prev=x_libraries ;;
  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
+    x_libraries=$ac_optarg ;;
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+  -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; }
    ;;
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+   { (exit 1); exit 1; }; }
+    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+    eval "$ac_envvar='$ac_optarg'"
+    export $ac_envvar ;;
  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+    # FIXME: should be removed in autoconf 3.0.
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
+    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    fi
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-    if test "x$nonopt" != xNONE; then
+      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    fi
-    nonopt="$ac_option"
    ;;
  esac
 done
 if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-fi
+  { echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
-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 "\
+# Be sure to have absolute paths.
-This file contains any messages produced by compilers while
+for ac_var in exec_prefix prefix
-running configure, to aid debugging if configure makes a mistake.
+do
-" 1>&5
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; };;
+  esac
+done
-# Strip out --no-create and --no-recursion so they do not pile up.
+# Be sure to have absolute paths.
-# Also quote any args containing shell metacharacters.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-ac_configure_args=
+              localstatedir libdir includedir oldincludedir infodir mandir
-for ac_arg
 do
-  case "$ac_arg" in
+  eval ac_val=$`echo $ac_var`
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  case $ac_val in
-  | --no-cr | --no-c) ;;
+    [\\/$]* | ?:[\\/]* ) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+    *)  { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
+   { (exit 1); exit 1; }; };;
-  *" "*|*"      "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
  esac
 done
-# NLS nuisances.
+# There might be people who depend on the old broken behavior: `$host'
-# Only set these to C if already set.  These must not be set unconditionally
+# used to hold the argument of --host etc.
-# because not all systems understand e.g. LANG=C (notably SCO).
+build=$build_alias
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+host=$host_alias
-# Non-C LC_CTYPE values break the ctype check.
+target=$target_alias
-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
+# FIXME: should be removed in autoconf 3.0.
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "x$host_alias" != x; then
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
+ac_tool_prefix=
-rm -rf conftest* confdefs.h
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
-# 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
+test "$silent" = yes && exec 6>/dev/null
-# 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%/[^/][^/]*$%%'`
+  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
@@ -500,13 +553,327 @@ else
 fi
 if test ! -r $srcdir/$ac_unique_file; then
  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
+   { (exit 1); exit 1; }; }
  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+    { echo "$as_me: error: cannot find sources in $srcdir" >&2
+   { (exit 1); exit 1; }; }
  fi
 fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<EOF
+\`configure' configures this package to adapt to many kinds of systems.
+Usage: $0 [OPTION]... [VAR=VALUE]...
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+Defaults for the options are specified in brackets.
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+EOF
+  cat <<EOF
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+For better control, use the options below.
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [EPREFIX/bin]
+  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR       program executables [EPREFIX/libexec]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+  --libdir=DIR           object code libraries [EPREFIX/lib]
+  --includedir=DIR       C header files [PREFIX/include]
+  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
+EOF
+  cat <<\EOF
+X features:
+  --x-includes=DIR    X include files are in DIR
+  --x-libraries=DIR   X library files are in DIR
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       build programs to run on HOST [BUILD]
+EOF
+fi
+if test -n "$ac_init_help"; then
+  cat <<\EOF
+Optional Features:
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-largefile     omit support for large files
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --without-gcc           don't use GCC to compile Emacs if GCC is found
+  --without-pop           don't support POP mail retrieval with movemail
+  --with-kerberos         support Kerberos-authenticated POP
+  --with-kerberos5        support Kerberos version 5 authenticated POP
+  --with-hesiod           support Hesiod to get the POP server host
+  --with-x-toolkit=KIT    use an X toolkit (KIT = yes/lucid/athena/motif/no)
+  --with-xpm              use -lXpm for displaying XPM images
+  --with-jpeg             use -ljpeg for displaying JPEG images
+  --with-tiff             use -ltiff for displaying TIFF images
+  --with-gif              use -lungif for displaying GIF images
+  --with-png              use -lpng for displaying PNG images
+  --without-toolkit-scroll-bars
+                           don't use Motif or Xaw3d scroll bars
+  --without-xim    don't use X11 XIM
+  --with-x                use the X Window System
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+              headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+EOF
+fi
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  ac_popdir=`pwd`
+  for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
+    cd $ac_subdir
+    # A "../" for each directory in /$ac_subdir.
+    ac_dots=`echo $ac_subdir |
+             sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
+    case $srcdir in
+    .) # No --srcdir option.  We are building in place.
+      ac_sub_srcdir=$srcdir ;;
+    [\\/]* | ?:[\\/]* ) # Absolute path.
+      ac_sub_srcdir=$srcdir/$ac_subdir ;;
+    *) # Relative path.
+      ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
+    esac
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_sub_srcdir/configure.gnu; then
+      echo
+      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
+    elif test -f $ac_sub_srcdir/configure; then
+      echo
+      $SHELL $ac_sub_srcdir/configure  --help=recursive
+    elif test -f $ac_sub_srcdir/configure.ac ||
+           test -f $ac_sub_srcdir/configure.in; then
+      echo
+      $ac_configure --help
+    else
+      echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
+    fi
+    cd $ac_popdir
+  done
+fi
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+  cat <<\EOF
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+EOF
+  exit 0
+fi
+exec 5>config.log
+cat >&5 <<EOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+It was created by $as_me, which was
+generated by GNU Autoconf 2.52.  Invocation command line was
+  $ $0 $@
+EOF
+{
+cat <<_ASUNAME
+## ---------- ##
+## Platform.  ##
+## ---------- ##
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+PATH = $PATH
+_ASUNAME
+} >&5
+cat >&5 <<EOF
+## ------------ ##
+## Core tests.  ##
+## ------------ ##
+EOF
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Also quote any args containing shell meta-characters.
+ac_configure_args=
+ac_sep=
+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_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
+    ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+    ac_sep=" " ;;
+  *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
+     ac_sep=" " ;;
+  esac
+  # Get rid of the leading space.
+done
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  echo >&5
+  echo "## ----------------- ##" >&5
+  echo "## Cache variables.  ##" >&5
+  echo "## ----------------- ##" >&5
+  echo >&5
+  # The following way of writing the cache mishandles newlines in values,
+{
+  (set) 2>&1 |
+    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      sed -n \
+        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+      ;;
+    *)
+      sed -n \
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      ;;
+    esac;
+} >&5
+  sed "/^$/d" confdefs.h >conftest.log
+  if test -s conftest.log; then
+    echo >&5
+    echo "## ------------ ##" >&5
+    echo "## confdefs.h.  ##" >&5
+    echo "## ------------ ##" >&5
+    echo >&5
+    cat conftest.log >&5
+  fi
+  (echo; echo) >&5
+  test "$ac_signal" != 0 &&
+    echo "$as_me: caught signal $ac_signal" >&5
+  echo "$as_me: exit $exit_status" >&5
+  rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
+    exit $exit_status
+     ' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
+# Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
  if test "x$prefix" != xNONE; then
@@ -517,42 +884,109 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
+    { echo "$as_me:887: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
+    cat "$ac_site_file" >&5
    . "$ac_site_file"
  fi
 done
 if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
+  # Some versions of bash will fail to source /dev/null (special
-  . $cache_file
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    { echo "$as_me:898: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . $cache_file;;
+      *)                      . ./$cache_file;;
+    esac
+  fi
 else
-  echo "creating cache $cache_file"
+  { echo "$as_me:906: creating cache $cache_file" >&5
-  > $cache_file
+echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in `(set) 2>&1 |
+               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+  eval ac_new_val="\$ac_env_${ac_var}_value"
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { echo "$as_me:922: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { echo "$as_me:926: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+        { echo "$as_me:932: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+        { echo "$as_me:934:   former value:  $ac_old_val" >&5
+echo "$as_me:   former value:  $ac_old_val" >&2;}
+        { echo "$as_me:936:   current value: $ac_new_val" >&5
+echo "$as_me:   current value: $ac_new_val" >&2;}
+        ac_cache_corrupted=:
+      fi;;
+  esac
+  # Pass precious variables to config.status.  It doesn't matter if
+  # we pass some twice (in addition to the command line arguments).
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *" "*|*"    "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"`
+      ac_configure_args="$ac_configure_args '$ac_arg'"
+      ;;
+    *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val"
+       ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { echo "$as_me:955: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { echo "$as_me:957: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+   { (exit 1); exit 1; }; }
 fi
 ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-cross_compiling=$ac_cv_prog_cc_cross
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_exeext=
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-ac_objext=o
+  *c*,-n*) ECHO_N= ECHO_C='
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+' ECHO_T='      ' ;;
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+  *)      ECHO_N= ECHO_C='\c' ECHO_T= ;;
-    ac_n= ac_c='
+esac
-' ac_t='        '
+echo "#! $SHELL" >conftest.sh
-  else
+echo  "exit 0"   >>conftest.sh
-    ac_n=-n ac_c= ac_t=
+chmod +x conftest.sh
-  fi
+if { (echo "$as_me:977: PATH=\".;.\"; conftest.sh") >&5
+  (PATH=".;."; conftest.sh) 2>&5
+  ac_status=$?
+  echo "$as_me:980: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  ac_path_separator=';'
 else
-  ac_n= ac_c='\c' ac_t=
+  ac_path_separator=:
 fi
+PATH_SEPARATOR="$ac_path_separator"
+rm -f conftest.sh
+ac_config_headers="$ac_config_headers src/config.h:src/config.in"
 lispdir='${datadir}/emacs/${version}/lisp'
 locallisppath='${datadir}/emacs/${version}/site-lisp:'\
@@ -565,34 +999,34 @@ docdir='${datadir}/emacs/${version}/etc'
 # Check whether --with-gcc or --without-gcc was given.
 if test "${with_gcc+set}" = set; then
  withval="$with_gcc"
-  :
-fi
+fi;
 # Check whether --with-pop or --without-pop was given.
 if test "${with_pop+set}" = set; then
  withval="$with_pop"
  if test "$withval" = yes; then
-   cat >> confdefs.h <<\EOF
+   cat >>confdefs.h <<\EOF
 #define MAIL_USE_POP 1
 EOF
 else :
 fi
 else
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define MAIL_USE_POP 1
 EOF
-fi
+fi;
 # Check whether --with-kerberos or --without-kerberos was given.
 if test "${with_kerberos+set}" = set; then
  withval="$with_kerberos"
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define KERBEROS 1
 EOF
-fi
+fi;
 # Check whether --with-kerberos5 or --without-kerberos5 was given.
 if test "${with_kerberos5+set}" = set; then
@@ -600,26 +1034,26 @@ if test "${with_kerberos5+set}" = set; then
  if test "${with_kerberos5+set}" = set; then
  if test "${with_kerberos+set}" != set; then
    with_kerberos=yes
-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\EOF
 #define KERBEROS 1
 EOF
  fi
 fi
-cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define KERBEROS5 1
 EOF
-fi
+fi;
 # Check whether --with-hesiod or --without-hesiod was given.
 if test "${with_hesiod+set}" = set; then
  withval="$with_hesiod"
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define HESIOD 1
 EOF
-fi
+fi;
 # Check whether --with-x-toolkit or --without-x-toolkit was given.
 if test "${with_x_toolkit+set}" = set; then
@@ -631,57 +1065,60 @@ if test "${with_x_toolkit+set}" = set; then
            a | at | ath | athe | athen | athena )      val=athena ;;
            m | mo | mot | moti | motif )       val=motif ;;
            * )
-{ echo "configure: error: \`--with-x-toolkit=$withval' is invalid\;
+{ { echo "$as_me:1068: error: \`--with-x-toolkit=$withval' is invalid\;
+this option's value should be \`yes', \`no', \`lucid', \`athena', or \`motif'.
+Currently, \`yes', \`athena' and \`lucid' are synonyms." >&5
+echo "$as_me: error: \`--with-x-toolkit=$withval' is invalid\;
 this option's value should be \`yes', \`no', \`lucid', \`athena', or \`motif'.
-Currently, \`yes', \`athena' and \`lucid' are synonyms." 1>&2; exit 1; }
+Currently, \`yes', \`athena' and \`lucid' are synonyms." >&2;}
+   { (exit 1); exit 1; }; }
            ;;
          esac
          with_x_toolkit=$val
-fi
+fi;
 # Check whether --with-xpm or --without-xpm was given.
 if test "${with_xpm+set}" = set; then
  withval="$with_xpm"
-  :
-fi
+fi;
 # Check whether --with-jpeg or --without-jpeg was given.
 if test "${with_jpeg+set}" = set; then
  withval="$with_jpeg"
-  :
-fi
+fi;
 # Check whether --with-tiff or --without-tiff was given.
 if test "${with_tiff+set}" = set; then
  withval="$with_tiff"
-  :
-fi
+fi;
 # Check whether --with-gif or --without-gif was given.
 if test "${with_gif+set}" = set; then
  withval="$with_gif"
-  :
-fi
+fi;
 # Check whether --with-png or --without-png was given.
 if test "${with_png+set}" = set; then
  withval="$with_png"
-  :
-fi
+fi;
 # Check whether --with-toolkit-scroll-bars or --without-toolkit-scroll-bars was given.
 if test "${with_toolkit_scroll_bars+set}" = set; then
  withval="$with_toolkit_scroll_bars"
-  :
-fi
+fi;
 # Check whether --with-xim or --without-xim was given.
 if test "${with_xim+set}" = set; then
  withval="$with_xim"
-  :
-fi
+fi;
 #### Make srcdir absolute, if it isn't already.  It's important to
 #### avoid running the path through pwd unnecessarily, since pwd can
@@ -707,12 +1144,18 @@ esac
 #### Check if the source directory already has a configured system in it.
 if test `pwd` != `(cd ${srcdir} && pwd)` \
   && test -f "${srcdir}/src/config.h" ; then
-  echo "configure: warning: The directory tree \`${srcdir}' is being used
+  { echo "$as_me:1147: WARNING: The directory tree \`${srcdir}' is being used
   as a build directory right now; it has been configured in its own
   right.  To configure in another directory as well, you MUST
   use GNU make.  If you do not have GNU make, then you must
   now do \`make distclean' in ${srcdir},
-   and then run $0 again." 1>&2
+   and then run $0 again." >&5
+echo "$as_me: WARNING: The directory tree \`${srcdir}' is being used
+   as a build directory right now; it has been configured in its own
+   right.  To configure in another directory as well, you MUST
+   use GNU make.  If you do not have GNU make, then you must
+   now do \`make distclean' in ${srcdir},
+   and then run $0 again." >&2;}
  extrasub='/^VPATH[     ]*=/c\
 vpath %.c $(srcdir)\
@@ -739,46 +1182,76 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
    ac_aux_dir=$ac_dir
    ac_install_sh="$ac_aux_dir/install.sh -c"
    break
+  elif test -f $ac_dir/shtool; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -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; }
+  { { echo "$as_me:1192: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+   { (exit 1); exit 1; }; }
 fi
-ac_config_guess=$ac_aux_dir/config.guess
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub=$ac_aux_dir/config.sub
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 # Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+$ac_config_sub sun4 >/dev/null 2>&1 ||
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+  { { echo "$as_me:1202: error: cannot run $ac_config_sub" >&5
-fi
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+   { (exit 1); exit 1; }; }
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:759: checking host system type" >&5
+echo "$as_me:1206: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6
-host_alias=$host
+if test "${ac_cv_build+set}" = set; then
-case "$host_alias" in
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-NONE)
+else
-  case $nonopt in
+  ac_cv_build_alias=$build_alias
-  NONE)
+test -z "$ac_cv_build_alias" &&
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
+  ac_cv_build_alias=`$ac_config_guess`
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+test -z "$ac_cv_build_alias" &&
-    fi ;;
+  { { echo "$as_me:1215: error: cannot guess build type; you must specify one" >&5
-  *) host_alias=$nonopt ;;
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-  esac ;;
+   { (exit 1); exit 1; }; }
-esac
+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+  { { echo "$as_me:1219: error: $ac_config_sub $ac_cv_build_alias failed." >&5
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+   { (exit 1); exit 1; }; }
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+fi
-echo "$ac_t""$host" 1>&6
+echo "$as_me:1224: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6
+build=$ac_cv_build
+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$as_me:1231: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6
+if test "${ac_cv_host+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_host_alias=$host_alias
+test -z "$ac_cv_host_alias" &&
+  ac_cv_host_alias=$ac_cv_build_alias
+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+  { { echo "$as_me:1240: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+echo "$as_me:1245: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6
+host=$ac_cv_host
+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 canonical=$host
 configuration=$host_alias
 ### 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.
@@ -1635,7 +2108,7 @@ case "${canonical}" in
      *-xenix* )                opsys=xenix ;;
      *-linux-gnu* )            opsys=gnu-linux ;;
      *-sco3.2v4* )             opsys=sco4 ; NON_GNU_CPP=/lib/cpp  ;;
-      *-sco3.2v5* )             opsys=sco5 
+      *-sco3.2v5* )             opsys=sco5
                                NON_GNU_CPP=/lib/cpp
                                # Prevent -belf from being passed to $CPP.
                                # /lib/cpp does not accept it.
@@ -1712,16 +2185,17 @@ if test x"${opsys}" = x; then
  esac
 fi
 if test $unported = yes; then
-  { echo "configure: error: Emacs hasn't been ported to \`${canonical}' systems.
+  { { echo "$as_me:2189: error: Emacs hasn't been ported to \`${canonical}' systems.
-Check \`etc/MACHINES' for recognized configuration names." 1>&2; exit 1; }
+Check \`etc/MACHINES' for recognized configuration names." >&5
+echo "$as_me: error: Emacs hasn't been ported to \`${canonical}' systems.
+Check \`etc/MACHINES' for recognized configuration names." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 machfile="m/${machine}.h"
 opsysfile="s/${opsys}.h"
 #### Choose a compiler.
 test -n "$CC" && cc_specified=yes
@@ -1731,214 +2205,580 @@ SPECIFIED_CFLAGS="$CFLAGS"
 case ${with_gcc} in
  "yes" ) CC="gcc" GCC=yes ;;
  "no"  ) : ${CC=cc} ;;
-  * ) # Extract the first word of "gcc", so it can be a program name with args.
+  * )
+esac
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+echo "$as_me:2218: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_CC="${ac_tool_prefix}gcc"
+echo "$as_me:2233: found $ac_dir/$ac_word" >&5
+break
+done
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  echo "$as_me:2241: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:2244: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_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 "$as_me:2253: checking for $ac_word" >&5
-echo "configure:1738: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="gcc"
+echo "$as_me:2268: found $ac_dir/$ac_word" >&5
+break
+done
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:2276: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:2279: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+echo "$as_me:2292: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  if test -n "$CC"; then
  ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
-  ac_dummy="$PATH"
+ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
+  IFS=$ac_save_IFS
-    if test -f $ac_dir/$ac_word; then
+  test -z "$ac_dir" && ac_dir=.
-      ac_cv_prog_CC="gcc"
+  $as_executable_p "$ac_dir/$ac_word" || continue
-      break
+ac_cv_prog_CC="${ac_tool_prefix}cc"
-    fi
+echo "$as_me:2307: found $ac_dir/$ac_word" >&5
-  done
+break
-  IFS="$ac_save_ifs"
+done
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:2315: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+  echo "$as_me:2318: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:2327: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="cc"
+echo "$as_me:2342: found $ac_dir/$ac_word" >&5
+break
+done
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:2350: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:2353: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
+  CC=$ac_ct_CC
+else
+  CC="$ac_cv_prog_CC"
+fi
+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 "$as_me:2366: checking for $ac_word" >&5
-echo "configure:1768: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  if test -n "$CC"; then
  ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
  ac_prog_rejected=no
-  ac_dummy="$PATH"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
-  for ac_dir in $ac_dummy; do
+ac_dummy="$PATH"
-    test -z "$ac_dir" && ac_dir=.
+for ac_dir in $ac_dummy; do
-    if test -f $ac_dir/$ac_word; then
+  IFS=$ac_save_IFS
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+  test -z "$ac_dir" && ac_dir=.
-        ac_prog_rejected=yes
+  $as_executable_p "$ac_dir/$ac_word" || continue
-        continue
+if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-      fi
+  ac_prog_rejected=yes
-      ac_cv_prog_CC="cc"
+  continue
-      break
+fi
-    fi
+ac_cv_prog_CC="cc"
-  done
+echo "$as_me:2386: found $ac_dir/$ac_word" >&5
-  IFS="$ac_save_ifs"
+break
+done
 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
+  if test $# != 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" "$@"
+    set dummy "$ac_dir/$ac_word" ${1+"$@"}
    shift
    ac_cv_prog_CC="$@"
  fi
 fi
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:2408: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:2411: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-  if test -z "$CC"; then
+fi
-    case "`uname -s`" in
+if test -z "$CC"; then
-    *win32* | *WIN32*)
+  if test -n "$ac_tool_prefix"; then
-      # Extract the first word of "cl", so it can be a program name with args.
+  for ac_prog in cl
-set dummy cl; ac_word=$2
+  do
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-echo "configure:1819: checking for $ac_word" >&5
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+echo "$as_me:2422: checking for $ac_word" >&5
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  if test -n "$CC"; then
  ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
-  ac_dummy="$PATH"
+ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
+  IFS=$ac_save_IFS
-    if test -f $ac_dir/$ac_word; then
+  test -z "$ac_dir" && ac_dir=.
-      ac_cv_prog_CC="cl"
+  $as_executable_p "$ac_dir/$ac_word" || continue
-      break
+ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    fi
+echo "$as_me:2437: found $ac_dir/$ac_word" >&5
-  done
+break
-  IFS="$ac_save_ifs"
+done
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+  echo "$as_me:2445: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:2448: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
- ;;
-    esac
+    test -n "$CC" && break
-  fi
+  done
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:2461: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_CC="$ac_prog"
+echo "$as_me:2476: found $ac_dir/$ac_word" >&5
+break
+done
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+fi
-echo "configure:1851: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  echo "$as_me:2484: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+  echo "$as_me:2487: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
-ac_ext=c
+  test -n "$ac_ct_CC" && break
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+done
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-cat > conftest.$ac_ext << EOF
+  CC=$ac_ct_CC
+fi
+fi
+test -z "$CC" && { { echo "$as_me:2499: error: no acceptable cc found in \$PATH" >&5
+echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+   { (exit 1); exit 1; }; }
+# Provide some information about the compiler.
+echo "$as_me:2504:" \
+     "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:2507: \"$ac_compiler --version </dev/null >&5\"") >&5
+  (eval $ac_compiler --version </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:2510: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:2512: \"$ac_compiler -v </dev/null >&5\"") >&5
+  (eval $ac_compiler -v </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:2515: \$? = $ac_status" >&5
+  (exit $ac_status); }
+{ (eval echo "$as_me:2517: \"$ac_compiler -V </dev/null >&5\"") >&5
+  (eval $ac_compiler -V </dev/null >&5) 2>&5
+  ac_status=$?
+  echo "$as_me:2520: \$? = $ac_status" >&5
+  (exit $ac_status); }
-#line 1862 "configure"
+cat >conftest.$ac_ext <<_ACEOF
+#line 2524 "configure"
 #include "confdefs.h"
-main(){return(0);}
+int
-EOF
+main ()
-if { (eval echo configure:1867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+{
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
+  ;
-  if (./conftest; exit) 2>/dev/null; then
+  return 0;
-    ac_cv_prog_cc_cross=no
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.exe"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+echo "$as_me:2540: checking for C compiler default output" >&5
+echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+if { (eval echo "$as_me:2543: \"$ac_link_default\"") >&5
+  (eval $ac_link_default) 2>&5
+  ac_status=$?
+  echo "$as_me:2546: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # Find the output, starting from the most likely.  This scheme is
+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+# resort.
+for ac_file in `ls a.exe conftest.exe 2>/dev/null;
+                ls a.out conftest 2>/dev/null;
+                ls a.* conftest.* 2>/dev/null`; do
+  case $ac_file in
+    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    a.out ) # We found the default executable, but exeext='' is most
+            # certainly right.
+            break;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:2569: error: C compiler cannot create executables" >&5
+echo "$as_me: error: C compiler cannot create executables" >&2;}
+   { (exit 77); exit 77; }; }
+fi
+ac_exeext=$ac_cv_exeext
+echo "$as_me:2575: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6
+# Check the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:2580: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+  if { ac_try='./$ac_file'
+  { (eval echo "$as_me:2586: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2589: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+    cross_compiling=no
  else
-    ac_cv_prog_cc_cross=yes
+    if test "$cross_compiling" = maybe; then
+        cross_compiling=yes
+    else
+        { { echo "$as_me:2596: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'." >&5
+echo "$as_me: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'." >&2;}
+   { (exit 1); exit 1; }; }
+    fi
  fi
+fi
+echo "$as_me:2604: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+rm -f a.out a.exe conftest$ac_cv_exeext
+ac_clean_files=$ac_clean_files_save
+# Check the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:2611: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:2613: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
+echo "$as_me:2616: checking for executable suffix" >&5
+echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+if { (eval echo "$as_me:2618: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:2621: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
+  case $ac_file in
+    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+          export ac_cv_exeext
+          break;;
+    * ) break;;
+  esac
+done
 else
-  echo "configure: failed program was:" >&5
+  { { echo "$as_me:2637: error: cannot compute EXEEXT: cannot compile and link" >&5
-  cat conftest.$ac_ext >&5
+echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
-  ac_cv_prog_cc_works=no
+   { (exit 1); exit 1; }; }
 fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+rm -f conftest$ac_cv_exeext
-if test $ac_cv_prog_cc_works = no; then
+echo "$as_me:2643: result: $ac_cv_exeext" >&5
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+echo "${ECHO_T}$ac_cv_exeext" >&6
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1893: 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
+rm -f conftest.$ac_ext
-echo "configure:1898: checking whether we are using GNU C" >&5
+EXEEXT=$ac_cv_exeext
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+ac_exeext=$EXEEXT
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2649: checking for object suffix" >&5
-else
+echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
-  cat > conftest.c <<EOF
+if test "${ac_cv_objext+set}" = set; then
-#ifdef __GNUC__
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1907: \"$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
+  cat >conftest.$ac_ext <<_ACEOF
-fi
+#line 2655 "configure"
-fi
+#include "confdefs.h"
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+int
+main ()
+{
-if test $ac_cv_prog_gcc = yes; then
+  ;
-  GCC=yes
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (eval echo "$as_me:2667: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2670: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
 else
-  GCC=
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+{ { echo "$as_me:2682: error: cannot compute OBJEXT: cannot compile" >&5
+echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-ac_test_CFLAGS="${CFLAGS+set}"
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
-ac_save_CFLAGS="$CFLAGS"
+fi
-CFLAGS=
+echo "$as_me:2689: result: $ac_cv_objext" >&5
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "${ECHO_T}$ac_cv_objext" >&6
-echo "configure:1926: checking whether ${CC-cc} accepts -g" >&5
+OBJEXT=$ac_cv_objext
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+ac_objext=$OBJEXT
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:2693: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo 'void f(){}' > conftest.c
+  cat >conftest.$ac_ext <<_ACEOF
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+#line 2699 "configure"
+#include "confdefs.h"
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2714: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2717: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:2720: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2723: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_compiler_gnu=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_compiler_gnu=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+fi
+echo "$as_me:2735: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+GCC=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+CFLAGS="-g"
+echo "$as_me:2741: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_g+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 2747 "configure"
+#include "confdefs.h"
+int
+main ()
+{
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2759: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2762: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:2765: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2768: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  ac_cv_prog_cc_g=yes
 else
-  ac_cv_prog_cc_g=no
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_prog_cc_g=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
+echo "$as_me:2778: result: $ac_cv_prog_cc_g" >&5
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
+  CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
  if test "$GCC" = yes; then
    CFLAGS="-g -O2"
@@ -1952,8 +2792,116 @@ else
    CFLAGS=
  fi
 fi
+# Some people use a C++ compiler to compile C.  Since we use `exit',
+# in C++ we need to declare it.  In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+  choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2805: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2808: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:2811: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2814: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  for ac_declaration in \
+   ''\
+   '#include <stdlib.h>' \
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);'
+do
+  cat >conftest.$ac_ext <<_ACEOF
+#line 2826 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2839: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2842: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:2845: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2848: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+continue
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+#line 2858 "configure"
+#include "confdefs.h"
+$ac_declaration
+int
+main ()
+{
+exit (42);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:2870: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2873: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:2876: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:2879: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
+fi
-esac
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -2001,106 +2949,216 @@ fi
 #### 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.
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+echo "$as_me:2952: checking whether ln -s works" >&5
-echo "configure:2006: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
+LN_S=$as_ln_s
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "$LN_S" = "ln -s"; then
+  echo "$as_me:2956: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  rm -f conftestdata
+  echo "$as_me:2959: result: no, using $LN_S" >&5
-if ln -s X conftestdata 2>/dev/null
+echo "${ECHO_T}no, using $LN_S" >&6
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-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
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+ac_ext=c
-echo "configure:2027: checking how to run the C preprocessor" >&5
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+echo "$as_me:2968: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
  CPP=
 fi
 if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+else
-    # This must be in double quotes, not single quotes, because CPP may get
+      # Double quotes because CPP needs to be expanded
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-  CPP="${CC-cc} -E"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
+  # not just through cpp. "Syntax error" is here to catch this case.
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 2042 "configure"
+#line 2989 "configure"
 #include "confdefs.h"
 #include <assert.h>
-Syntax Error
+                     Syntax error
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:2994: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:2048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:3000: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
  :
 else
-  echo "$ac_err" >&5
+  echo "$as_me: failed program was:" >&5
-  echo "configure: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  # Broken: fails on valid input.
-  CPP="${CC-cc} -E -traditional-cpp"
+continue
-  cat > conftest.$ac_ext <<EOF
+fi
-#line 2059 "configure"
+rm -f conftest.err conftest.$ac_ext
-#include "confdefs.h"
-#include <assert.h>
+  # OK, works on sane cases.  Now check whether non-existent headers
-Syntax Error
+  # can be detected and how.
-EOF
+  cat >conftest.$ac_ext <<_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+#line 3023 "configure"
-{ (eval echo configure:2065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+#include "confdefs.h"
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+#include <ac_nonexistent.h>
-if test -z "$ac_err"; then
+_ACEOF
-  :
+if { (eval echo "$as_me:3027: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  egrep -v '^ *\+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:3033: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
 else
-  echo "$ac_err" >&5
+  echo "$as_me: failed program was:" >&5
-  echo "configure: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  # Passes both tests.
-  CPP="${CC-cc} -nologo -E"
+ac_preproc_ok=:
-  cat > conftest.$ac_ext <<EOF
+break
-#line 2076 "configure"
+fi
+rm -f conftest.err conftest.$ac_ext
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+    done
+    ac_cv_prog_CPP=$CPP
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+echo "$as_me:3070: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+#line 3080 "configure"
 #include "confdefs.h"
 #include <assert.h>
-Syntax Error
+                     Syntax error
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:3085: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:2082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:3091: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
  :
 else
-  echo "$ac_err" >&5
+  echo "$as_me: failed program was:" >&5
-  echo "configure: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  # Broken: fails on valid input.
-  CPP=/lib/cpp
+continue
-fi
+fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
-fi
-rm -f conftest*
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+#line 3114 "configure"
+#include "confdefs.h"
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:3118: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  egrep -v '^ *\+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:3124: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
 fi
-rm -f conftest*
+if test -z "$ac_cpp_err"; then
-  ac_cv_prog_CPP="$CPP"
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  # Passes both tests.
+ac_preproc_ok=:
+break
 fi
-  CPP="$ac_cv_prog_CPP"
+rm -f conftest.err conftest.$ac_ext
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
 else
-  ac_cv_prog_CPP="$CPP"
+  { { echo "$as_me:3152: error: C preprocessor \"$CPP\" fails sanity check" >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+   { (exit 1); exit 1; }; }
 fi
-echo "$ac_t""$CPP" 1>&6
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2109,31 +3167,39 @@ echo "$ac_t""$CPP" 1>&6
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+echo "$as_me:3175: checking for a BSD compatible install" >&5
-echo "configure:2118: checking for a BSD compatible install" >&5
+echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+if test "${ac_cv_path_install+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-    IFS="${IFS=         }"; ac_save_IFS="$IFS"; IFS=":"
+    ac_save_IFS=$IFS; IFS=$ac_path_separator
  for ac_dir in $PATH; do
+    IFS=$ac_save_IFS
    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
+    case $ac_dir/ in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    / | ./ | .// | /cC/* \
+    | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
+    | /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
      # Don't use installbsd from OSF since it installs stuff as root
      # by default.
      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
+        if $as_executable_p "$ac_dir/$ac_prog"; then
          if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+            grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
            # AIX install.  It has an incompatible calling convention.
            :
+          elif test $ac_prog = install &&
+            grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+            # program-specific install script used by HP pwplus--don't use.
+            :
          else
            ac_cv_path_install="$ac_dir/$ac_prog -c"
            break 2
@@ -2143,130 +3209,176 @@ else
      ;;
    esac
  done
-  IFS="$ac_save_IFS"
 fi
  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
+    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"
+    INSTALL=$ac_install_sh
  fi
 fi
-echo "$ac_t""$INSTALL" 1>&6
+echo "$as_me:3224: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 for ac_prog in 'bison -y' byacc
 do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
+  # 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 "$as_me:3239: checking for $ac_word" >&5
-echo "configure:2175: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
+if test "${ac_cv_prog_YACC+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  if test -n "$YACC"; then
  ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
-  ac_dummy="$PATH"
+ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
+  IFS=$ac_save_IFS
-    if test -f $ac_dir/$ac_word; then
+  test -z "$ac_dir" && ac_dir=.
-      ac_cv_prog_YACC="$ac_prog"
+  $as_executable_p "$ac_dir/$ac_word" || continue
-      break
+ac_cv_prog_YACC="$ac_prog"
-    fi
+echo "$as_me:3254: found $ac_dir/$ac_word" >&5
-  done
+break
-  IFS="$ac_save_ifs"
+done
 fi
 fi
-YACC="$ac_cv_prog_YACC"
+YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  echo "$ac_t""$YACC" 1>&6
+  echo "$as_me:3262: result: $YACC" >&5
+echo "${ECHO_T}$YACC" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3265: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-test -n "$YACC" && break
+  test -n "$YACC" && break
 done
 test -n "$YACC" || YACC="yacc"
 if test "x$RANLIB" = x; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
+  if test -n "$ac_tool_prefix"; then
-set dummy ranlib; ac_word=$2
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "configure:2209: checking for $ac_word" >&5
+echo "$as_me:3277: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_prog_RANLIB+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  if test -n "$RANLIB"; then
  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
-  ac_dummy="$PATH"
+ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
+for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
+  IFS=$ac_save_IFS
-    if test -f $ac_dir/$ac_word; then
+  test -z "$ac_dir" && ac_dir=.
-      ac_cv_prog_RANLIB="ranlib"
+  $as_executable_p "$ac_dir/$ac_word" || continue
-      break
+ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    fi
+echo "$as_me:3292: found $ac_dir/$ac_word" >&5
-  done
+break
-  IFS="$ac_save_ifs"
+done
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
 fi
 fi
-RANLIB="$ac_cv_prog_RANLIB"
+RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
+  echo "$as_me:3300: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:3303: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo "$as_me:3312: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_RANLIB="ranlib"
+echo "$as_me:3327: found $ac_dir/$ac_word" >&5
+break
+done
-echo $ac_n "checking for AIX""... $ac_c" 1>&6
+  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
-echo "configure:2239: checking for AIX" >&5
+fi
-cat > conftest.$ac_ext <<EOF
+fi
-#line 2241 "configure"
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  echo "$as_me:3336: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6
+else
+  echo "$as_me:3339: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+  RANLIB=$ac_ct_RANLIB
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+fi
+echo "$as_me:3350: checking for AIX" >&5
+echo $ECHO_N "checking for AIX... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line 3353 "configure"
 #include "confdefs.h"
 #ifdef _AIX
  yes
 #endif
-EOF
+_ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  egrep "yes" >/dev/null 2>&1; then
-  rm -rf conftest*
+  echo "$as_me:3362: result: yes" >&5
-  echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
+echo "${ECHO_T}yes" >&6
+cat >>confdefs.h <<\EOF
 #define _ALL_SOURCE 1
 EOF
 else
-  rm -rf conftest*
+  echo "$as_me:3369: result: no" >&5
-  echo "$ac_t""no" 1>&6
+echo "${ECHO_T}no" >&6
 fi
 rm -f conftest*
 #### Extract some information from the operating system and machine files.
-echo "checking the machine- and system-dependent files to find out
+{ echo "$as_me:3376: checking the machine- and system-dependent files to find out
 - which libraries the lib-src programs will want, and
- - whether the GNU malloc routines are usable" 1>&6
+ - whether the GNU malloc routines are usable..." >&5
-echo "configure:2268: checking the machine- and system-dependent files to find out
+echo "$as_me: checking the machine- and system-dependent files to find out
 - which libraries the lib-src programs will want, and
- - whether the GNU malloc routines are usable" >&5
+ - whether the GNU malloc routines are usable..." >&6;}
 ### First figure out CFLAGS (which we use for running the compiler here)
 ### and REAL_CFLAGS (which we use for real compilation).
@@ -2355,7 +3467,7 @@ configure___ use_mmap_for_buffers=no
 #ifndef LD_SWITCH_X_SITE_AUX
 #define LD_SWITCH_X_SITE_AUX
-#endif  
+#endif
 configure___ ld_switch_system=LD_SWITCH_SYSTEM
 configure___ ld_switch_machine=LD_SWITCH_MACHINE
@@ -2404,343 +3516,496 @@ else
  CPPFLAGS="$c_switch_system $c_switch_machine $CPPFLAGS"
 fi
+# Check whether --enable-largefile or --disable-largefile was given.
-   # Check whether --enable-largefile or --disable-largefile was given.
 if test "${enable_largefile+set}" = set; then
  enableval="$enable_largefile"
-  :
-fi
-   if test "$enable_largefile" != no; then
+fi;
+if test "$enable_largefile" != no; then
-     echo $ac_n "checking for special C compiler options needed for large files""... $ac_c" 1>&6
+  echo "$as_me:3526: checking for special C compiler options needed for large files" >&5
-echo "configure:2418: checking for special C compiler options needed for large files" >&5
+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_sys_largefile_CC'+set}'`\" = set"; then
+if test "${ac_cv_sys_largefile_CC+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  ac_cv_sys_largefile_CC=no
-        if test "$GCC" != yes; then
+     if test "$GCC" != yes; then
-          # IRIX 6.2 and later do not support large files by default,
+       ac_save_CC=$CC
-          # so use the C compiler's -n32 option if that helps.
+       while :; do
-          cat > conftest.$ac_ext <<EOF
+         # IRIX 6.2 and later do not support large files by default,
-#line 2427 "configure"
+         # so use the C compiler's -n32 option if that helps.
+         cat >conftest.$ac_ext <<_ACEOF
+#line 3538 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
-    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
+ /* Check that off_t can represent 2**63 - 1 correctly.
-  
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-int main() {
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
-; return 0; }
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-EOF
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-if { (eval echo configure:2436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+                       && LARGE_OFF_T % 2147483647 == 1)
-  :
+                      ? 1 : -1];
-else
+int
-  echo "configure: failed program was:" >&5
+main ()
-  cat conftest.$ac_ext >&5
+{
-  rm -rf conftest*
-  ac_save_CC="$CC"
-             CC="$CC -n32"
-             cat > conftest.$ac_ext <<EOF
-#line 2445 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
-  
-int main() {
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:2454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+}
-  rm -rf conftest*
+_ACEOF
-  ac_cv_sys_largefile_CC=' -n32'
+         rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3558: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3561: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3564: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3567: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-fi
+fi
-rm -f conftest*
+rm -f conftest.$ac_objext
-             CC="$ac_save_CC"
+         CC="$CC -n32"
-fi
+         rm -f conftest.$ac_objext
-rm -f conftest*
+if { (eval echo "$as_me:3577: \"$ac_compile\"") >&5
-        fi
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3580: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3583: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3586: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sys_largefile_CC=' -n32'; break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext
+         break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
 fi
+echo "$as_me:3600: result: $ac_cv_sys_largefile_CC" >&5
+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
-echo "$ac_t""$ac_cv_sys_largefile_CC" 1>&6
+  echo "$as_me:3606: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-     if test "$ac_cv_sys_largefile_CC" != no; then
+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
-       CC="$CC$ac_cv_sys_largefile_CC"
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-     fi
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-     echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:2474: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-if eval "test \"`echo '$''{'ac_cv_sys_file_offset_bits'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
+  while :; do
  ac_cv_sys_file_offset_bits=no
-      cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 2480 "configure"
+#line 3614 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
-    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
+ /* Check that off_t can represent 2**63 - 1 correctly.
-  
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-int main() {
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:2489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+}
-  :
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:3634: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3637: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3640: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3643: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+fi
-  cat > conftest.$ac_ext <<EOF
+rm -f conftest.$ac_objext conftest.$ac_ext
-#line 2496 "configure"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 3652 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
-    int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
+ /* Check that off_t can represent 2**63 - 1 correctly.
-  
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-           
+    since some C++ compilers masquerading as C compilers
-int main() {
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:2507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+}
-  rm -rf conftest*
+_ACEOF
-  ac_cv_sys_file_offset_bits=64
+rm -f conftest.$ac_objext
-else
+if { (eval echo "$as_me:3673: \"$ac_compile\"") >&5
-  echo "configure: failed program was:" >&5
+  (eval $ac_compile) 2>&5
-  cat conftest.$ac_ext >&5
+  ac_status=$?
-fi
+  echo "$as_me:3676: \$? = $ac_status" >&5
-rm -f conftest*
+  (exit $ac_status); } &&
-fi
+         { ac_try='test -s conftest.$ac_objext'
-rm -f conftest*
+  { (eval echo "$as_me:3679: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3682: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sys_file_offset_bits=64; break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  break
+done
 fi
+echo "$as_me:3693: result: $ac_cv_sys_file_offset_bits" >&5
+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
+if test "$ac_cv_sys_file_offset_bits" != no; then
-echo "$ac_t""$ac_cv_sys_file_offset_bits" 1>&6
+cat >>confdefs.h <<EOF
-   if test "$ac_cv_sys_file_offset_bits" != no; then
-     cat >> confdefs.h <<EOF
 #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
 EOF
-   fi
+fi
-     echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
+rm -f conftest*
-echo "configure:2527: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:3703: checking for _LARGE_FILES value needed for large files" >&5
-if eval "test \"`echo '$''{'ac_cv_sys_large_files'+set}'`\" = set"; then
+echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_sys_large_files+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
+  while :; do
  ac_cv_sys_large_files=no
-      cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 2533 "configure"
+#line 3711 "configure"
 #include "confdefs.h"
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
-int main() {
+  ;
+  return 0;
-; return 0; }
+}
-EOF
+_ACEOF
-if { (eval echo configure:2540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+rm -f conftest.$ac_objext
-  :
+if { (eval echo "$as_me:3731: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:3734: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:3737: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:3740: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+fi
-  cat > conftest.$ac_ext <<EOF
+rm -f conftest.$ac_objext conftest.$ac_ext
-#line 2547 "configure"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 3749 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+                       && LARGE_OFF_T % 2147483647 == 1)
+                      ? 1 : -1];
+int
+main ()
+{
-           
+  ;
-int main() {
+  return 0;
+}
-; return 0; }
+_ACEOF
-EOF
+rm -f conftest.$ac_objext
-if { (eval echo configure:2556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo "$as_me:3770: \"$ac_compile\"") >&5
-  rm -rf conftest*
+  (eval $ac_compile) 2>&5
-  ac_cv_sys_large_files=1
+  ac_status=$?
-else
+  echo "$as_me:3773: \$? = $ac_status" >&5
-  echo "configure: failed program was:" >&5
+  (exit $ac_status); } &&
-  cat conftest.$ac_ext >&5
+         { ac_try='test -s conftest.$ac_objext'
-fi
+  { (eval echo "$as_me:3776: \"$ac_try\"") >&5
-rm -f conftest*
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-rm -f conftest*
+  echo "$as_me:3779: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sys_large_files=1; break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  break
+done
 fi
+echo "$as_me:3790: result: $ac_cv_sys_large_files" >&5
+echo "${ECHO_T}$ac_cv_sys_large_files" >&6
+if test "$ac_cv_sys_large_files" != no; then
-echo "$ac_t""$ac_cv_sys_large_files" 1>&6
+cat >>confdefs.h <<EOF
-   if test "$ac_cv_sys_large_files" != no; then
-     cat >> confdefs.h <<EOF
 #define _LARGE_FILES $ac_cv_sys_large_files
 EOF
-   fi
+fi
-   fi
+rm -f conftest*
-  
+fi
 # Sound support for GNU/Linux and the free BSDs.
-for ac_hdr in machine/soundcard.h sys/soundcard.h soundcard.h
+for ac_header in machine/soundcard.h sys/soundcard.h soundcard.h
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "$as_me:3807: checking for $ac_header" >&5
-echo "configure:2583: checking for $ac_hdr" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 2588 "configure"
+#line 3813 "configure"
-#include "confdefs.h"
+#include "confdefs.h"
-#include <$ac_hdr>
+#include <$ac_header>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:3817: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:2593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
-else
+  echo "$as_me:3823: \$? = $ac_status" >&5
-  echo "$ac_err" >&5
+  (exit $ac_status); } >/dev/null; then
-  echo "configure: failed program was:" >&5
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  eval "$as_ac_Header=no"
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:3842: result: `eval echo '${'$as_ac_Header'}'`" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >> confdefs.h <<EOF
+  cat >>confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
- 
-else
-  echo "$ac_t""no" 1>&6
 fi
 done
 # Emulation library used on NetBSD.
-echo $ac_n "checking for _oss_ioctl in -lossaudio""... $ac_c" 1>&6
+echo "$as_me:3853: checking for _oss_ioctl in -lossaudio" >&5
-echo "configure:2621: checking for _oss_ioctl in -lossaudio" >&5
+echo $ECHO_N "checking for _oss_ioctl in -lossaudio... $ECHO_C" >&6
-ac_lib_var=`echo ossaudio'_'_oss_ioctl | sed 'y%./+-%__p_%'`
+if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lossaudio  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 2629 "configure"
+#line 3861 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char _oss_ioctl();
+char _oss_ioctl ();
+int
-int main() {
+main ()
-_oss_ioctl()
+{
-; return 0; }
+_oss_ioctl ();
-EOF
+  ;
-if { (eval echo configure:2640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:3880: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:3883: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:3886: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:3889: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
+  ac_cv_lib_ossaudio__oss_ioctl=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_ossaudio__oss_ioctl=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:3900: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
+echo "${ECHO_T}$ac_cv_lib_ossaudio__oss_ioctl" >&6
+if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then
  LIBSOUND=-lossaudio
 else
-  echo "$ac_t""no" 1>&6
+  LIBSOUND=
-LIBSOUND=
 fi
+for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
-for ac_hdr in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
  linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
  termcap.h stdio_ext.h fcntl.h term.h strings.h
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "$as_me:3913: checking for $ac_header" >&5
-echo "configure:2669: checking for $ac_hdr" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 2674 "configure"
+#line 3919 "configure"
-#include "confdefs.h"
+#include "confdefs.h"
-#include <$ac_hdr>
+#include <$ac_header>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:3923: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:2679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
-else
+  echo "$as_me:3929: \$? = $ac_status" >&5
-  echo "$ac_err" >&5
+  (exit $ac_status); } >/dev/null; then
-  echo "configure: failed program was:" >&5
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  eval "$as_ac_Header=no"
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:3948: result: `eval echo '${'$as_ac_Header'}'`" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >> confdefs.h <<EOF
+  cat >>confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
- 
-else
-  echo "$ac_t""no" 1>&6
 fi
 done
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+echo "$as_me:3958: checking for ANSI C header files" >&5
-echo "configure:2706: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 2711 "configure"
+#line 3964 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <float.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+_ACEOF
-{ (eval echo configure:2719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+if { (eval echo "$as_me:3972: \"$ac_cpp conftest.$ac_ext\"") >&5
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-if test -z "$ac_err"; then
+  ac_status=$?
-  rm -rf conftest*
+  egrep -v '^ *\+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:3978: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
  ac_cv_header_stdc=yes
 else
-  echo "$ac_err" >&5
+  echo "$as_me: failed program was:" >&5
-  echo "configure: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
  ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 2736 "configure"
+#line 4000 "configure"
 #include "confdefs.h"
 #include <string.h>
-EOF
+_ACEOF
 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*
@@ -2749,16 +4014,16 @@ 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
+  cat >conftest.$ac_ext <<_ACEOF
-#line 2754 "configure"
+#line 4018 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
-EOF
+_ACEOF
 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*
@@ -2767,167 +4032,235 @@ fi
 if test $ac_cv_header_stdc = yes; then
  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then
  :
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 2775 "configure"
+#line 4039 "configure"
 #include "confdefs.h"
 #include <ctype.h>
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+#if ((' ' & 0x0FF) == 0x020)
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-int main () { int i; for (i = 0; i < 256; i++)
+#else
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
-exit (0); }
+                     || ('j' <= (c) && (c) <= 'r') \
+                     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
-EOF
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-if { (eval echo configure:2786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+int
-then
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+        || toupper (i) != TOUPPER (i))
+      exit(2);
+  exit (0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:4065: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:4068: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:4070: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4073: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  :
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
-  cat conftest.$ac_ext >&5
+echo "$as_me: failed program was:" >&5
-  rm -fr conftest*
+cat conftest.$ac_ext >&5
-  ac_cv_header_stdc=no
+ac_cv_header_stdc=no
 fi
-rm -fr conftest*
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
+echo "$as_me:4086: result: $ac_cv_header_stdc" >&5
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
-  cat >> confdefs.h <<\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 "$as_me:4096: checking whether time.h and sys/time.h may both be included" >&5
-echo "configure:2810: checking whether time.h and sys/time.h may both be included" >&5
+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
+if test "${ac_cv_header_time+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 2815 "configure"
+#line 4102 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include <time.h>
-int main() {
-struct tm *tp;
+int
-; return 0; }
+main ()
-EOF
+{
-if { (eval echo configure:2824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if ((struct tm *) 0)
-  rm -rf conftest*
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4118: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4121: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4124: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4127: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  ac_cv_header_time=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+ac_cv_header_time=no
-  ac_cv_header_time=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
+echo "$as_me:4137: result: $ac_cv_header_time" >&5
-echo "$ac_t""$ac_cv_header_time" 1>&6
+echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
-  cat >> confdefs.h <<\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 "$as_me:4147: checking for sys_siglist declaration in signal.h or unistd.h" >&5
-echo "configure:2845: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo $ECHO_N "checking for sys_siglist declaration in signal.h or unistd.h... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
+if test "${ac_cv_decl_sys_siglist+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 2850 "configure"
+#line 4153 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
 /* NetBSD declares sys_siglist in unistd.h.  */
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
-int main() {
+int
+main ()
+{
 char *msg = *(sys_siglist + 1);
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:2862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4171: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4174: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4177: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4180: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  ac_cv_decl_sys_siglist=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+ac_cv_decl_sys_siglist=no
-  ac_cv_decl_sys_siglist=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
+echo "$as_me:4190: result: $ac_cv_decl_sys_siglist" >&5
-echo "$ac_t""$ac_cv_decl_sys_siglist" 1>&6
+echo "${ECHO_T}$ac_cv_decl_sys_siglist" >&6
 if test $ac_cv_decl_sys_siglist = yes; then
-  cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define SYS_SIGLIST_DECLARED 1
 EOF
 fi
-echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
+echo "$as_me:4200: checking for sys/wait.h that is POSIX.1 compatible" >&5
-echo "configure:2883: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
+if test "${ac_cv_header_sys_wait_h+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 2888 "configure"
+#line 4206 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 #ifndef WEXITSTATUS
-#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
 #endif
 #ifndef WIFEXITED
-#define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
 #endif
-int main() {
-int s;
+int
-wait (&s);
+main ()
-s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+{
-; return 0; }
+  int s;
-EOF
+  wait (&s);
-if { (eval echo configure:2904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4228: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4231: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4234: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4237: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  ac_cv_header_sys_wait_h=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+ac_cv_header_sys_wait_h=no
-  ac_cv_header_sys_wait_h=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
+echo "$as_me:4247: result: $ac_cv_header_sys_wait_h" >&5
-echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6
+echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
 if test $ac_cv_header_sys_wait_h = yes; then
-  cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define HAVE_SYS_WAIT_H 1
 EOF
 fi
+echo "$as_me:4257: checking for struct utimbuf" >&5
-echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
+echo $ECHO_N "checking for struct utimbuf... $ECHO_C" >&6
-echo "configure:2926: checking for struct utimbuf" >&5
+if test "${emacs_cv_struct_utimbuf+set}" = set; then
-if eval "test \"`echo '$''{'emacs_cv_struct_utimbuf'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 2931 "configure"
+#line 4263 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -2942,42 +4275,55 @@ else
 #ifdef HAVE_UTIME_H
 #include <utime.h>
 #endif
-int main() {
+int
+main ()
+{
 static struct utimbuf x; x.actime = x.modtime;
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:2950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4287: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4290: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4293: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4296: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  emacs_cv_struct_utimbuf=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+emacs_cv_struct_utimbuf=no
-  emacs_cv_struct_utimbuf=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
+echo "$as_me:4306: result: $emacs_cv_struct_utimbuf" >&5
-echo "$ac_t""$emacs_cv_struct_utimbuf" 1>&6
+echo "${ECHO_T}$emacs_cv_struct_utimbuf" >&6
 if test $emacs_cv_struct_utimbuf = yes; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define HAVE_STRUCT_UTIMBUF 1
 EOF
 fi
-echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+echo "$as_me:4315: checking return type of signal handlers" >&5
-echo "configure:2971: checking return type of signal handlers" >&5
+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+if test "${ac_cv_type_signal+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 2976 "configure"
+#line 4321 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
 #ifdef signal
-#undef signal
+# undef signal
 #endif
 #ifdef __cplusplus
 extern "C" void (*signal (int, void (*)(int)))(int);
@@ -2985,67 +4331,94 @@ extern "C" void (*signal (int, void (*)(int)))(int);
 void (*signal ()) ();
 #endif
-int main() {
+int
+main ()
+{
 int i;
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:2993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4343: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4346: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4349: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4352: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  ac_cv_type_signal=void
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+ac_cv_type_signal=int
-  ac_cv_type_signal=int
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
+echo "$as_me:4362: result: $ac_cv_type_signal" >&5
+echo "${ECHO_T}$ac_cv_type_signal" >&6
-echo "$ac_t""$ac_cv_type_signal" 1>&6
+cat >>confdefs.h <<EOF
-cat >> confdefs.h <<EOF
 #define RETSIGTYPE $ac_cv_type_signal
 EOF
+echo "$as_me:4369: checking for speed_t" >&5
+echo $ECHO_N "checking for speed_t... $ECHO_C" >&6
-echo $ac_n "checking for speed_t""... $ac_c" 1>&6
+if test "${emacs_cv_speed_t+set}" = set; then
-echo "configure:3013: checking for speed_t" >&5
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-if eval "test \"`echo '$''{'emacs_cv_speed_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 3018 "configure"
+#line 4375 "configure"
 #include "confdefs.h"
 #include <termios.h>
-int main() {
+int
+main ()
+{
 speed_t x = 1;
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:3025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4387: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4390: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4393: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4396: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  emacs_cv_speed_t=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
+emacs_cv_speed_t=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
+echo "$as_me:4406: result: $emacs_cv_speed_t" >&5
-echo "$ac_t""$emacs_cv_speed_t" 1>&6
+echo "${ECHO_T}$emacs_cv_speed_t" >&6
 if test $emacs_cv_speed_t = yes; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define HAVE_SPEED_T 1
 EOF
 fi
-echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
+echo "$as_me:4415: checking for struct timeval" >&5
-echo "configure:3044: checking for struct timeval" >&5
+echo $ECHO_N "checking for struct timeval... $ECHO_C" >&6
-if eval "test \"`echo '$''{'emacs_cv_struct_timeval'+set}'`\" = set"; then
+if test "${emacs_cv_struct_timeval+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 3049 "configure"
+#line 4421 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -3057,222 +4430,305 @@ else
 #include <time.h>
 #endif
 #endif
-int main() {
+int
+main ()
+{
 static struct timeval x; x.tv_sec = x.tv_usec;
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:3065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4442: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4445: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4448: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4451: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  emacs_cv_struct_timeval=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+emacs_cv_struct_timeval=no
-  emacs_cv_struct_timeval=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
+echo "$as_me:4461: result: $emacs_cv_struct_timeval" >&5
-echo "$ac_t""$emacs_cv_struct_timeval" 1>&6
+echo "${ECHO_T}$emacs_cv_struct_timeval" >&6
 HAVE_TIMEVAL=$emacs_cv_struct_timeval
 if test $emacs_cv_struct_timeval = yes; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define HAVE_TIMEVAL 1
 EOF
 fi
-echo $ac_n "checking for struct exception""... $ac_c" 1>&6
+echo "$as_me:4471: checking for struct exception" >&5
-echo "configure:3087: checking for struct exception" >&5
+echo $ECHO_N "checking for struct exception... $ECHO_C" >&6
-if eval "test \"`echo '$''{'emacs_cv_struct_exception'+set}'`\" = set"; then
+if test "${emacs_cv_struct_exception+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 3092 "configure"
+#line 4477 "configure"
 #include "confdefs.h"
 #include <math.h>
-int main() {
+int
+main ()
+{
 static struct exception x; x.arg1 = x.arg2 = x.retval; x.name = ""; x.type = 1;
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:3099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4489: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4492: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4495: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4498: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  emacs_cv_struct_exception=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+emacs_cv_struct_exception=no
-  emacs_cv_struct_exception=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
+echo "$as_me:4508: result: $emacs_cv_struct_exception" >&5
-echo "$ac_t""$emacs_cv_struct_exception" 1>&6
+echo "${ECHO_T}$emacs_cv_struct_exception" >&6
 HAVE_EXCEPTION=$emacs_cv_struct_exception
 if test $emacs_cv_struct_exception != yes; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define NO_MATHERR 1
 EOF
 fi
-echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
+echo "$as_me:4518: checking whether struct tm is in sys/time.h or time.h" >&5
-echo "configure:3121: checking whether struct tm is in sys/time.h or time.h" >&5
+echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
+if test "${ac_cv_struct_tm+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 3126 "configure"
+#line 4524 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
-int main() {
+int
+main ()
+{
 struct tm *tp; tp->tm_sec;
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:3134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4538: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4541: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4544: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4547: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  ac_cv_struct_tm=time.h
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+ac_cv_struct_tm=sys/time.h
-  ac_cv_struct_tm=sys/time.h
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
+echo "$as_me:4557: result: $ac_cv_struct_tm" >&5
-echo "$ac_t""$ac_cv_struct_tm" 1>&6
+echo "${ECHO_T}$ac_cv_struct_tm" >&6
 if test $ac_cv_struct_tm = sys/time.h; then
-  cat >> confdefs.h <<\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 "$as_me:4567: checking for struct tm.tm_zone" >&5
-echo "configure:3155: checking for tm_zone in struct tm" >&5
+echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
+if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 3160 "configure"
+#line 4573 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
-int main() {
-struct tm tm; tm.tm_zone;
+int
-; return 0; }
+main ()
-EOF
+{
-if { (eval echo configure:3168: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+static struct tm ac_aggr;
-  rm -rf conftest*
+if (ac_aggr.tm_zone)
-  ac_cv_struct_tm_zone=yes
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4589: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4592: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4595: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4598: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_member_struct_tm_tm_zone=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+ac_cv_member_struct_tm_tm_zone=no
-  ac_cv_struct_tm_zone=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
+echo "$as_me:4608: result: $ac_cv_member_struct_tm_tm_zone" >&5
+echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6
+if test $ac_cv_member_struct_tm_tm_zone = yes; then
+cat >>confdefs.h <<EOF
+#define HAVE_STRUCT_TM_TM_ZONE 1
+EOF
-echo "$ac_t""$ac_cv_struct_tm_zone" 1>&6
+fi
-if test "$ac_cv_struct_tm_zone" = yes; then
-  cat >> confdefs.h <<\EOF
+if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
+cat >>confdefs.h <<\EOF
 #define HAVE_TM_ZONE 1
 EOF
 else
-  echo $ac_n "checking for tzname""... $ac_c" 1>&6
+  echo "$as_me:4625: checking for tzname" >&5
-echo "configure:3188: checking for tzname" >&5
+echo $ECHO_N "checking for tzname... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
+if test "${ac_cv_var_tzname+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 3193 "configure"
+#line 4631 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
 extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
 #endif
-int main() {
+int
+main ()
+{
 atoi(*tzname);
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:3203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:4647: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:4650: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:4653: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4656: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  ac_cv_var_tzname=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+ac_cv_var_tzname=no
-  ac_cv_var_tzname=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
+echo "$as_me:4666: result: $ac_cv_var_tzname" >&5
-echo "$ac_t""$ac_cv_var_tzname" 1>&6
+echo "${ECHO_T}$ac_cv_var_tzname" >&6
  if test $ac_cv_var_tzname = yes; then
-    cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define HAVE_TZNAME 1
 EOF
  fi
 fi
-echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
+echo "$as_me:4677: checking for tm_gmtoff in struct tm" >&5
-echo "configure:3225: checking for tm_gmtoff in struct tm" >&5
+echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6
-if eval "test \"`echo '$''{'emacs_cv_tm_gmtoff'+set}'`\" = set"; then
+if test "${emacs_cv_tm_gmtoff+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 3230 "configure"
+#line 4683 "configure"
 #include "confdefs.h"
 #include <time.h>
-int main() {
+int
+main ()
+{
 struct tm t; t.tm_gmtoff = 0
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:3237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:4695: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:4698: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:4701: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4704: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  emacs_cv_tm_gmtoff=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+emacs_cv_tm_gmtoff=no
-  emacs_cv_tm_gmtoff=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
+echo "$as_me:4714: result: $emacs_cv_tm_gmtoff" >&5
-echo "$ac_t""$emacs_cv_tm_gmtoff" 1>&6
+echo "${ECHO_T}$emacs_cv_tm_gmtoff" >&6
 if test $emacs_cv_tm_gmtoff = yes; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define HAVE_TM_GMTOFF 1
 EOF
 fi
+echo "$as_me:4723: checking for $CC option to accept ANSI C" >&5
-echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-echo "configure:3259: checking for ${CC-cc} option to accept ANSI C" >&5
+if test "${ac_cv_prog_cc_stdc+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_prog_cc_stdc'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
  ac_cv_prog_cc_stdc=no
-ac_save_CC="$CC"
+ac_save_CC=$CC
-# Don't try gcc -ansi; that turns off useful extensions and
+cat >conftest.$ac_ext <<_ACEOF
-# breaks some systems' header files.
+#line 4731 "configure"
-# AIX                   -qlanglvl=ansi
-# Ultrix and OSF/1      -std1
-# HP-UX 10.20 and later -Ae
-# HP-UX older versions  -Aa -D_HPUX_SOURCE
-# SVR4                  -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  cat > conftest.$ac_ext <<EOF
-#line 3276 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -3302,223 +4758,300 @@ struct s2 {int (*f) (double a);};
 int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
 int argc;
 char **argv;
-int main() {
+int
+main ()
+{
 return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:3310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+}
-  rm -rf conftest*
+_ACEOF
-  ac_cv_prog_cc_stdc="$ac_arg"; break
+# Don't try gcc -ansi; that turns off useful extensions and
-else
+# breaks some systems' header files.
-  echo "configure: failed program was:" >&5
+# AIX                   -qlanglvl=ansi
-  cat conftest.$ac_ext >&5
+# Ultrix and OSF/1      -std1
-fi
+# HP-UX 10.20 and later -Ae
-rm -f conftest*
+# HP-UX older versions  -Aa -D_HPUX_SOURCE
+# SVR4                  -Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4780: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4783: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4786: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4789: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_stdc=$ac_arg
+break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext
 done
-CC="$ac_save_CC"
+rm -f conftest.$ac_ext conftest.$ac_objext
+CC=$ac_save_CC
 fi
 case "x$ac_cv_prog_cc_stdc" in
  x|xno)
-    echo "$ac_t""none needed" 1>&6 ;;
+    echo "$as_me:4806: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
  *)
-    echo "$ac_t""$ac_cv_prog_cc_stdc" 1>&6
+    echo "$as_me:4809: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
    CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
-echo $ac_n "checking for function prototypes""... $ac_c" 1>&6
+echo "$as_me:4814: checking for function prototypes" >&5
-echo "configure:3332: checking for function prototypes" >&5
+echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
 if test "$ac_cv_prog_cc_stdc" != no; then
-  echo "$ac_t""yes" 1>&6
+  echo "$as_me:4817: result: yes" >&5
-  cat >> confdefs.h <<\EOF
+echo "${ECHO_T}yes" >&6
+cat >>confdefs.h <<\EOF
 #define PROTOTYPES 1
 EOF
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:4825: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-echo $ac_n "checking for working volatile""... $ac_c" 1>&6
+echo "$as_me:4829: checking for working volatile" >&5
-echo "configure:3344: checking for working volatile" >&5
+echo $ECHO_N "checking for working volatile... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_c_volatile'+set}'`\" = set"; then
+if test "${ac_cv_c_volatile+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 3349 "configure"
+#line 4835 "configure"
 #include "confdefs.h"
-int main() {
+int
+main ()
+{
 volatile int x;
 int * volatile y;
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:3358: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4849: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4852: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4855: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4858: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  ac_cv_c_volatile=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+ac_cv_c_volatile=no
-  ac_cv_c_volatile=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
+echo "$as_me:4868: result: $ac_cv_c_volatile" >&5
-echo "$ac_t""$ac_cv_c_volatile" 1>&6
+echo "${ECHO_T}$ac_cv_c_volatile" >&6
 if test $ac_cv_c_volatile = no; then
-  cat >> confdefs.h <<\EOF
-#define volatile 
+cat >>confdefs.h <<\EOF
+#define volatile
 EOF
 fi
-echo $ac_n "checking for working const""... $ac_c" 1>&6
+echo "$as_me:4878: checking for an ANSI C-conforming const" >&5
-echo "configure:3379: checking for working const" >&5
+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+if test "${ac_cv_c_const+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 3384 "configure"
+#line 4884 "configure"
 #include "confdefs.h"
-int main() {
+int
+main ()
-/* Ultrix mips cc rejects this.  */
+{
-typedef int charset[2]; const charset x;
+/* FIXME: Include the comments suggested by Paul. */
-/* SunOS 4.1.1 cc rejects this.  */
+#ifndef __cplusplus
-char const *const *ccp;
+  /* Ultrix mips cc rejects this.  */
-char **p;
+  typedef int charset[2];
-/* NEC SVR4.0.2 mips cc rejects this.  */
+  const charset x;
-struct point {int x, y;};
+  /* SunOS 4.1.1 cc rejects this.  */
-static struct point const zero = {0,0};
+  char const *const *ccp;
-/* AIX XL C 1.02.0.0 rejects this.
+  char **p;
-   It does not let you subtract one const X* pointer from another in an arm
+  /* NEC SVR4.0.2 mips cc rejects this.  */
-   of an if-expression whose if-part is not a constant expression */
+  struct point {int x, y;};
-const char *g = "string";
+  static struct point const zero = {0,0};
-ccp = &g + (g ? g-g : 0);
+  /* AIX XL C 1.02.0.0 rejects this.
-/* HPUX 7.0 cc rejects these. */
+     It does not let you subtract one const X* pointer from another in
-++ccp;
+     an arm of an if-expression whose if-part is not a constant
-p = (char**) ccp;
+     expression */
-ccp = (char const *const *) p;
+  const char *g = "string";
-{ /* SCO 3.2v4 cc rejects this.  */
+  ccp = &g + (g ? g-g : 0);
-  char *t;
+  /* HPUX 7.0 cc rejects these. */
-  char const *s = 0 ? (char *) 0 : (char const *) 0;
+  ++ccp;
+  p = (char**) ccp;
+  ccp = (char const *const *) p;
+  { /* SCO 3.2v4 cc rejects this.  */
+    char *t;
+    char const *s = 0 ? (char *) 0 : (char const *) 0;
+    *t++ = 0;
+  }
+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+    int x[] = {25, 17};
+    const int *foo = &x[0];
+    ++foo;
+  }
+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+    typedef const int *iptr;
+    iptr p = 0;
+    ++p;
+  }
+  { /* AIX XL C 1.02.0.0 rejects this saying
+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+    struct s { int j; const int *ap[3]; };
+    struct s *b; b->j = 5;
+  }
+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+    const int foo = 10;
+  }
+#endif
-  *t++ = 0;
+  ;
-}
+  return 0;
-{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-  int x[] = {25, 17};
-  const int *foo = &x[0];
-  ++foo;
-}
-{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-  typedef const int *iptr;
-  iptr p = 0;
-  ++p;
 }
-{ /* AIX XL C 1.02.0.0 rejects this saying
+_ACEOF
-     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+rm -f conftest.$ac_objext
-  struct s { int j; const int *ap[3]; };
+if { (eval echo "$as_me:4942: \"$ac_compile\"") >&5
-  struct s *b; b->j = 5;
+  (eval $ac_compile) 2>&5
-}
+  ac_status=$?
-{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+  echo "$as_me:4945: \$? = $ac_status" >&5
-  const int foo = 10;
+  (exit $ac_status); } &&
-}
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4948: \"$ac_try\"") >&5
-; return 0; }
+  (eval $ac_try) 2>&5
-EOF
+  ac_status=$?
-if { (eval echo configure:3433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo "$as_me:4951: \$? = $ac_status" >&5
-  rm -rf conftest*
+  (exit $ac_status); }; }; then
  ac_cv_c_const=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+ac_cv_c_const=no
-  ac_cv_c_const=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
+echo "$as_me:4961: result: $ac_cv_c_const" >&5
-echo "$ac_t""$ac_cv_c_const" 1>&6
+echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
-  cat >> confdefs.h <<\EOF
-#define const 
+cat >>confdefs.h <<\EOF
+#define const
 EOF
 fi
-echo $ac_n "checking for void * support""... $ac_c" 1>&6
+echo "$as_me:4971: checking for void * support" >&5
-echo "configure:3454: checking for void * support" >&5
+echo $ECHO_N "checking for void * support... $ECHO_C" >&6
-if eval "test \"`echo '$''{'emacs_cv_void_star'+set}'`\" = set"; then
+if test "${emacs_cv_void_star+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 3459 "configure"
+#line 4977 "configure"
 #include "confdefs.h"
-int main() {
+int
+main ()
+{
 void * foo;
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:3466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:4989: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:4992: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:4995: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:4998: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  emacs_cv_void_star=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+emacs_cv_void_star=no
-  emacs_cv_void_star=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
+echo "$as_me:5008: result: $emacs_cv_void_star" >&5
-echo "$ac_t""$emacs_cv_void_star" 1>&6
+echo "${ECHO_T}$emacs_cv_void_star" >&6
 if test $emacs_cv_void_star = yes; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define POINTER_TYPE void
 EOF
 else
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define POINTER_TYPE char
 EOF
 fi
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+echo "$as_me:5022: checking whether ${MAKE-make} sets \${MAKE}" >&5
-echo "configure:3492: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftestmake <<\EOF
+  cat >conftest.make <<\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=`
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
 if test -n "$ac_maketemp"; then
  eval ac_cv_prog_make_${ac_make}_set=yes
 else
  eval ac_cv_prog_make_${ac_make}_set=no
 fi
-rm -f conftestmake
+rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+  echo "$as_me:5042: result: yes" >&5
+echo "${ECHO_T}yes" >&6
  SET_MAKE=
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:5046: result: no" >&5
+echo "${ECHO_T}no" >&6
  SET_MAKE="MAKE=${MAKE-make}"
 fi
+echo "$as_me:5051: checking for long file names" >&5
-echo $ac_n "checking for long file names""... $ac_c" 1>&6
+echo $ECHO_N "checking for long file names... $ECHO_C" >&6
-echo "configure:3520: checking for long file names" >&5
+if test "${ac_cv_sys_long_file_names+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
  ac_cv_sys_long_file_names=yes
 # Test for long file names in all the places we know might matter:
@@ -3532,49 +5065,48 @@ else
 #      /var/tmp         likewise
 #      /usr/tmp         likewise
 if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then
-  ac_tmpdirs="$TMPDIR"
+  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 is less confusing to not echo anything here.
-  (echo 1 > $ac_dir/conftest9012345) 2>/dev/null
+  ac_xdir=$ac_dir/cf$$
-  (echo 2 > $ac_dir/conftest9012346) 2>/dev/null
+  (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue
-  val=`cat $ac_dir/conftest9012345 2>/dev/null`
+  ac_tf1=$ac_xdir/conftest9012345
-  if test ! -f $ac_dir/conftest9012345 || test "$val" != 1; then
+  ac_tf2=$ac_xdir/conftest9012346
+  (echo 1 >$ac_tf1) 2>/dev/null
+  (echo 2 >$ac_tf2) 2>/dev/null
+  ac_val=`cat $ac_tf1 2>/dev/null`
+  if test ! -f $ac_tf1 || test "$ac_val" != 1; then
    ac_cv_sys_long_file_names=no
-    rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>/dev/null
+    rm -rf $ac_xdir 2>/dev/null
    break
  fi
-  rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>/dev/null
+  rm -rf $ac_xdir 2>/dev/null
 done
 fi
+echo "$as_me:5090: result: $ac_cv_sys_long_file_names" >&5
-echo "$ac_t""$ac_cv_sys_long_file_names" 1>&6
+echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
 if test $ac_cv_sys_long_file_names = yes; then
-  cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define HAVE_LONG_FILE_NAMES 1
 EOF
 fi
 #### Choose a window system.
-# If we find X, set shell vars x_includes and x_libraries to the
+echo "$as_me:5102: checking for X" >&5
-# paths, otherwise set no_x=yes.
+echo $ECHO_N "checking for X... $ECHO_C" >&6
-# 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:3571: checking for X" >&5
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
  withval="$with_x"
-  :
-fi
+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.
@@ -3584,16 +5116,16 @@ else
    # Both variables are already set.
    have_x=yes
  else
-if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
+    if test "${ac_cv_have_x+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  # One or both of the vars are not set, and there is no cached value.
-ac_x_includes=NO ac_x_libraries=NO
+ac_x_includes=no ac_x_libraries=no
-rm -fr conftestdir
+rm -fr conftest.dir
-if mkdir conftestdir; then
+if mkdir conftest.dir; then
-  cd conftestdir
+  cd conftest.dir
  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-  cat > Imakefile <<'EOF'
+  cat >Imakefile <<'EOF'
 acfindx:
        @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
 EOF
@@ -3603,174 +5135,155 @@ EOF
    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
    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
+         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
+    case $ac_im_incroot in
        /usr/include) ;;
-        *) test -f "$ac_im_incroot/X11/Xos.h" && ac_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
+    case $ac_im_usrlibdir in
        /usr/lib | /lib) ;;
-        *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
+        *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
    esac
  fi
  cd ..
-  rm -fr conftestdir
+  rm -fr conftest.dir
 fi
-if test "$ac_x_includes" = NO; then
+# Standard set of common directories for X headers.
-  # Guess where to find include files, by looking for this one X11 .h file.
+# Check X11 before X11Rn because it is often a symlink to the current release.
-  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
+ac_x_header_dirs='
+/usr/X11/include
+/usr/X11R6/include
+/usr/X11R5/include
+/usr/X11R4/include
+/usr/include/X11
+/usr/include/X11R6
+/usr/include/X11R5
+/usr/include/X11R4
+/usr/local/X11/include
+/usr/local/X11R6/include
+/usr/local/X11R5/include
+/usr/local/X11R4/include
+/usr/local/include/X11
+/usr/local/include/X11R6
+/usr/local/include/X11R5
+/usr/local/include/X11R4
+/usr/X386/include
+/usr/x386/include
+/usr/XFree86/include/X11
+/usr/include
+/usr/local/include
+/usr/unsupported/include
+/usr/athena/include
+/usr/local/x11r5/include
+/usr/lpp/Xamples/include
+/usr/openwin/include
+/usr/openwin/share/include'
+if test "$ac_x_includes" = no; then
+  # Guess where to find include files, by looking for Intrinsic.h.
  # First, try using that file with no special directory specified.
-cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 3633 "configure"
+#line 5199 "configure"
 #include "confdefs.h"
-#include <$x_direct_test_include>
+#include <X11/Intrinsic.h>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:5203: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:3638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:5209: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
  # We can compile using X headers with no special include directory.
 ac_x_includes=
 else
-  echo "$ac_err" >&5
+  echo "$as_me: failed program was:" >&5
-  echo "configure: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  for ac_dir in $ac_x_header_dirs; do
-  # Look for the header file in a standard set of common directories.
+  if test -r "$ac_dir/X11/Intrinsic.h"; then
-# Check X11 before X11Rn because it is often a symlink to the current release.
+    ac_x_includes=$ac_dir
-  for ac_dir in               \
+    break
-    /usr/X11/include          \
+  fi
-    /usr/X11R6/include        \
+done
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
-                              \
-    /usr/include/X11          \
-    /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11/include    \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11    \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
-                              \
-    /usr/X386/include         \
-    /usr/x386/include         \
-    /usr/XFree86/include/X11  \
-                              \
-    /usr/include              \
-    /usr/local/include        \
-    /usr/unsupported/include  \
-    /usr/athena/include       \
-    /usr/local/x11r5/include  \
-    /usr/lpp/Xamples/include  \
-                              \
-    /usr/openwin/include      \
-    /usr/openwin/share/include \
-    ; \
-  do
-    if test -r "$ac_dir/$x_direct_test_include"; then
-      ac_x_includes=$ac_dir
-      break
-    fi
-  done
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
-fi # $ac_x_includes = NO
+fi # $ac_x_includes = no
-if test "$ac_x_libraries" = NO; then
+if test "$ac_x_libraries" = no; then
  # Check for the libraries.
-  test -z "$x_direct_test_library" && x_direct_test_library=Xt
-  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
  # See if we find them without any special options.
  # Don't add to $LIBS permanently.
-  ac_save_LIBS="$LIBS"
+  ac_save_LIBS=$LIBS
-  LIBS="-l$x_direct_test_library $LIBS"
+  LIBS="-lXt $LIBS"
-cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 3707 "configure"
+#line 5242 "configure"
 #include "confdefs.h"
+#include <X11/Intrinsic.h>
-int main() {
+int
-${x_direct_test_function}()
+main ()
-; return 0; }
+{
-EOF
+XtMalloc (0)
-if { (eval echo configure:3714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  ;
-  rm -rf conftest*
+  return 0;
-  LIBS="$ac_save_LIBS"
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5254: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5257: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5260: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5263: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+LIBS=$ac_save_LIBS
-  LIBS="$ac_save_LIBS"
+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
-# First see if replacing the include by lib works.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
-    /usr/X11/lib          \
-    /usr/X11R6/lib        \
-    /usr/X11R5/lib        \
-    /usr/X11R4/lib        \
-                          \
-    /usr/lib/X11          \
-    /usr/lib/X11R6        \
-    /usr/lib/X11R5        \
-    /usr/lib/X11R4        \
-                          \
-    /usr/local/X11/lib    \
-    /usr/local/X11R6/lib  \
-    /usr/local/X11R5/lib  \
-    /usr/local/X11R4/lib  \
-                          \
-    /usr/local/lib/X11    \
-    /usr/local/lib/X11R6  \
-    /usr/local/lib/X11R5  \
-    /usr/local/lib/X11R4  \
-                          \
-    /usr/X386/lib         \
-    /usr/x386/lib         \
-    /usr/XFree86/lib/X11  \
-                          \
-    /usr/lib              \
-    /usr/local/lib        \
-    /usr/unsupported/lib  \
-    /usr/athena/lib       \
-    /usr/local/x11r5/lib  \
-    /usr/lpp/Xamples/lib  \
-    /lib/usr/lib/X11      \
-                          \
-    /usr/openwin/lib      \
-    /usr/openwin/share/lib \
-    ; \
 do
+  # Don't even attempt the hair of trying to link an X program!
  for ac_extension in a so sl; do
-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
+    if test -r $ac_dir/libXt.$ac_extension; then
      ac_x_libraries=$ac_dir
      break 2
    fi
  done
 done
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi # $ac_x_libraries = NO
+fi # $ac_x_libraries = no
-if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
+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
@@ -3779,12 +5292,14 @@ else
                ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
 fi
 fi
  fi
  eval "$ac_cv_have_x"
 fi # $with_x != no
 if test "$have_x" != yes; then
-  echo "$ac_t""$have_x" 1>&6
+  echo "$as_me:5301: result: $have_x" >&5
+echo "${ECHO_T}$have_x" >&6
  no_x=yes
 else
  # If each of the values was on the command line, it overrides each guess.
@@ -3793,7 +5308,8 @@ else
  # 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
+  echo "$as_me:5311: result: libraries $x_libraries, headers $x_includes" >&5
+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 if test "$no_x" = yes; then
@@ -3866,7 +5382,7 @@ HAVE_MENUS=no
 case ${HAVE_X11} in
  yes ) HAVE_MENUS=yes ;;
 esac
-  
 if test "${opsys}" = "hpux9"; then
  case "${x_libraries}" in
    *X11R4* )
@@ -3890,130 +5406,173 @@ UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"
 # Assume not, until told otherwise.
 GNU_MALLOC=yes
 doug_lea_malloc=yes
-echo $ac_n "checking for malloc_get_state""... $ac_c" 1>&6
+echo "$as_me:5409: checking for malloc_get_state" >&5
-echo "configure:3895: checking for malloc_get_state" >&5
+echo $ECHO_N "checking for malloc_get_state... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_func_malloc_get_state'+set}'`\" = set"; then
+if test "${ac_cv_func_malloc_get_state+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 3900 "configure"
+#line 5415 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char malloc_get_state(); below.  */
+    which can conflict with char malloc_get_state (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char malloc_get_state();
+char malloc_get_state ();
+char (*f) ();
-int main() {
+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_malloc_get_state) || defined (__stub___malloc_get_state)
 choke me
 #else
-malloc_get_state();
+f = malloc_get_state;
 #endif
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:3923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+}
-  rm -rf conftest*
+_ACEOF
-  eval "ac_cv_func_malloc_get_state=yes"
+rm -f conftest.$ac_objext conftest$ac_exeext
-else
+if { (eval echo "$as_me:5446: \"$ac_link\"") >&5
-  echo "configure: failed program was:" >&5
+  (eval $ac_link) 2>&5
-  cat conftest.$ac_ext >&5
+  ac_status=$?
-  rm -rf conftest*
+  echo "$as_me:5449: \$? = $ac_status" >&5
-  eval "ac_cv_func_malloc_get_state=no"
+  (exit $ac_status); } &&
-fi
+         { ac_try='test -s conftest$ac_exeext'
-rm -f conftest*
+  { (eval echo "$as_me:5452: \"$ac_try\"") >&5
-fi
+  (eval $ac_try) 2>&5
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_func_'malloc_get_state`\" = yes"; then
+  echo "$as_me:5455: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
+  ac_cv_func_malloc_get_state=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_malloc_get_state=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:5465: result: $ac_cv_func_malloc_get_state" >&5
+echo "${ECHO_T}$ac_cv_func_malloc_get_state" >&6
+if test $ac_cv_func_malloc_get_state = yes; then
  :
 else
-  echo "$ac_t""no" 1>&6
+  doug_lea_malloc=no
-doug_lea_malloc=no
 fi
-echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
+echo "$as_me:5473: checking for malloc_set_state" >&5
-echo "configure:3944: checking for malloc_set_state" >&5
+echo $ECHO_N "checking for malloc_set_state... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_func_malloc_set_state'+set}'`\" = set"; then
+if test "${ac_cv_func_malloc_set_state+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 3949 "configure"
+#line 5479 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char malloc_set_state(); below.  */
+    which can conflict with char malloc_set_state (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char malloc_set_state();
+char malloc_set_state ();
+char (*f) ();
-int main() {
+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_malloc_set_state) || defined (__stub___malloc_set_state)
 choke me
 #else
-malloc_set_state();
+f = malloc_set_state;
 #endif
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:3972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+}
-  rm -rf conftest*
+_ACEOF
-  eval "ac_cv_func_malloc_set_state=yes"
+rm -f conftest.$ac_objext conftest$ac_exeext
-else
+if { (eval echo "$as_me:5510: \"$ac_link\"") >&5
-  echo "configure: failed program was:" >&5
+  (eval $ac_link) 2>&5
-  cat conftest.$ac_ext >&5
+  ac_status=$?
-  rm -rf conftest*
+  echo "$as_me:5513: \$? = $ac_status" >&5
-  eval "ac_cv_func_malloc_set_state=no"
+  (exit $ac_status); } &&
-fi
+         { ac_try='test -s conftest$ac_exeext'
-rm -f conftest*
+  { (eval echo "$as_me:5516: \"$ac_try\"") >&5
-fi
+  (eval $ac_try) 2>&5
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_func_'malloc_set_state`\" = yes"; then
+  echo "$as_me:5519: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
+  ac_cv_func_malloc_set_state=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_malloc_set_state=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:5529: result: $ac_cv_func_malloc_set_state" >&5
+echo "${ECHO_T}$ac_cv_func_malloc_set_state" >&6
+if test $ac_cv_func_malloc_set_state = yes; then
  :
 else
-  echo "$ac_t""no" 1>&6
+  doug_lea_malloc=no
-doug_lea_malloc=no
 fi
-echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
+echo "$as_me:5537: checking whether __after_morecore_hook exists" >&5
-echo "configure:3993: checking whether __after_morecore_hook exists" >&5
+echo $ECHO_N "checking whether __after_morecore_hook exists... $ECHO_C" >&6
-if eval "test \"`echo '$''{'emacs_cv_var___after_morecore_hook'+set}'`\" = set"; then
+if test "${emacs_cv_var___after_morecore_hook+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 3998 "configure"
+#line 5543 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
-int main() {
+int
+main ()
+{
 __after_morecore_hook = 0
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:4005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5555: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5558: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5561: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5564: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  emacs_cv_var___after_morecore_hook=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+emacs_cv_var___after_morecore_hook=no
-  emacs_cv_var___after_morecore_hook=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
+echo "$as_me:5574: result: $emacs_cv_var___after_morecore_hook" >&5
-echo "$ac_t""$emacs_cv_var___after_morecore_hook" 1>&6
+echo "${ECHO_T}$emacs_cv_var___after_morecore_hook" >&6
 if test $emacs_cv_var___after_morecore_hook = no; then
  doug_lea_malloc=no
 fi
@@ -4027,7 +5586,7 @@ if test "$doug_lea_malloc" = "yes" ; then
    GNU_MALLOC_reason="
      (Using Doug Lea's new malloc from the GNU C Library.)"
  fi
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define DOUG_LEA_MALLOC 1
 EOF
@@ -4037,113 +5596,182 @@ if test x"${REL_ALLOC}" = x; then
  REL_ALLOC=${GNU_MALLOC}
 fi
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+                  inttypes.h stdint.h unistd.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:5605: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 5611 "configure"
+#include "confdefs.h"
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:5617: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:5620: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:5623: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5626: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:5636: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+EOF
+fi
+done
-for ac_hdr in stdlib.h unistd.h sys/stat.h
+for ac_header in stdlib.h unistd.h
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "$as_me:5649: checking for $ac_header" >&5
-echo "configure:4046: checking for $ac_hdr" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 4051 "configure"
+#line 5655 "configure"
-#include "confdefs.h"
+#include "confdefs.h"
-#include <$ac_hdr>
+#include <$ac_header>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:5659: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:4056: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
-else
+  echo "$as_me:5665: \$? = $ac_status" >&5
-  echo "$ac_err" >&5
+  (exit $ac_status); } >/dev/null; then
-  echo "configure: failed program was:" >&5
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  eval "$as_ac_Header=no"
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:5684: result: `eval echo '${'$as_ac_Header'}'`" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >> confdefs.h <<EOF
+  cat >>confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 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
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "configure:4085: checking for $ac_func" >&5
+echo "$as_me:5697: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 4090 "configure"
+#line 5703 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
+    which can conflict with char $ac_func (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char $ac_func();
+char $ac_func ();
+char (*f) ();
-int main() {
+int
+main ()
+{
 /* The GNU C library defines this for functions which it implements
    to always fail with ENOSYS.  Some functions are actually named
    something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
-; return 0; }
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:5734: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5737: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:5740: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5743: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:5753: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
-if { (eval echo configure:4113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-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*
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
 fi
 done
-echo $ac_n "checking for working mmap""... $ac_c" 1>&6
+echo "$as_me:5763: checking for working mmap" >&5
-echo "configure:4138: checking for working mmap" >&5
+echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  if test "$cross_compiling" = yes; then
  ac_cv_func_mmap_fixed_mapped=no
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 4146 "configure"
+#line 5772 "configure"
 #include "confdefs.h"
+$ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
   Here is a matrix of mmap possibilities:
        mmap private not fixed
@@ -4165,21 +5793,13 @@ else
   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>
-#if STDC_HEADERS || HAVE_STDLIB_H
+#if !STDC_HEADERS && !HAVE_STDLIB_H
-# include <stdlib.h>
-#else
 char *malloc ();
 #endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
 /* This mess was copied from the GNU getpagesize.h.  */
 #if !HAVE_GETPAGESIZE
@@ -4234,7 +5854,7 @@ main ()
  for (i = 0; i < pagesize; ++i)
    *(data + i) = rand ();
  umask (0);
-  fd = creat ("conftestmmap", 0600);
+  fd = creat ("conftest.mmap", 0600);
  if (fd < 0)
    exit (1);
  if (write (fd, data, pagesize) != pagesize)
@@ -4244,7 +5864,7 @@ main ()
  /* 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);
+  fd = open ("conftest.mmap", O_RDWR);
  if (fd < 0)
    exit (1);
  data2 = (char *) malloc (2 * pagesize);
@@ -4272,31 +5892,40 @@ main ()
    if (*(data + i) != *(data3 + i))
      exit (1);
  close (fd);
-  unlink ("conftestmmap");
  exit (0);
 }
-EOF
+_ACEOF
-if { (eval echo configure:4280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+rm -f conftest$ac_exeext
-then
+if { (eval echo "$as_me:5899: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:5902: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:5904: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:5907: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  ac_cv_func_mmap_fixed_mapped=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
-  cat conftest.$ac_ext >&5
+echo "$as_me: failed program was:" >&5
-  rm -fr conftest*
+cat conftest.$ac_ext >&5
-  ac_cv_func_mmap_fixed_mapped=no
+ac_cv_func_mmap_fixed_mapped=no
 fi
-rm -fr conftest*
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
+echo "$as_me:5919: result: $ac_cv_func_mmap_fixed_mapped" >&5
-echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6
+echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
-  cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define HAVE_MMAP 1
 EOF
 fi
+rm -f conftest.mmap
 if test $use_mmap_for_buffers = yes; then
  REL_ALLOC=no
@@ -4304,148 +5933,178 @@ fi
 LIBS="$libsrc_libs $LIBS"
-echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
+echo "$as_me:5936: checking for dnet_ntoa in -ldnet" >&5
-echo "configure:4309: checking for dnet_ntoa in -ldnet" >&5
+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
-ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 4317 "configure"
+#line 5944 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char dnet_ntoa();
+char dnet_ntoa ();
+int
-int main() {
+main ()
-dnet_ntoa()
+{
-; return 0; }
+dnet_ntoa ();
-EOF
+  ;
-if { (eval echo configure:4328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:5963: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:5966: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:5969: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:5972: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
-    ac_tr_lib=HAVE_LIB`echo dnet | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+  ac_cv_lib_dnet_dnet_ntoa=yes
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+else
-  cat >> confdefs.h <<EOF
+  echo "$as_me: failed program was:" >&5
-#define $ac_tr_lib 1
+cat conftest.$ac_ext >&5
+ac_cv_lib_dnet_dnet_ntoa=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:5983: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBDNET 1
 EOF
  LIBS="-ldnet $LIBS"
-else
-  echo "$ac_t""no" 1>&6
 fi
+echo "$as_me:5994: checking for main in -lXbsd" >&5
-echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
+echo $ECHO_N "checking for main in -lXbsd... $ECHO_C" >&6
-echo "configure:4357: checking for main in -lXbsd" >&5
+if test "${ac_cv_lib_Xbsd_main+set}" = set; then
-ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXbsd  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 4365 "configure"
+#line 6002 "configure"
 #include "confdefs.h"
-int main() {
+int
-main()
+main ()
-; return 0; }
+{
-EOF
+main ();
-if { (eval echo configure:4372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  ;
-  rm -rf conftest*
+  return 0;
-  eval "ac_cv_lib_$ac_lib_var=yes"
+}
-else
+_ACEOF
-  echo "configure: failed program was:" >&5
+rm -f conftest.$ac_objext conftest$ac_exeext
-  cat conftest.$ac_ext >&5
+if { (eval echo "$as_me:6014: \"$ac_link\"") >&5
-  rm -rf conftest*
+  (eval $ac_link) 2>&5
-  eval "ac_cv_lib_$ac_lib_var=no"
+  ac_status=$?
-fi
+  echo "$as_me:6017: \$? = $ac_status" >&5
-rm -f conftest*
+  (exit $ac_status); } &&
-LIBS="$ac_save_LIBS"
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:6020: \"$ac_try\"") >&5
-fi
+  (eval $ac_try) 2>&5
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  ac_status=$?
-  echo "$ac_t""yes" 1>&6
+  echo "$as_me:6023: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_Xbsd_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_Xbsd_main=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:6034: result: $ac_cv_lib_Xbsd_main" >&5
+echo "${ECHO_T}$ac_cv_lib_Xbsd_main" >&6
+if test $ac_cv_lib_Xbsd_main = yes; then
  LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd"
-else
-  echo "$ac_t""no" 1>&6
 fi
+echo "$as_me:6040: checking for cma_open in -lpthreads" >&5
-echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
+echo $ECHO_N "checking for cma_open in -lpthreads... $ECHO_C" >&6
-echo "configure:4394: checking for cma_open in -lpthreads" >&5
+if test "${ac_cv_lib_pthreads_cma_open+set}" = set; then
-ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthreads  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 4402 "configure"
+#line 6048 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char cma_open();
+char cma_open ();
+int
-int main() {
+main ()
-cma_open()
+{
-; return 0; }
+cma_open ();
-EOF
+  ;
-if { (eval echo configure:4413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:6067: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:6070: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:6073: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:6076: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
-    ac_tr_lib=HAVE_LIB`echo pthreads | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+  ac_cv_lib_pthreads_cma_open=yes
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+else
-  cat >> confdefs.h <<EOF
+  echo "$as_me: failed program was:" >&5
-#define $ac_tr_lib 1
+cat conftest.$ac_ext >&5
+ac_cv_lib_pthreads_cma_open=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:6087: result: $ac_cv_lib_pthreads_cma_open" >&5
+echo "${ECHO_T}$ac_cv_lib_pthreads_cma_open" >&6
+if test $ac_cv_lib_pthreads_cma_open = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBPTHREADS 1
 EOF
  LIBS="-lpthreads $LIBS"
-else
-  echo "$ac_t""no" 1>&6
 fi
+echo "$as_me:6098: checking for XFree86 in /usr/X386" >&5
-echo $ac_n "checking for XFree86 in /usr/X386""... $ac_c" 1>&6
+echo $ECHO_N "checking for XFree86 in /usr/X386... $ECHO_C" >&6
-echo "configure:4442: checking for XFree86 in /usr/X386" >&5
 if test -d /usr/X386/include; then
  HAVE_XFREE386=yes
  : ${C_SWITCH_X_SITE="-I/usr/X386/include"}
 else
  HAVE_XFREE386=no
 fi
-echo "$ac_t""$HAVE_XFREE386" 1>&6
+echo "$as_me:6106: result: $HAVE_XFREE386" >&5
+echo "${ECHO_T}$HAVE_XFREE386" >&6
 # 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.
@@ -4469,26 +6128,39 @@ if test "${HAVE_X11}" = "yes"; then
  fi
  if test "${opsys}" = "gnu-linux"; then
-    echo $ac_n "checking whether X on GNU/Linux needs -b to link""... $ac_c" 1>&6
+    echo "$as_me:6131: checking whether X on GNU/Linux needs -b to link" >&5
-echo "configure:4474: checking whether X on GNU/Linux needs -b to link" >&5
+echo $ECHO_N "checking whether X on GNU/Linux needs -b to link... $ECHO_C" >&6
-    cat > conftest.$ac_ext <<EOF
+    cat >conftest.$ac_ext <<_ACEOF
-#line 4476 "configure"
+#line 6134 "configure"
 #include "confdefs.h"
-int main() {
+int
+main ()
+{
 XOpenDisplay ("foo");
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:4483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:6146: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6149: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:6152: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6155: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  xlinux_first_failure=no
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+xlinux_first_failure=yes
-  xlinux_first_failure=yes
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
    if test "${xlinux_first_failure}" = "yes"; then
      OLD_LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE"
      OLD_C_SWITCH_X_SITE="$C_SWITCH_X_SITE"
@@ -4498,24 +6170,37 @@ rm -f conftest*
      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
+      cat >conftest.$ac_ext <<_ACEOF
-#line 4503 "configure"
+#line 6174 "configure"
 #include "confdefs.h"
-int main() {
+int
+main ()
+{
 XOpenDisplay ("foo");
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:4510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:6186: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6189: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:6192: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6195: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  xlinux_second_failure=no
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+xlinux_second_failure=yes
-  xlinux_second_failure=yes
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
      if test "${xlinux_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.
@@ -4523,220 +6208,296 @@ rm -f conftest*
        C_SWITCH_X_SITE="$OLD_C_SWITCH_X_SITE"
        CPPFLAGS="$OLD_CPPFLAGS"
        LIBS="$OLD_LIBS"
-        echo "$ac_t""no" 1>&6
+        echo "$as_me:6211: result: no" >&5
+echo "${ECHO_T}no" >&6
      else
-        echo "$ac_t""yes" 1>&6
+        echo "$as_me:6214: result: yes" >&5
+echo "${ECHO_T}yes" >&6
      fi
    else
-      echo "$ac_t""no" 1>&6
+      echo "$as_me:6218: result: no" >&5
+echo "${ECHO_T}no" >&6
    fi
  fi
  # Reportedly, some broken Solaris systems have XKBlib.h but are missing
  # header files included from there.
-  echo $ac_n "checking for Xkb""... $ac_c" 1>&6
+  echo "$as_me:6225: checking for Xkb" >&5
-echo "configure:4539: checking for Xkb" >&5
+echo $ECHO_N "checking for Xkb... $ECHO_C" >&6
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 4541 "configure"
+#line 6228 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
-int main() {
+int
+main ()
+{
 XkbDescPtr kb = XkbGetKeyboard (0, XkbAllComponentsMask, XkbUseCoreKbd);
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:4549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:6241: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6244: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:6247: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6250: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  emacs_xkb=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+emacs_xkb=no
-  emacs_xkb=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  echo "$ac_t""$emacs_xkb" 1>&6
+  echo "$as_me:6259: result: $emacs_xkb" >&5
+echo "${ECHO_T}$emacs_xkb" >&6
  if test $emacs_xkb = yes; then
-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\EOF
 #define HAVE_XKBGETKEYBOARD 1
 EOF
  fi
-  for ac_func in XrmSetDatabase XScreenResourceString \
+for ac_func in XrmSetDatabase XScreenResourceString \
 XScreenNumberOfScreen XSetWMProtocols
 do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "configure:4571: checking for $ac_func" >&5
+echo "$as_me:6272: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 4576 "configure"
+#line 6278 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
+    which can conflict with char $ac_func (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char $ac_func();
+char $ac_func ();
+char (*f) ();
-int main() {
+int
+main ()
+{
 /* The GNU C library defines this for functions which it implements
    to always fail with ENOSYS.  Some functions are actually named
    something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
-; return 0; }
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:6309: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6312: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:6315: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6318: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:6328: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
-if { (eval echo configure:4599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-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*
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
 fi
 done
 fi
 if test "${window_system}" = "x11"; then
-  echo $ac_n "checking X11 version 6""... $ac_c" 1>&6
+  echo "$as_me:6341: checking X11 version 6" >&5
-echo "configure:4627: checking X11 version 6" >&5
+echo $ECHO_N "checking X11 version 6... $ECHO_C" >&6
-  if eval "test \"`echo '$''{'emacs_cv_x11_version_6'+set}'`\" = set"; then
+  if test "${emacs_cv_x11_version_6+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 4632 "configure"
+#line 6347 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
-int main() {
+int
+main ()
+{
 #if XlibSpecificationRelease < 6
 fail;
 #endif
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:4642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:6362: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6365: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:6368: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6371: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  emacs_cv_x11_version_6=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+emacs_cv_x11_version_6=no
-  emacs_cv_x11_version_6=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
  if test $emacs_cv_x11_version_6 = yes; then
-    echo "$ac_t""6 or newer" 1>&6
+    echo "$as_me:6383: result: 6 or newer" >&5
-    cat >> confdefs.h <<\EOF
+echo "${ECHO_T}6 or newer" >&6
+    cat >>confdefs.h <<\EOF
 #define HAVE_X11R6 1
 EOF
  else
-    echo "$ac_t""before 6" 1>&6
+    echo "$as_me:6390: result: before 6" >&5
+echo "${ECHO_T}before 6" >&6
  fi
 fi
 if test "${window_system}" = "x11"; then
-  echo $ac_n "checking X11 version 5""... $ac_c" 1>&6
+  echo "$as_me:6396: checking X11 version 5" >&5
-echo "configure:4667: checking X11 version 5" >&5
+echo $ECHO_N "checking X11 version 5... $ECHO_C" >&6
-  if eval "test \"`echo '$''{'emacs_cv_x11_version_5'+set}'`\" = set"; then
+  if test "${emacs_cv_x11_version_5+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 4672 "configure"
+#line 6402 "configure"
 #include "confdefs.h"
 #include <X11/Xlib.h>
-int main() {
+int
+main ()
+{
 #if XlibSpecificationRelease < 5
 fail;
 #endif
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:4682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:6417: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6420: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:6423: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6426: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  emacs_cv_x11_version_5=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+emacs_cv_x11_version_5=no
-  emacs_cv_x11_version_5=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
  if test $emacs_cv_x11_version_5 = yes; then
-    echo "$ac_t""5 or newer" 1>&6
+    echo "$as_me:6438: result: 5 or newer" >&5
+echo "${ECHO_T}5 or newer" >&6
    HAVE_X11R5=yes
-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\EOF
 #define HAVE_X11R5 1
 EOF
  else
    HAVE_X11R5=no
-    echo "$ac_t""before 5" 1>&6
+    echo "$as_me:6447: result: before 5" >&5
+echo "${ECHO_T}before 5" >&6
  fi
 fi
 if test x"${USE_X_TOOLKIT}" = xmaybe; then
  if test x"${HAVE_X11R5}" = xyes; then
-    echo $ac_n "checking X11 version 5 with Xaw""... $ac_c" 1>&6
+    echo "$as_me:6454: checking X11 version 5 with Xaw" >&5
-echo "configure:4710: checking X11 version 5 with Xaw" >&5
+echo $ECHO_N "checking X11 version 5 with Xaw... $ECHO_C" >&6
-    if eval "test \"`echo '$''{'emacs_cv_x11_version_5_with_xaw'+set}'`\" = set"; then
+    if test "${emacs_cv_x11_version_5_with_xaw+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 4715 "configure"
+#line 6460 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 #include <X11/Xaw/Simple.h>
-int main() {
+int
+main ()
+{
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:4724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:6474: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6477: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:6480: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6483: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  emacs_cv_x11_version_5_with_xaw=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+emacs_cv_x11_version_5_with_xaw=no
-  emacs_cv_x11_version_5_with_xaw=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
    if test $emacs_cv_x11_version_5_with_xaw = yes; then
-      echo "$ac_t""5 or newer, with Xaw; use toolkit by default" 1>&6
+      echo "$as_me:6495: result: 5 or newer, with Xaw; use toolkit by default" >&5
+echo "${ECHO_T}5 or newer, with Xaw; use toolkit by default" >&6
      USE_X_TOOLKIT=LUCID
    else
-      echo "$ac_t""before 5 or no Xaw; do not use toolkit by default" 1>&6
+      echo "$as_me:6499: result: before 5 or no Xaw; do not use toolkit by default" >&5
+echo "${ECHO_T}before 5 or no Xaw; do not use toolkit by default" >&6
      USE_X_TOOLKIT=none
    fi
  else
@@ -4747,43 +6508,58 @@ fi
 X_TOOLKIT_TYPE=$USE_X_TOOLKIT
 if test "${USE_X_TOOLKIT}" != "none"; then
-  echo $ac_n "checking X11 toolkit version""... $ac_c" 1>&6
+  echo "$as_me:6511: checking X11 toolkit version" >&5
-echo "configure:4752: checking X11 toolkit version" >&5
+echo $ECHO_N "checking X11 toolkit version... $ECHO_C" >&6
-  if eval "test \"`echo '$''{'emacs_cv_x11_toolkit_version_6'+set}'`\" = set"; then
+  if test "${emacs_cv_x11_toolkit_version_6+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 4757 "configure"
+#line 6517 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
-int main() {
+int
+main ()
+{
 #if XtSpecificationRelease < 6
 fail;
 #endif
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:4767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:6532: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:6535: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:6538: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6541: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  emacs_cv_x11_toolkit_version_6=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+emacs_cv_x11_toolkit_version_6=no
-  emacs_cv_x11_toolkit_version_6=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
  HAVE_X11XTR6=$emacs_cv_x11_toolkit_version_6
  if test $emacs_cv_x11_toolkit_version_6 = yes; then
-    echo "$ac_t""6 or newer" 1>&6
+    echo "$as_me:6554: result: 6 or newer" >&5
-    cat >> confdefs.h <<\EOF
+echo "${ECHO_T}6 or newer" >&6
+    cat >>confdefs.h <<\EOF
 #define HAVE_X11XTR6 1
 EOF
  else
-    echo "$ac_t""before 6" 1>&6
+    echo "$as_me:6561: result: before 6" >&5
+echo "${ECHO_T}before 6" >&6
  fi
  OLDLIBS="$LIBS"
@@ -4792,51 +6568,63 @@ EOF
  else
    LIBS="-lXt $LIBS"
  fi
-  echo $ac_n "checking for XmuConvertStandardSelection in -lXmu""... $ac_c" 1>&6
-echo "configure:4797: checking for XmuConvertStandardSelection in -lXmu" >&5
+echo "$as_me:6572: checking for XmuConvertStandardSelection in -lXmu" >&5
-ac_lib_var=`echo Xmu'_'XmuConvertStandardSelection | sed 'y%./+-%__p_%'`
+echo $ECHO_N "checking for XmuConvertStandardSelection in -lXmu... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if test "${ac_cv_lib_Xmu_XmuConvertStandardSelection+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXmu  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 4805 "configure"
+#line 6580 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char XmuConvertStandardSelection();
+char XmuConvertStandardSelection ();
+int
-int main() {
+main ()
-XmuConvertStandardSelection()
+{
-; return 0; }
+XmuConvertStandardSelection ();
-EOF
+  ;
-if { (eval echo configure:4816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:6599: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:6602: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:6605: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:6608: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
-    ac_tr_lib=HAVE_LIB`echo Xmu | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+  ac_cv_lib_Xmu_XmuConvertStandardSelection=yes
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+else
-  cat >> confdefs.h <<EOF
+  echo "$as_me: failed program was:" >&5
-#define $ac_tr_lib 1
+cat conftest.$ac_ext >&5
+ac_cv_lib_Xmu_XmuConvertStandardSelection=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:6619: result: $ac_cv_lib_Xmu_XmuConvertStandardSelection" >&5
+echo "${ECHO_T}$ac_cv_lib_Xmu_XmuConvertStandardSelection" >&6
+if test $ac_cv_lib_Xmu_XmuConvertStandardSelection = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBXMU 1
 EOF
  LIBS="-lXmu $LIBS"
-else
-  echo "$ac_t""no" 1>&6
 fi
  test $ac_cv_lib_Xmu_XmuConvertStandardSelection = no && LIBS="$OLDLIBS"
@@ -4845,140 +6633,178 @@ fi
 # On Irix 6.5, at least, we need XShapeQueryExtension from -lXext for Xaw3D.
 if test "${HAVE_X11}" = "yes"; then
  if test "${USE_X_TOOLKIT}" != "none"; then
-    echo $ac_n "checking for XShapeQueryExtension in -lXext""... $ac_c" 1>&6
-echo "configure:4850: checking for XShapeQueryExtension in -lXext" >&5
+echo "$as_me:6637: checking for XShapeQueryExtension in -lXext" >&5
-ac_lib_var=`echo Xext'_'XShapeQueryExtension | sed 'y%./+-%__p_%'`
+echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 4858 "configure"
+#line 6645 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char XShapeQueryExtension();
+char XShapeQueryExtension ();
+int
-int main() {
+main ()
-XShapeQueryExtension()
+{
-; return 0; }
+XShapeQueryExtension ();
-EOF
+  ;
-if { (eval echo configure:4869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:6664: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:6667: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:6670: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:6673: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
-    ac_tr_lib=HAVE_LIB`echo Xext | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+  ac_cv_lib_Xext_XShapeQueryExtension=yes
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+else
-  cat >> confdefs.h <<EOF
+  echo "$as_me: failed program was:" >&5
-#define $ac_tr_lib 1
+cat conftest.$ac_ext >&5
+ac_cv_lib_Xext_XShapeQueryExtension=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:6684: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
+echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6
+if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBXEXT 1
 EOF
  LIBS="-lXext $LIBS"
-else
-  echo "$ac_t""no" 1>&6
 fi
  fi
 fi
 if test "${USE_X_TOOLKIT}" = "MOTIF"; then
-  echo $ac_n "checking for Motif version 2.1""... $ac_c" 1>&6
+  echo "$as_me:6699: checking for Motif version 2.1" >&5
-echo "configure:4901: checking for Motif version 2.1" >&5
+echo $ECHO_N "checking for Motif version 2.1... $ECHO_C" >&6
-if eval "test \"`echo '$''{'emacs_cv_motif_version_2_1'+set}'`\" = set"; then
+if test "${emacs_cv_motif_version_2_1+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 4906 "configure"
+#line 6705 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
-int main() {
+int
+main ()
+{
 #if XmVERSION > 2 || (XmVERSION == 2 && XmREVISION >= 1)
 int x = 5;
 #else
 Motif version prior to 2.1.
 #endif
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:4917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:6721: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:6724: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:6727: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:6730: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  emacs_cv_motif_version_2_1=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+emacs_cv_motif_version_2_1=no
-  emacs_cv_motif_version_2_1=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
+echo "$as_me:6740: result: $emacs_cv_motif_version_2_1" >&5
-echo "$ac_t""$emacs_cv_motif_version_2_1" 1>&6
+echo "${ECHO_T}$emacs_cv_motif_version_2_1" >&6
  HAVE_MOTIF_2_1=$emacs_cv_motif_version_2_1
  if test $emacs_cv_motif_version_2_1 = yes; then
    HAVE_LIBXP=no
-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\EOF
 #define HAVE_MOTIF_2_1 1
 EOF
-    echo $ac_n "checking for XpCreateContext in -lXp""... $ac_c" 1>&6
+    echo "$as_me:6749: checking for XpCreateContext in -lXp" >&5
-echo "configure:4938: checking for XpCreateContext in -lXp" >&5
+echo $ECHO_N "checking for XpCreateContext in -lXp... $ECHO_C" >&6
-ac_lib_var=`echo Xp'_'XpCreateContext | sed 'y%./+-%__p_%'`
+if test "${ac_cv_lib_Xp_XpCreateContext+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXp  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 4946 "configure"
+#line 6757 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char XpCreateContext();
+char XpCreateContext ();
+int
-int main() {
+main ()
-XpCreateContext()
+{
-; return 0; }
+XpCreateContext ();
-EOF
+  ;
-if { (eval echo configure:4957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:6776: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:6779: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:6782: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:6785: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
+  ac_cv_lib_Xp_XpCreateContext=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_Xp_XpCreateContext=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:6796: result: $ac_cv_lib_Xp_XpCreateContext" >&5
+echo "${ECHO_T}$ac_cv_lib_Xp_XpCreateContext" >&6
+if test $ac_cv_lib_Xp_XpCreateContext = yes; then
  HAVE_LIBXP=yes
-else
-  echo "$ac_t""no" 1>&6
 fi
    if test ${HAVE_LIBXP} = yes; then
-      cat >> confdefs.h <<\EOF
+      cat >>confdefs.h <<\EOF
 #define HAVE_LIBXP 1
 EOF
-    fi  
+    fi
  fi
 fi
@@ -4986,100 +6812,120 @@ fi
 HAVE_XAW3D=no
 if test "${HAVE_X11}" = "yes"; then
  if test "${USE_X_TOOLKIT}" != "none"; then
-    ac_safe=`echo "X11/Xaw3d/Scrollbar.h" | sed 'y%./+-%__p_%'`
+    echo "$as_me:6815: checking for X11/Xaw3d/Scrollbar.h" >&5
-echo $ac_n "checking for X11/Xaw3d/Scrollbar.h""... $ac_c" 1>&6
+echo $ECHO_N "checking for X11/Xaw3d/Scrollbar.h... $ECHO_C" >&6
-echo "configure:4992: checking for X11/Xaw3d/Scrollbar.h" >&5
+if test "${ac_cv_header_X11_Xaw3d_Scrollbar_h+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 4997 "configure"
+#line 6821 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/Scrollbar.h>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:6825: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:5002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
+  echo "$as_me:6831: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
 else
-  echo "$ac_err" >&5
+  ac_cpp_err=yes
-  echo "configure: failed program was:" >&5
+fi
+if test -z "$ac_cpp_err"; then
+  ac_cv_header_X11_Xaw3d_Scrollbar_h=yes
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  ac_cv_header_X11_Xaw3d_Scrollbar_h=no
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:6850: result: $ac_cv_header_X11_Xaw3d_Scrollbar_h" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}$ac_cv_header_X11_Xaw3d_Scrollbar_h" >&6
-  echo $ac_n "checking for XawScrollbarSetThumb in -lXaw3d""... $ac_c" 1>&6
+if test $ac_cv_header_X11_Xaw3d_Scrollbar_h = yes; then
-echo "configure:5019: checking for XawScrollbarSetThumb in -lXaw3d" >&5
+  echo "$as_me:6853: checking for XawScrollbarSetThumb in -lXaw3d" >&5
-ac_lib_var=`echo Xaw3d'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
+echo $ECHO_N "checking for XawScrollbarSetThumb in -lXaw3d... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if test "${ac_cv_lib_Xaw3d_XawScrollbarSetThumb+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXaw3d  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 5027 "configure"
+#line 6861 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char XawScrollbarSetThumb();
+char XawScrollbarSetThumb ();
+int
-int main() {
+main ()
-XawScrollbarSetThumb()
+{
-; return 0; }
+XawScrollbarSetThumb ();
-EOF
+  ;
-if { (eval echo configure:5038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:6880: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:6883: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:6886: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:6889: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
+  ac_cv_lib_Xaw3d_XawScrollbarSetThumb=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_Xaw3d_XawScrollbarSetThumb=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:6900: result: $ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&5
+echo "${ECHO_T}$ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&6
+if test $ac_cv_lib_Xaw3d_XawScrollbarSetThumb = yes; then
  HAVE_XAW3D=yes
-else
-  echo "$ac_t""no" 1>&6
 fi
-else
-  echo "$ac_t""no" 1>&6
 fi
    if test "${HAVE_XAW3D}" = "yes"; then
-        cat >> confdefs.h <<\EOF
+        cat >>confdefs.h <<\EOF
 #define HAVE_XAW3D 1
 EOF
    fi
  fi
 fi
-  
 USE_TOOLKIT_SCROLL_BARS=no
 if test "${with_toolkit_scroll_bars}" != "no"; then
  if test "${USE_X_TOOLKIT}" != "none"; then
    if test "${USE_X_TOOLKIT}" = "MOTIF"; then
-      cat >> confdefs.h <<\EOF
+      cat >>confdefs.h <<\EOF
 #define USE_TOOLKIT_SCROLL_BARS 1
 EOF
      HAVE_XAW3D=no
      USE_TOOLKIT_SCROLL_BARS=yes
    elif test "${HAVE_XAW3D}" = "yes"; then
-      cat >> confdefs.h <<\EOF
+      cat >>confdefs.h <<\EOF
 #define USE_TOOLKIT_SCROLL_BARS 1
 EOF
@@ -5088,9 +6934,8 @@ EOF
  fi
 fi
 if test "${with_xim}" != "no"; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define USE_XIM 1
 EOF
@@ -5100,458 +6945,562 @@ fi
 HAVE_XPM=no
 if test "${HAVE_X11}" = "yes"; then
  if test "${with_xpm}" != "no"; then
-    ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'`
+    echo "$as_me:6948: checking for X11/xpm.h" >&5
-echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6
+echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6
-echo "configure:5106: checking for X11/xpm.h" >&5
+if test "${ac_cv_header_X11_xpm_h+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 5111 "configure"
+#line 6954 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:6958: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:5116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
+  echo "$as_me:6964: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_cv_header_X11_xpm_h=yes
 else
-  echo "$ac_err" >&5
+  echo "$as_me: failed program was:" >&5
-  echo "configure: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  ac_cv_header_X11_xpm_h=no
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:6983: result: $ac_cv_header_X11_xpm_h" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6
-  echo $ac_n "checking for XpmReadFileToPixmap in -lXpm""... $ac_c" 1>&6
+if test $ac_cv_header_X11_xpm_h = yes; then
-echo "configure:5133: checking for XpmReadFileToPixmap in -lXpm" >&5
+  echo "$as_me:6986: checking for XpmReadFileToPixmap in -lXpm" >&5
-ac_lib_var=`echo Xpm'_'XpmReadFileToPixmap | sed 'y%./+-%__p_%'`
+echo $ECHO_N "checking for XpmReadFileToPixmap in -lXpm... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if test "${ac_cv_lib_Xpm_XpmReadFileToPixmap+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm -lX11 $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 5141 "configure"
+#line 6994 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char XpmReadFileToPixmap();
+char XpmReadFileToPixmap ();
+int
-int main() {
+main ()
-XpmReadFileToPixmap()
+{
-; return 0; }
+XpmReadFileToPixmap ();
-EOF
+  ;
-if { (eval echo configure:5152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:7013: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:7016: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:7019: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:7022: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
+  ac_cv_lib_Xpm_XpmReadFileToPixmap=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_Xpm_XpmReadFileToPixmap=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:7033: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5
+echo "${ECHO_T}$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&6
+if test $ac_cv_lib_Xpm_XpmReadFileToPixmap = yes; then
  HAVE_XPM=yes
-else
-  echo "$ac_t""no" 1>&6
 fi
-else
-  echo "$ac_t""no" 1>&6
 fi
    if test "${HAVE_XPM}" = "yes"; then
-      echo $ac_n "checking for XpmReturnAllocPixels preprocessor define""... $ac_c" 1>&6
+      echo "$as_me:7042: checking for XpmReturnAllocPixels preprocessor define" >&5
-echo "configure:5178: checking for XpmReturnAllocPixels preprocessor define" >&5
+echo $ECHO_N "checking for XpmReturnAllocPixels preprocessor define... $ECHO_C" >&6
-      cat > conftest.$ac_ext <<EOF
+      cat >conftest.$ac_ext <<_ACEOF
-#line 5180 "configure"
+#line 7045 "configure"
 #include "confdefs.h"
 #include "X11/xpm.h"
 #ifndef XpmReturnAllocPixels
 no_return_alloc_pixels
 #endif
-      
-EOF
+_ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  egrep "no_return_alloc_pixels" >/dev/null 2>&1; then
-  rm -rf conftest*
  HAVE_XPM=no
 else
-  rm -rf conftest*
  HAVE_XPM=yes
 fi
 rm -f conftest*
      if test "${HAVE_XPM}" = "yes"; then
-        echo "$ac_t""yes" 1>&6
+        echo "$as_me:7062: result: yes" >&5
+echo "${ECHO_T}yes" >&6
      else
-        echo "$ac_t""no" 1>&6
+        echo "$as_me:7065: result: no" >&5
+echo "${ECHO_T}no" >&6
      fi
    fi
  fi
  if test "${HAVE_XPM}" = "yes"; then
-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\EOF
 #define HAVE_XPM 1
 EOF
  fi
 fi
-  
 ### Use -ljpeg if available, unless `--with-jpeg=no'.
 HAVE_JPEG=no
 if test "${HAVE_X11}" = "yes"; then
  if test "${with_jpeg}" != "no"; then
-            ac_safe=`echo "jerror.h" | sed 'y%./+-%__p_%'`
+            echo "$as_me:7083: checking for jerror.h" >&5
-echo $ac_n "checking for jerror.h""... $ac_c" 1>&6
+echo $ECHO_N "checking for jerror.h... $ECHO_C" >&6
-echo "configure:5221: checking for jerror.h" >&5
+if test "${ac_cv_header_jerror_h+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 5226 "configure"
+#line 7089 "configure"
 #include "confdefs.h"
 #include <jerror.h>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:7093: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:5231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
+  echo "$as_me:7099: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_cv_header_jerror_h=yes
 else
-  echo "$ac_err" >&5
+  echo "$as_me: failed program was:" >&5
-  echo "configure: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  ac_cv_header_jerror_h=no
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:7118: result: $ac_cv_header_jerror_h" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}$ac_cv_header_jerror_h" >&6
-  echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
+if test $ac_cv_header_jerror_h = yes; then
-echo "configure:5248: checking for jpeg_destroy_compress in -ljpeg" >&5
+  echo "$as_me:7121: checking for jpeg_destroy_compress in -ljpeg" >&5
-ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'`
+echo $ECHO_N "checking for jpeg_destroy_compress in -ljpeg... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if test "${ac_cv_lib_jpeg_jpeg_destroy_compress+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljpeg  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 5256 "configure"
+#line 7129 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char jpeg_destroy_compress();
+char jpeg_destroy_compress ();
+int
-int main() {
+main ()
-jpeg_destroy_compress()
+{
-; return 0; }
+jpeg_destroy_compress ();
-EOF
+  ;
-if { (eval echo configure:5267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:7148: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:7151: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:7154: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:7157: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
+  ac_cv_lib_jpeg_jpeg_destroy_compress=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_jpeg_jpeg_destroy_compress=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:7168: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5
+echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6
+if test $ac_cv_lib_jpeg_jpeg_destroy_compress = yes; then
  HAVE_JPEG=yes
-else
-  echo "$ac_t""no" 1>&6
 fi
-else
-  echo "$ac_t""no" 1>&6
 fi
  fi
  if test "${HAVE_JPEG}" = "yes"; then
-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\EOF
 #define HAVE_JPEG 1
 EOF
  fi
 fi
-  
 ### Use -lpng if available, unless `--with-png=no'.
 HAVE_PNG=no
 if test "${HAVE_X11}" = "yes"; then
  if test "${with_png}" != "no"; then
-    ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
+    echo "$as_me:7190: checking for png.h" >&5
-echo $ac_n "checking for png.h""... $ac_c" 1>&6
+echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-echo "configure:5307: checking for png.h" >&5
+if test "${ac_cv_header_png_h+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 5312 "configure"
+#line 7196 "configure"
 #include "confdefs.h"
 #include <png.h>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:7200: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:5317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
+  echo "$as_me:7206: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
 else
-  echo "$ac_err" >&5
+  ac_cpp_err=yes
-  echo "configure: failed program was:" >&5
+fi
+if test -z "$ac_cpp_err"; then
+  ac_cv_header_png_h=yes
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  ac_cv_header_png_h=no
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:7225: result: $ac_cv_header_png_h" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}$ac_cv_header_png_h" >&6
-  echo $ac_n "checking for png_get_channels in -lpng""... $ac_c" 1>&6
+if test $ac_cv_header_png_h = yes; then
-echo "configure:5334: checking for png_get_channels in -lpng" >&5
+  echo "$as_me:7228: checking for png_get_channels in -lpng" >&5
-ac_lib_var=`echo png'_'png_get_channels | sed 'y%./+-%__p_%'`
+echo $ECHO_N "checking for png_get_channels in -lpng... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if test "${ac_cv_lib_png_png_get_channels+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpng -lz -lm $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 5342 "configure"
+#line 7236 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char png_get_channels();
+char png_get_channels ();
+int
-int main() {
+main ()
-png_get_channels()
+{
-; return 0; }
+png_get_channels ();
-EOF
+  ;
-if { (eval echo configure:5353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:7255: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:7258: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:7261: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:7264: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
+  ac_cv_lib_png_png_get_channels=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_png_png_get_channels=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:7275: result: $ac_cv_lib_png_png_get_channels" >&5
+echo "${ECHO_T}$ac_cv_lib_png_png_get_channels" >&6
+if test $ac_cv_lib_png_png_get_channels = yes; then
  HAVE_PNG=yes
-else
-  echo "$ac_t""no" 1>&6
 fi
-else
-  echo "$ac_t""no" 1>&6
 fi
  fi
  if test "${HAVE_PNG}" = "yes"; then
-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\EOF
 #define HAVE_PNG 1
 EOF
  fi
 fi
-  
 ### Use -ltiff if available, unless `--with-tiff=no'.
 HAVE_TIFF=no
 if test "${HAVE_X11}" = "yes"; then
  if test "${with_tiff}" != "no"; then
-    ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
+    echo "$as_me:7297: checking for tiffio.h" >&5
-echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
+echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6
-echo "configure:5393: checking for tiffio.h" >&5
+if test "${ac_cv_header_tiffio_h+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 5398 "configure"
+#line 7303 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:7307: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:5403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
+  echo "$as_me:7313: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
 else
-  echo "$ac_err" >&5
+  ac_cpp_err=yes
-  echo "configure: failed program was:" >&5
+fi
+if test -z "$ac_cpp_err"; then
+  ac_cv_header_tiffio_h=yes
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  ac_cv_header_tiffio_h=no
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:7332: result: $ac_cv_header_tiffio_h" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6
+if test $ac_cv_header_tiffio_h = yes; then
  tifflibs="-lz -lm"
      # At least one tiff package requires the jpeg library.
      if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi
-      echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6
+      echo "$as_me:7338: checking for TIFFGetVersion in -ltiff" >&5
-echo "configure:5423: checking for TIFFGetVersion in -ltiff" >&5
+echo $ECHO_N "checking for TIFFGetVersion in -ltiff... $ECHO_C" >&6
-ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'`
+if test "${ac_cv_lib_tiff_TIFFGetVersion+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltiff $tifflibs $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 5431 "configure"
+#line 7346 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char TIFFGetVersion();
+char TIFFGetVersion ();
+int
-int main() {
+main ()
-TIFFGetVersion()
+{
-; return 0; }
+TIFFGetVersion ();
-EOF
+  ;
-if { (eval echo configure:5442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:7365: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:7368: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:7371: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:7374: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
+  ac_cv_lib_tiff_TIFFGetVersion=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_tiff_TIFFGetVersion=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:7385: result: $ac_cv_lib_tiff_TIFFGetVersion" >&5
+echo "${ECHO_T}$ac_cv_lib_tiff_TIFFGetVersion" >&6
+if test $ac_cv_lib_tiff_TIFFGetVersion = yes; then
  HAVE_TIFF=yes
-else
-  echo "$ac_t""no" 1>&6
 fi
-else
-  echo "$ac_t""no" 1>&6
 fi
  fi
  if test "${HAVE_TIFF}" = "yes"; then
-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\EOF
 #define HAVE_TIFF 1
 EOF
  fi
 fi
-  
 ### Use -lgif if available, unless `--with-gif=no'.
 HAVE_GIF=no
 if test "${HAVE_X11}" = "yes"; then
  if test "${with_gif}" != "no"; then
-    ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
+    echo "$as_me:7407: checking for gif_lib.h" >&5
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
+echo $ECHO_N "checking for gif_lib.h... $ECHO_C" >&6
-echo "configure:5482: checking for gif_lib.h" >&5
+if test "${ac_cv_header_gif_lib_h+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 5487 "configure"
+#line 7413 "configure"
 #include "confdefs.h"
 #include <gif_lib.h>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:7417: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:5492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
+  echo "$as_me:7423: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_cv_header_gif_lib_h=yes
 else
-  echo "$ac_err" >&5
+  echo "$as_me: failed program was:" >&5
-  echo "configure: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  ac_cv_header_gif_lib_h=no
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:7442: result: $ac_cv_header_gif_lib_h" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}$ac_cv_header_gif_lib_h" >&6
-  echo $ac_n "checking for DGifOpen in -lungif""... $ac_c" 1>&6
+if test $ac_cv_header_gif_lib_h = yes; then
-echo "configure:5509: checking for DGifOpen in -lungif" >&5
+  echo "$as_me:7445: checking for DGifOpen in -lungif" >&5
-ac_lib_var=`echo ungif'_'DGifOpen | sed 'y%./+-%__p_%'`
+echo $ECHO_N "checking for DGifOpen in -lungif... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if test "${ac_cv_lib_ungif_DGifOpen+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lungif  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 5517 "configure"
+#line 7453 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char DGifOpen();
+char DGifOpen ();
+int
-int main() {
+main ()
-DGifOpen()
+{
-; return 0; }
+DGifOpen ();
-EOF
+  ;
-if { (eval echo configure:5528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:7472: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:7475: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:7478: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:7481: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
+  ac_cv_lib_ungif_DGifOpen=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_ungif_DGifOpen=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:7492: result: $ac_cv_lib_ungif_DGifOpen" >&5
+echo "${ECHO_T}$ac_cv_lib_ungif_DGifOpen" >&6
+if test $ac_cv_lib_ungif_DGifOpen = yes; then
  HAVE_GIF=yes
-else
-  echo "$ac_t""no" 1>&6
 fi
-else
-  echo "$ac_t""no" 1>&6
 fi
  fi
  if test "${HAVE_GIF}" = "yes"; then
-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\EOF
 #define HAVE_GIF 1
 EOF
@@ -5559,34 +7508,47 @@ EOF
 fi
 # If netdb.h doesn't declare h_errno, we must declare it by hand.
-echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
+echo "$as_me:7511: checking whether netdb declares h_errno" >&5
-echo "configure:5564: checking whether netdb declares h_errno" >&5
+echo $ECHO_N "checking whether netdb declares h_errno... $ECHO_C" >&6
-if eval "test \"`echo '$''{'emacs_cv_netdb_declares_h_errno'+set}'`\" = set"; then
+if test "${emacs_cv_netdb_declares_h_errno+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 5569 "configure"
+#line 7517 "configure"
 #include "confdefs.h"
 #include <netdb.h>
-int main() {
+int
+main ()
+{
 return h_errno;
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:5576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:7529: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7532: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:7535: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7538: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  emacs_cv_netdb_declares_h_errno=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+emacs_cv_netdb_declares_h_errno=no
-  emacs_cv_netdb_declares_h_errno=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
+echo "$as_me:7548: result: $emacs_cv_netdb_declares_h_errno" >&5
-echo "$ac_t""$emacs_cv_netdb_declares_h_errno" 1>&6
+echo "${ECHO_T}$emacs_cv_netdb_declares_h_errno" >&6
 if test $emacs_cv_netdb_declares_h_errno = yes; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define HAVE_H_ERRNO 1
 EOF
@@ -5594,48 +7556,61 @@ fi
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+echo "$as_me:7559: checking for working alloca.h" >&5
-echo "configure:5599: checking for working alloca.h" >&5
+echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
+if test "${ac_cv_working_alloca_h+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 5604 "configure"
+#line 7565 "configure"
 #include "confdefs.h"
 #include <alloca.h>
-int main() {
+int
-char *p = alloca(2 * sizeof(int));
+main ()
-; return 0; }
+{
-EOF
+char *p = (char *) alloca (2 * sizeof (int));
-if { (eval echo configure:5611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  ;
-  rm -rf conftest*
+  return 0;
-  ac_cv_header_alloca_h=yes
+}
-else
+_ACEOF
-  echo "configure: failed program was:" >&5
+rm -f conftest.$ac_objext conftest$ac_exeext
-  cat conftest.$ac_ext >&5
+if { (eval echo "$as_me:7577: \"$ac_link\"") >&5
-  rm -rf conftest*
+  (eval $ac_link) 2>&5
-  ac_cv_header_alloca_h=no
+  ac_status=$?
-fi
+  echo "$as_me:7580: \$? = $ac_status" >&5
-rm -f conftest*
+  (exit $ac_status); } &&
-fi
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:7583: \"$ac_try\"") >&5
-echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
+  (eval $ac_try) 2>&5
-if test $ac_cv_header_alloca_h = yes; then
+  ac_status=$?
-  cat >> confdefs.h <<\EOF
+  echo "$as_me:7586: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_working_alloca_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_working_alloca_h=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:7596: result: $ac_cv_working_alloca_h" >&5
+echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
+if test $ac_cv_working_alloca_h = yes; then
+cat >>confdefs.h <<\EOF
 #define HAVE_ALLOCA_H 1
 EOF
 fi
-echo $ac_n "checking for alloca""... $ac_c" 1>&6
+echo "$as_me:7606: checking for alloca" >&5
-echo "configure:5632: checking for alloca" >&5
+echo $ECHO_N "checking for alloca... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
+if test "${ac_cv_func_alloca_works+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 5637 "configure"
+#line 7612 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
 #else
@@ -5657,48 +7632,62 @@ char *alloca ();
 # endif
 #endif
-int main() {
+int
-char *p = (char *) alloca(1);
+main ()
-; return 0; }
+{
-EOF
+char *p = (char *) alloca (1);
-if { (eval echo configure:5665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  ;
-  rm -rf conftest*
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:7644: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7647: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:7650: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7653: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  ac_cv_func_alloca_works=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+ac_cv_func_alloca_works=no
-  ac_cv_func_alloca_works=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
+echo "$as_me:7663: result: $ac_cv_func_alloca_works" >&5
+echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
-echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
 if test $ac_cv_func_alloca_works = yes; then
-  cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define HAVE_ALLOCA 1
 EOF
-fi
+else
-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
+# that cause trouble.  Some versions do not even contain alloca or
-  # contain a buggy version.  If you still want to use their alloca,
+# 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.
+# use ar to extract alloca.o from them instead of compiling alloca.c.
-  ALLOCA=alloca.${ac_objext}
-  cat >> confdefs.h <<\EOF
+ALLOCA=alloca.$ac_objext
+cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
+echo "$as_me:7684: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
-echo "configure:5697: checking whether alloca needs Cray hooks" >&5
+if test "${ac_cv_os_cray+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 5702 "configure"
+#line 7690 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -5706,88 +7695,103 @@ webecray
 wenotbecray
 #endif
-EOF
+_ACEOF
 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*
 fi
+echo "$as_me:7708: result: $ac_cv_os_cray" >&5
-echo "$ac_t""$ac_cv_os_cray" 1>&6
+echo "${ECHO_T}$ac_cv_os_cray" >&6
 if test $ac_cv_os_cray = yes; then
-for ac_func in _getb67 GETB67 getb67; do
+  for ac_func in _getb67 GETB67 getb67; do
-  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+    as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "configure:5727: checking for $ac_func" >&5
+echo "$as_me:7713: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 5732 "configure"
+#line 7719 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
+    which can conflict with char $ac_func (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char $ac_func();
+char $ac_func ();
+char (*f) ();
-int main() {
+int
+main ()
+{
 /* The GNU C library defines this for functions which it implements
    to always fail with ENOSYS.  Some functions are actually named
    something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:5755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+}
-  rm -rf conftest*
+_ACEOF
-  eval "ac_cv_func_$ac_func=yes"
+rm -f conftest.$ac_objext conftest$ac_exeext
-else
+if { (eval echo "$as_me:7750: \"$ac_link\"") >&5
-  echo "configure: failed program was:" >&5
+  (eval $ac_link) 2>&5
-  cat conftest.$ac_ext >&5
+  ac_status=$?
-  rm -rf conftest*
+  echo "$as_me:7753: \$? = $ac_status" >&5
-  eval "ac_cv_func_$ac_func=no"
+  (exit $ac_status); } &&
-fi
+         { ac_try='test -s conftest$ac_exeext'
-rm -f conftest*
+  { (eval echo "$as_me:7756: \"$ac_try\"") >&5
-fi
+  (eval $ac_try) 2>&5
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$as_me:7759: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
-  cat >> confdefs.h <<EOF
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:7769: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+cat >>confdefs.h <<EOF
 #define CRAY_STACKSEG_END $ac_func
 EOF
-  break
+    break
-else
-  echo "$ac_t""no" 1>&6
 fi
-done
+  done
 fi
-echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+echo "$as_me:7783: checking stack direction for C alloca" >&5
-echo "configure:5782: checking stack direction for C alloca" >&5
+echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
+if test "${ac_cv_c_stack_direction+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  if test "$cross_compiling" = yes; then
  ac_cv_c_stack_direction=0
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 5790 "configure"
+#line 7792 "configure"
 #include "confdefs.h"
+int
 find_stack_direction ()
 {
  static char *addr = 0;
@@ -5800,176 +7804,220 @@ find_stack_direction ()
  else
    return (&dummy > addr) ? 1 : -1;
 }
+int
 main ()
 {
-  exit (find_stack_direction() < 0);
+  exit (find_stack_direction () < 0);
 }
-EOF
+_ACEOF
-if { (eval echo configure:5809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+rm -f conftest$ac_exeext
-then
+if { (eval echo "$as_me:7815: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:7818: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:7820: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:7823: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  ac_cv_c_stack_direction=1
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
-  cat conftest.$ac_ext >&5
+echo "$as_me: failed program was:" >&5
-  rm -fr conftest*
+cat conftest.$ac_ext >&5
-  ac_cv_c_stack_direction=-1
+ac_cv_c_stack_direction=-1
 fi
-rm -fr conftest*
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
+echo "$as_me:7835: result: $ac_cv_c_stack_direction" >&5
+echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
-echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
+cat >>confdefs.h <<EOF
-cat >> confdefs.h <<EOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
 EOF
 fi
 # fmod, logb, and frexp are found in -lm on most systems.
 # On HPUX 9.01, -lm does not contain logb, so check for sqrt.
-echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
-echo "configure:5834: checking for sqrt in -lm" >&5
+echo "$as_me:7847: checking for sqrt in -lm" >&5
-ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
+echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if test "${ac_cv_lib_m_sqrt+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 5842 "configure"
+#line 7855 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char sqrt();
+char sqrt ();
+int
-int main() {
+main ()
-sqrt()
+{
-; return 0; }
+sqrt ();
-EOF
+  ;
-if { (eval echo configure:5853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:7874: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:7877: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:7880: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:7883: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
-    ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+  ac_cv_lib_m_sqrt=yes
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+else
-  cat >> confdefs.h <<EOF
+  echo "$as_me: failed program was:" >&5
-#define $ac_tr_lib 1
+cat conftest.$ac_ext >&5
+ac_cv_lib_m_sqrt=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:7894: result: $ac_cv_lib_m_sqrt" >&5
+echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6
+if test $ac_cv_lib_m_sqrt = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBM 1
 EOF
  LIBS="-lm $LIBS"
-else
-  echo "$ac_t""no" 1>&6
 fi
 # Check for mail-locking functions in a "mail" library
-echo $ac_n "checking for maillock in -lmail""... $ac_c" 1>&6
-echo "configure:5883: checking for maillock in -lmail" >&5
+echo "$as_me:7907: checking for maillock in -lmail" >&5
-ac_lib_var=`echo mail'_'maillock | sed 'y%./+-%__p_%'`
+echo $ECHO_N "checking for maillock in -lmail... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if test "${ac_cv_lib_mail_maillock+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmail  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 5891 "configure"
+#line 7915 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char maillock();
+char maillock ();
+int
-int main() {
+main ()
-maillock()
+{
-; return 0; }
+maillock ();
-EOF
+  ;
-if { (eval echo configure:5902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:7934: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:7937: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:7940: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:7943: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
-    ac_tr_lib=HAVE_LIB`echo mail | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+  ac_cv_lib_mail_maillock=yes
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+else
-  cat >> confdefs.h <<EOF
+  echo "$as_me: failed program was:" >&5
-#define $ac_tr_lib 1
+cat conftest.$ac_ext >&5
+ac_cv_lib_mail_maillock=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:7954: result: $ac_cv_lib_mail_maillock" >&5
+echo "${ECHO_T}$ac_cv_lib_mail_maillock" >&6
+if test $ac_cv_lib_mail_maillock = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBMAIL 1
 EOF
  LIBS="-lmail $LIBS"
-else
-  echo "$ac_t""no" 1>&6
 fi
-echo $ac_n "checking for maillock in -llockfile""... $ac_c" 1>&6
+echo "$as_me:7965: checking for maillock in -llockfile" >&5
-echo "configure:5930: checking for maillock in -llockfile" >&5
+echo $ECHO_N "checking for maillock in -llockfile... $ECHO_C" >&6
-ac_lib_var=`echo lockfile'_'maillock | sed 'y%./+-%__p_%'`
+if test "${ac_cv_lib_lockfile_maillock+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-llockfile  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 5938 "configure"
+#line 7973 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char maillock();
+char maillock ();
+int
-int main() {
+main ()
-maillock()
+{
-; return 0; }
+maillock ();
-EOF
+  ;
-if { (eval echo configure:5949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:7992: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:7995: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:7998: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:8001: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
-    ac_tr_lib=HAVE_LIB`echo lockfile | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+  ac_cv_lib_lockfile_maillock=yes
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+else
-  cat >> confdefs.h <<EOF
+  echo "$as_me: failed program was:" >&5
-#define $ac_tr_lib 1
+cat conftest.$ac_ext >&5
+ac_cv_lib_lockfile_maillock=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:8012: result: $ac_cv_lib_lockfile_maillock" >&5
+echo "${ECHO_T}$ac_cv_lib_lockfile_maillock" >&6
+if test $ac_cv_lib_lockfile_maillock = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBLOCKFILE 1
 EOF
  LIBS="-llockfile $LIBS"
-else
-  echo "$ac_t""no" 1>&6
 fi
 # If we have the shared liblockfile, assume we must use it for mail
@@ -5978,141 +8026,170 @@ fi
 if test "$ac_cv_lib_lockfile_maillock" = no; then
      # Extract the first word of "liblockfile.so", so it can be a program name with args.
 set dummy liblockfile.so; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "$as_me:8029: checking for $ac_word" >&5
-echo "configure:5983: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_prog_liblockfile'+set}'`\" = set"; then
+if test "${ac_cv_prog_liblockfile+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  if test -n "$liblockfile"; then
  ac_cv_prog_liblockfile="$liblockfile" # Let the user override the test.
 else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
-  ac_dummy="/usr/lib:/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+ac_dummy="/usr/lib:/lib:/usr/local/lib:$LD_LIBRARY_PATH"
-  for ac_dir in $ac_dummy; do
+for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
+  IFS=$ac_save_IFS
-    if test -f $ac_dir/$ac_word; then
+  test -z "$ac_dir" && ac_dir=.
-      ac_cv_prog_liblockfile="yes"
+  $as_executable_p "$ac_dir/$ac_word" || continue
-      break
+ac_cv_prog_liblockfile="yes"
-    fi
+echo "$as_me:8044: found $ac_dir/$ac_word" >&5
-  done
+break
-  IFS="$ac_save_ifs"
+done
  test -z "$ac_cv_prog_liblockfile" && ac_cv_prog_liblockfile="no"
 fi
 fi
-liblockfile="$ac_cv_prog_liblockfile"
+liblockfile=$ac_cv_prog_liblockfile
 if test -n "$liblockfile"; then
-  echo "$ac_t""$liblockfile" 1>&6
+  echo "$as_me:8053: result: $liblockfile" >&5
+echo "${ECHO_T}$liblockfile" >&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:8056: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
  if test $ac_cv_prog_liblockfile = yes; then
-    { echo "configure: error: Shared liblockfile found but can't link against it.
+    { { echo "$as_me:8061: error: Shared liblockfile found but can't link against it.
+This probably means that movemail could lose mail.
+There may be a \`development' package to install containing liblockfile." >&5
+echo "$as_me: error: Shared liblockfile found but can't link against it.
 This probably means that movemail could lose mail.
-There may be a \`development' package to install containing liblockfile." 1>&2; exit 1; }
+There may be a \`development' package to install containing liblockfile." >&2;}
-  else cat >> confdefs.h <<\EOF
+   { (exit 1); exit 1; }; }
+  else cat >>confdefs.h <<\EOF
 #define LIBMAIL -llockfile
 EOF
  fi
  else :
 fi
 for ac_func in touchlock
 do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "configure:6024: checking for $ac_func" >&5
+echo "$as_me:8079: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 6029 "configure"
+#line 8085 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
+    which can conflict with char $ac_func (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char $ac_func();
+char $ac_func ();
+char (*f) ();
-int main() {
+int
+main ()
+{
 /* The GNU C library defines this for functions which it implements
    to always fail with ENOSYS.  Some functions are actually named
    something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
-; return 0; }
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:8116: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8119: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:8122: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8125: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:8135: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
-if { (eval echo configure:6052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-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*
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
 fi
 done
-for ac_hdr in maillock.h
+for ac_header in maillock.h
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "$as_me:8148: checking for $ac_header" >&5
-echo "configure:6080: checking for $ac_hdr" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 6085 "configure"
+#line 8154 "configure"
-#include "confdefs.h"
+#include "confdefs.h"
-#include <$ac_hdr>
+#include <$ac_header>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:8158: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:6090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
-else
+  echo "$as_me:8164: \$? = $ac_status" >&5
-  echo "$ac_err" >&5
+  (exit $ac_status); } >/dev/null; then
-  echo "configure: failed program was:" >&5
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  eval "$as_ac_Header=no"
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:8183: result: `eval echo '${'$as_ac_Header'}'`" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >> confdefs.h <<EOF
+  cat >>confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
- 
-else
-  echo "$ac_t""no" 1>&6
 fi
 done
 for ac_func in gethostname getdomainname dup2 \
 rename closedir mkdir rmdir sysinfo \
 random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \
@@ -6121,168 +8198,202 @@ utimes setrlimit setpgid getcwd getwd shutdown strftime getaddrinfo \
 __fpending mblen mbrlen strsignal setitimer ualarm index rindex \
 gai_strerror mkstemp
 do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "configure:6126: checking for $ac_func" >&5
+echo "$as_me:8202: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 6131 "configure"
+#line 8208 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
+    which can conflict with char $ac_func (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char $ac_func();
+char $ac_func ();
+char (*f) ();
-int main() {
+int
+main ()
+{
 /* The GNU C library defines this for functions which it implements
    to always fail with ENOSYS.  Some functions are actually named
    something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
-; return 0; }
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:8239: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8242: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:8245: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8248: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:8258: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
-if { (eval echo configure:6154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-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*
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
 fi
 done
+for ac_header in sys/time.h unistd.h
-for ac_hdr in sys/time.h unistd.h
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "$as_me:8271: checking for $ac_header" >&5
-echo "configure:6183: checking for $ac_hdr" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 6188 "configure"
+#line 8277 "configure"
-#include "confdefs.h"
+#include "confdefs.h"
-#include <$ac_hdr>
+#include <$ac_header>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:8281: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:6193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
-else
+  echo "$as_me:8287: \$? = $ac_status" >&5
-  echo "$ac_err" >&5
+  (exit $ac_status); } >/dev/null; then
-  echo "configure: failed program was:" >&5
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  eval "$as_ac_Header=no"
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:8306: result: `eval echo '${'$as_ac_Header'}'`" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >> confdefs.h <<EOF
+  cat >>confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
- 
-else
-  echo "$ac_t""no" 1>&6
 fi
 done
 for ac_func in alarm
 do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "configure:6222: checking for $ac_func" >&5
+echo "$as_me:8319: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 6227 "configure"
+#line 8325 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
+    which can conflict with char $ac_func (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char $ac_func();
+char $ac_func ();
+char (*f) ();
-int main() {
+int
+main ()
+{
 /* The GNU C library defines this for functions which it implements
    to always fail with ENOSYS.  Some functions are actually named
    something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
-; return 0; }
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:8356: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8359: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:8362: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8365: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:8375: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
-if { (eval echo configure:6250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-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*
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
 fi
 done
-echo $ac_n "checking for working mktime""... $ac_c" 1>&6
+echo "$as_me:8385: checking for working mktime" >&5
-echo "configure:6275: checking for working mktime" >&5
+echo $ECHO_N "checking for working mktime... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_func_working_mktime'+set}'`\" = set"; then
+if test "${ac_cv_func_working_mktime+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  if test "$cross_compiling" = yes; then
  ac_cv_func_working_mktime=no
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 6283 "configure"
+#line 8394 "configure"
 #include "confdefs.h"
-/* Test program from Paul Eggert (eggert@twinsun.com)
+/* Test program from Paul Eggert and Tony Leneis.  */
-   and Tony Leneis (tony@plaza.ds.adp.com).  */
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
 # include <time.h>
@@ -6319,7 +8430,7 @@ static const char *const tz_strings[] = {
 static void
 spring_forward_gap ()
 {
-  /* glibc (up to about 1998-10-07) failed this test) */
+  /* glibc (up to about 1998-10-07) failed this test. */
  struct tm tm;
  /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0"
@@ -6427,28 +8538,36 @@ main ()
  spring_forward_gap ();
  exit (0);
 }
-EOF
+_ACEOF
-if { (eval echo configure:6432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+rm -f conftest$ac_exeext
-then
+if { (eval echo "$as_me:8543: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8546: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:8548: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8551: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  ac_cv_func_working_mktime=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
-  cat conftest.$ac_ext >&5
+echo "$as_me: failed program was:" >&5
-  rm -fr conftest*
+cat conftest.$ac_ext >&5
-  ac_cv_func_working_mktime=no
+ac_cv_func_working_mktime=no
 fi
-rm -fr conftest*
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
+echo "$as_me:8563: result: $ac_cv_func_working_mktime" >&5
-echo "$ac_t""$ac_cv_func_working_mktime" 1>&6
+echo "${ECHO_T}$ac_cv_func_working_mktime" >&6
 if test $ac_cv_func_working_mktime = no; then
-  LIBOBJS="$LIBOBJS mktime.${ac_objext}"
+  LIBOBJS="$LIBOBJS mktime.$ac_objext"
 fi
 if test "$ac_cv_func_working_mktime" = no; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define BROKEN_MKTIME 1
 EOF
@@ -6456,564 +8575,1024 @@ fi
 ac_have_func=no # yes means we've found a way to get the load average.
-# Some systems with -lutil have (and need) -lkvm as well, some do not.
+ac_save_LIBS=$LIBS
-# On Solaris, -lkvm requires nlist from -lelf, so check that first
-# to get the right answer into the cache.
+# Check for getloadavg, but be sure not to touch the cache variable.
-echo $ac_n "checking for elf_begin in -lelf""... $ac_c" 1>&6
+(echo "$as_me:8581: checking for getloadavg" >&5
-echo "configure:6464: checking for elf_begin in -lelf" >&5
+echo $ECHO_N "checking for getloadavg... $ECHO_C" >&6
-ac_lib_var=`echo elf'_'elf_begin | sed 'y%./+-%__p_%'`
+if test "${ac_cv_func_getloadavg+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
+  cat >conftest.$ac_ext <<_ACEOF
-LIBS="-lelf  $LIBS"
+#line 8587 "configure"
-cat > conftest.$ac_ext <<EOF
-#line 6472 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char getloadavg (); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char elf_begin();
+char getloadavg ();
+char (*f) ();
-int main() {
+int
-elf_begin()
+main ()
-; return 0; }
+{
-EOF
+/* The GNU C library defines this for functions which it implements
-if { (eval echo configure:6483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+    to always fail with ENOSYS.  Some functions are actually named
-  rm -rf conftest*
+    something starting with __ and the normal name is an alias.  */
-  eval "ac_cv_lib_$ac_lib_var=yes"
+#if defined (__stub_getloadavg) || defined (__stub___getloadavg)
-else
+choke me
-  echo "configure: failed program was:" >&5
+#else
-  cat conftest.$ac_ext >&5
+f = getloadavg;
-  rm -rf conftest*
+#endif
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-fi
+  ;
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  return 0;
-  echo "$ac_t""yes" 1>&6
+}
-  LIBS="-lelf $LIBS"
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:8618: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8621: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:8624: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8627: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_getloadavg=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_getloadavg=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:8637: result: $ac_cv_func_getloadavg" >&5
+echo "${ECHO_T}$ac_cv_func_getloadavg" >&6
+if test $ac_cv_func_getloadavg = yes; then
+  exit 0
 else
-  echo "$ac_t""no" 1>&6
+  exit 1
 fi
+) && ac_have_func=yes
+# On HPUX9, an unprivileged user can get load averages through this function.
-echo $ac_n "checking for kvm_open in -lkvm""... $ac_c" 1>&6
+for ac_func in pstat_getdynamic
-echo "configure:6504: checking for kvm_open in -lkvm" >&5
+do
-ac_lib_var=`echo kvm'_'kvm_open | sed 'y%./+-%__p_%'`
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+echo "$as_me:8651: checking for $ac_func" >&5
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  cat >conftest.$ac_ext <<_ACEOF
-LIBS="-lkvm  $LIBS"
+#line 8657 "configure"
-cat > conftest.$ac_ext <<EOF
-#line 6512 "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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char kvm_open();
+char $ac_func ();
+char (*f) ();
+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
+f = $ac_func;
+#endif
-int main() {
+  ;
-kvm_open()
+  return 0;
-; return 0; }
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:8688: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8691: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:8694: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8697: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:8707: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
-if { (eval echo configure:6523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+fi
-  eval "ac_cv_lib_$ac_lib_var=yes"
+done
+# Solaris has libkstat which does not require root.
+echo "$as_me:8719: checking for kstat_open in -lkstat" >&5
+echo $ECHO_N "checking for kstat_open in -lkstat... $ECHO_C" >&6
+if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "configure: failed program was:" >&5
+  ac_check_lib_save_LIBS=$LIBS
-  cat conftest.$ac_ext >&5
+LIBS="-lkstat  $LIBS"
-  rm -rf conftest*
+cat >conftest.$ac_ext <<_ACEOF
-  eval "ac_cv_lib_$ac_lib_var=no"
+#line 8727 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char kstat_open ();
+int
+main ()
+{
+kstat_open ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:8746: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8749: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:8752: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8755: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_kstat_kstat_open=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_kstat_kstat_open=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS="$ac_save_LIBS"
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:8766: result: $ac_cv_lib_kstat_kstat_open" >&5
+echo "${ECHO_T}$ac_cv_lib_kstat_kstat_open" >&6
+if test $ac_cv_lib_kstat_kstat_open = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBKSTAT 1
+EOF
+  LIBS="-lkstat $LIBS"
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+test $ac_cv_lib_kstat_kstat_open = yes && ac_have_func=yes
-  LIBS="-lkvm $LIBS"
+# Some systems with -lutil have (and need) -lkvm as well, some do not.
+# On Solaris, -lkvm requires nlist from -lelf, so check that first
+# to get the right answer into the cache.
+# For kstat on solaris, we need libelf to force the definition of SVR4 below.
+if test $ac_have_func = no; then
+  echo "$as_me:8784: checking for elf_begin in -lelf" >&5
+echo $ECHO_N "checking for elf_begin in -lelf... $ECHO_C" >&6
+if test "${ac_cv_lib_elf_elf_begin+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "$ac_t""no" 1>&6
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lelf  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line 8792 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char elf_begin ();
+int
+main ()
+{
+elf_begin ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:8811: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8814: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:8817: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8820: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_elf_elf_begin=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_elf_elf_begin=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:8831: result: $ac_cv_lib_elf_elf_begin" >&5
+echo "${ECHO_T}$ac_cv_lib_elf_elf_begin" >&6
+if test $ac_cv_lib_elf_elf_begin = yes; then
+  LIBS="-lelf $LIBS"
 fi
-# Check for the 4.4BSD definition of getloadavg.
+fi
-echo $ac_n "checking for getloadavg in -lutil""... $ac_c" 1>&6
+if test $ac_have_func = no; then
-echo "configure:6545: checking for getloadavg in -lutil" >&5
+  echo "$as_me:8839: checking for kvm_open in -lkvm" >&5
-ac_lib_var=`echo util'_'getloadavg | sed 'y%./+-%__p_%'`
+echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lutil  $LIBS"
+LIBS="-lkvm  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 6553 "configure"
+#line 8847 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char getloadavg();
+char kvm_open ();
+int
+main ()
+{
+kvm_open ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:8866: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8869: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:8872: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8875: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_kvm_kvm_open=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_kvm_kvm_open=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:8886: result: $ac_cv_lib_kvm_kvm_open" >&5
+echo "${ECHO_T}$ac_cv_lib_kvm_kvm_open" >&6
+if test $ac_cv_lib_kvm_kvm_open = yes; then
+  LIBS="-lkvm $LIBS"
+fi
-int main() {
+  # Check for the 4.4BSD definition of getloadavg.
-getloadavg()
+  echo "$as_me:8893: checking for getloadavg in -lutil" >&5
-; return 0; }
+echo $ECHO_N "checking for getloadavg in -lutil... $ECHO_C" >&6
-EOF
+if test "${ac_cv_lib_util_getloadavg+set}" = set; then
-if { (eval echo configure:6564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  echo "configure: failed program was:" >&5
+  ac_check_lib_save_LIBS=$LIBS
-  cat conftest.$ac_ext >&5
+LIBS="-lutil  $LIBS"
-  rm -rf conftest*
+cat >conftest.$ac_ext <<_ACEOF
-  eval "ac_cv_lib_$ac_lib_var=no"
+#line 8901 "configure"
-fi
+#include "confdefs.h"
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-fi
+/* Override any gcc2 internal prototype to avoid an error.  */
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+#ifdef __cplusplus
-  echo "$ac_t""yes" 1>&6
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char getloadavg ();
+int
+main ()
+{
+getloadavg ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:8920: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:8923: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:8926: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:8929: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_util_getloadavg=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_util_getloadavg=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:8940: result: $ac_cv_lib_util_getloadavg" >&5
+echo "${ECHO_T}$ac_cv_lib_util_getloadavg" >&6
+if test $ac_cv_lib_util_getloadavg = yes; then
  LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes
-else
-  echo "$ac_t""no" 1>&6
 fi
+fi
 if test $ac_have_func = no; then
  # There is a commonly available library for RS/6000 AIX.
  # Since it is not a standard part of AIX, it might be installed locally.
-  ac_getloadavg_LIBS="$LIBS"; LIBS="-L/usr/local/lib $LIBS"
+  ac_getloadavg_LIBS=$LIBS
-  echo $ac_n "checking for getloadavg in -lgetloadavg""... $ac_c" 1>&6
+  LIBS="-L/usr/local/lib $LIBS"
-echo "configure:6590: checking for getloadavg in -lgetloadavg" >&5
+  echo "$as_me:8953: checking for getloadavg in -lgetloadavg" >&5
-ac_lib_var=`echo getloadavg'_'getloadavg | sed 'y%./+-%__p_%'`
+echo $ECHO_N "checking for getloadavg in -lgetloadavg... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if test "${ac_cv_lib_getloadavg_getloadavg+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgetloadavg  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 6598 "configure"
+#line 8961 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char getloadavg();
+char getloadavg ();
+int
-int main() {
+main ()
-getloadavg()
+{
-; return 0; }
+getloadavg ();
-EOF
+  ;
-if { (eval echo configure:6609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:8980: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:8983: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:8986: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:8989: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
+  ac_cv_lib_getloadavg_getloadavg=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_getloadavg_getloadavg=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:9000: result: $ac_cv_lib_getloadavg_getloadavg" >&5
+echo "${ECHO_T}$ac_cv_lib_getloadavg_getloadavg" >&6
+if test $ac_cv_lib_getloadavg_getloadavg = yes; then
  LIBS="-lgetloadavg $LIBS"
 else
-  echo "$ac_t""no" 1>&6
+  LIBS=$ac_getloadavg_LIBS
-LIBS="$ac_getloadavg_LIBS"
 fi
 fi
-# Make sure it is really in the library, if we think we found it.
+# Make sure it is really in the library, if we think we found it,
+# otherwise set up the replacement function.
 for ac_func in getloadavg
 do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "configure:6636: checking for $ac_func" >&5
+echo "$as_me:9016: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 6641 "configure"
+#line 9022 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
+    which can conflict with char $ac_func (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char $ac_func();
+char $ac_func ();
+char (*f) ();
-int main() {
+int
+main ()
+{
 /* The GNU C library defines this for functions which it implements
    to always fail with ENOSYS.  Some functions are actually named
    something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:6664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+}
-  rm -rf conftest*
+_ACEOF
-  eval "ac_cv_func_$ac_func=yes"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:9053: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9056: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:9059: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9062: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+eval "$as_ac_var=no"
-  eval "ac_cv_func_$ac_func=no"
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
+echo "$as_me:9072: result: `eval echo '${'$as_ac_var'}'`" >&5
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-  echo "$ac_t""yes" 1>&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >>confdefs.h <<EOF
-  cat >> confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-#define $ac_tr_func 1
 EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}"
-fi
-done
+else
+  LIBOBJS="$LIBOBJS getloadavg.$ac_objext"
-if test $ac_cv_func_getloadavg = yes; then
+cat >>confdefs.h <<\EOF
-  cat >> confdefs.h <<\EOF
+#define C_GETLOADAVG 1
-#define HAVE_GETLOADAVG 1
 EOF
-  ac_have_func=yes
+# Figure out what our getloadavg.c needs.
-else
+ac_have_func=no
-  # Figure out what our getloadavg.c needs.
+echo "$as_me:9088: checking for sys/dg_sys_info.h" >&5
-  ac_have_func=no
+echo $ECHO_N "checking for sys/dg_sys_info.h... $ECHO_C" >&6
-  ac_safe=`echo "sys/dg_sys_info.h" | sed 'y%./+-%__p_%'`
+if test "${ac_cv_header_sys_dg_sys_info_h+set}" = set; then
-echo $ac_n "checking for sys/dg_sys_info.h""... $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-echo "configure:6702: checking for sys/dg_sys_info.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 6707 "configure"
+#line 9094 "configure"
 #include "confdefs.h"
 #include <sys/dg_sys_info.h>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:9098: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:6712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
+  echo "$as_me:9104: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_cv_header_sys_dg_sys_info_h=yes
 else
-  echo "$ac_err" >&5
+  echo "$as_me: failed program was:" >&5
-  echo "configure: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  ac_cv_header_sys_dg_sys_info_h=no
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:9123: result: $ac_cv_header_sys_dg_sys_info_h" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}$ac_cv_header_sys_dg_sys_info_h" >&6
-  ac_have_func=yes; cat >> confdefs.h <<\EOF
+if test $ac_cv_header_sys_dg_sys_info_h = yes; then
+  ac_have_func=yes
+cat >>confdefs.h <<\EOF
 #define DGUX 1
 EOF
-  echo $ac_n "checking for dg_sys_info in -ldgc""... $ac_c" 1>&6
+echo "$as_me:9132: checking for dg_sys_info in -ldgc" >&5
-echo "configure:6733: checking for dg_sys_info in -ldgc" >&5
+echo $ECHO_N "checking for dg_sys_info in -ldgc... $ECHO_C" >&6
-ac_lib_var=`echo dgc'_'dg_sys_info | sed 'y%./+-%__p_%'`
+if test "${ac_cv_lib_dgc_dg_sys_info+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldgc  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 6741 "configure"
+#line 9140 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char dg_sys_info();
+char dg_sys_info ();
+int
-int main() {
+main ()
-dg_sys_info()
+{
-; return 0; }
+dg_sys_info ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:9159: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9162: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:9165: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9168: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dgc_dg_sys_info=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_dgc_dg_sys_info=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:9179: result: $ac_cv_lib_dgc_dg_sys_info" >&5
+echo "${ECHO_T}$ac_cv_lib_dgc_dg_sys_info" >&6
+if test $ac_cv_lib_dgc_dg_sys_info = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBDGC 1
 EOF
-if { (eval echo configure:6752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
+  LIBS="-ldgc $LIBS"
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo dgc | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-  LIBS="-ldgc $LIBS"
+fi
+echo "$as_me:9192: checking for locale.h" >&5
+echo $ECHO_N "checking for locale.h... $ECHO_C" >&6
+if test "${ac_cv_header_locale_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 9198 "configure"
+#include "confdefs.h"
+#include <locale.h>
+_ACEOF
+if { (eval echo "$as_me:9202: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  egrep -v '^ *\+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:9208: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_cv_header_locale_h=yes
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_header_locale_h=no
+fi
+rm -f conftest.err conftest.$ac_ext
 fi
+echo "$as_me:9227: result: $ac_cv_header_locale_h" >&5
+echo "${ECHO_T}$ac_cv_header_locale_h" >&6
+for ac_func in setlocale
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:9233: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "$ac_t""no" 1>&6
+  cat >conftest.$ac_ext <<_ACEOF
+#line 9239 "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.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+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
+f = $ac_func;
+#endif
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:9270: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9273: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:9276: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9279: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:9289: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+EOF
 fi
+done
+# We cannot check for <dwarf.h>, because Solaris 2 does not use dwarf (it
+# uses stabs), but it is still SVR4.  We cannot check for <elf.h> because
+# Irix 4.0.5F has the header but not the library.
+if test $ac_have_func = no && test "$ac_cv_lib_elf_elf_begin" = yes; then
+  ac_have_func=yes
-  # We cannot check for <dwarf.h>, because Solaris 2 does not use dwarf (it
+cat >>confdefs.h <<\EOF
-  # uses stabs), but it is still SVR4.  We cannot check for <elf.h> because
-  # Irix 4.0.5F has the header but not the library.
-  if test $ac_have_func = no && test $ac_cv_lib_elf_elf_begin = yes; then
-    ac_have_func=yes; cat >> confdefs.h <<\EOF
 #define SVR4 1
 EOF
-  fi
+fi
-  if test $ac_have_func = no; then
+if test $ac_have_func = no; then
-    ac_safe=`echo "inq_stats/cpustats.h" | sed 'y%./+-%__p_%'`
+  echo "$as_me:9312: checking for inq_stats/cpustats.h" >&5
-echo $ac_n "checking for inq_stats/cpustats.h""... $ac_c" 1>&6
+echo $ECHO_N "checking for inq_stats/cpustats.h... $ECHO_C" >&6
-echo "configure:6797: checking for inq_stats/cpustats.h" >&5
+if test "${ac_cv_header_inq_stats_cpustats_h+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 6802 "configure"
+#line 9318 "configure"
 #include "confdefs.h"
 #include <inq_stats/cpustats.h>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:9322: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:6807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
+  echo "$as_me:9328: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
 else
-  echo "$ac_err" >&5
+  ac_cpp_err=yes
-  echo "configure: failed program was:" >&5
+fi
+if test -z "$ac_cpp_err"; then
+  ac_cv_header_inq_stats_cpustats_h=yes
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  ac_cv_header_inq_stats_cpustats_h=no
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:9347: result: $ac_cv_header_inq_stats_cpustats_h" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}$ac_cv_header_inq_stats_cpustats_h" >&6
-  ac_have_func=yes; cat >> confdefs.h <<\EOF
+if test $ac_cv_header_inq_stats_cpustats_h = yes; then
+  ac_have_func=yes
+cat >>confdefs.h <<\EOF
 #define UMAX 1
 EOF
-    cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define UMAX4_3 1
 EOF
-else
-  echo "$ac_t""no" 1>&6
 fi
-  fi
+fi
-  if test $ac_have_func = no; then
+if test $ac_have_func = no; then
-    ac_safe=`echo "sys/cpustats.h" | sed 'y%./+-%__p_%'`
+  echo "$as_me:9365: checking for sys/cpustats.h" >&5
-echo $ac_n "checking for sys/cpustats.h""... $ac_c" 1>&6
+echo $ECHO_N "checking for sys/cpustats.h... $ECHO_C" >&6
-echo "configure:6840: checking for sys/cpustats.h" >&5
+if test "${ac_cv_header_sys_cpustats_h+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 6845 "configure"
+#line 9371 "configure"
 #include "confdefs.h"
 #include <sys/cpustats.h>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:9375: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:6850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
+  echo "$as_me:9381: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_cv_header_sys_cpustats_h=yes
 else
-  echo "$ac_err" >&5
+  echo "$as_me: failed program was:" >&5
-  echo "configure: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  ac_cv_header_sys_cpustats_h=no
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:9400: result: $ac_cv_header_sys_cpustats_h" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}$ac_cv_header_sys_cpustats_h" >&6
-  ac_have_func=yes; cat >> confdefs.h <<\EOF
+if test $ac_cv_header_sys_cpustats_h = yes; then
+  ac_have_func=yes; cat >>confdefs.h <<\EOF
 #define UMAX 1
 EOF
-else
-  echo "$ac_t""no" 1>&6
 fi
-  fi
+fi
-  if test $ac_have_func = no; then
+if test $ac_have_func = no; then
-    for ac_hdr in mach/mach.h
+for ac_header in mach/mach.h
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "$as_me:9416: checking for $ac_header" >&5
-echo "configure:6881: checking for $ac_hdr" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 6886 "configure"
+#line 9422 "configure"
-#include "confdefs.h"
+#include "confdefs.h"
-#include <$ac_hdr>
+#include <$ac_header>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:9426: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:6891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
-else
+  echo "$as_me:9432: \$? = $ac_status" >&5
-  echo "$ac_err" >&5
+  (exit $ac_status); } >/dev/null; then
-  echo "configure: failed program was:" >&5
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  eval "$as_ac_Header=no"
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:9451: result: `eval echo '${'$as_ac_Header'}'`" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >> confdefs.h <<EOF
+  cat >>confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
- 
-else
-  echo "$ac_t""no" 1>&6
 fi
 done
-  fi
+fi
-  ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
+for ac_header in nlist.h
-echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
+do
-echo "configure:6921: checking for nlist.h" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo "$as_me:9466: checking for $ac_header" >&5
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 9472 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:9476: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  egrep -v '^ *\+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:9482: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
 else
-  cat > conftest.$ac_ext <<EOF
+  ac_cpp_err=yes
-#line 6926 "configure"
+fi
-#include "confdefs.h"
+if test -z "$ac_cpp_err"; then
-#include <nlist.h>
+  eval "$as_ac_Header=yes"
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
 else
-  echo "$ac_err" >&5
+  echo "$as_me: failed program was:" >&5
-  echo "configure: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  eval "$as_ac_Header=no"
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:9501: result: `eval echo '${'$as_ac_Header'}'`" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-  cat >> confdefs.h <<\EOF
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-#define NLIST_STRUCT 1
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
+ echo "$as_me:9507: checking for struct nlist.n_un.n_name" >&5
-  echo $ac_n "checking for n_un in struct nlist""... $ac_c" 1>&6
+echo $ECHO_N "checking for struct nlist.n_un.n_name... $ECHO_C" >&6
-echo "configure:6952: checking for n_un in struct nlist" >&5
+if test "${ac_cv_member_struct_nlist_n_un_n_name+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_struct_nlist_n_un'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 6957 "configure"
+#line 9513 "configure"
 #include "confdefs.h"
 #include <nlist.h>
-int main() {
-struct nlist n; n.n_un.n_name = 0;
-; return 0; }
-EOF
-if { (eval echo configure:6964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_struct_nlist_n_un=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_struct_nlist_n_un=no
-fi
-rm -f conftest*
-fi
-echo "$ac_t""$ac_cv_struct_nlist_n_un" 1>&6
+int
-  if test $ac_cv_struct_nlist_n_un = yes; then
+main ()
-    cat >> confdefs.h <<\EOF
+{
+static struct nlist ac_aggr;
+if (ac_aggr.n_un.n_name)
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:9528: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:9531: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:9534: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9537: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_member_struct_nlist_n_un_n_name=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_member_struct_nlist_n_un_n_name=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:9547: result: $ac_cv_member_struct_nlist_n_un_n_name" >&5
+echo "${ECHO_T}$ac_cv_member_struct_nlist_n_un_n_name" >&6
+if test $ac_cv_member_struct_nlist_n_un_n_name = yes; then
+cat >>confdefs.h <<EOF
+#define HAVE_STRUCT_NLIST_N_UN_N_NAME 1
+EOF
+cat >>confdefs.h <<\EOF
 #define NLIST_NAME_UNION 1
 EOF
-  fi
-  
-else
-  echo "$ac_t""no" 1>&6
 fi
-fi # Do not have getloadavg in system libraries.
+fi
+done
+fi
+done
 # Some definitions of getloadavg require that the program be installed setgid.
-echo $ac_n "checking whether getloadavg requires setgid""... $ac_c" 1>&6
+echo "$as_me:9568: checking whether getloadavg requires setgid" >&5
-echo "configure:6991: checking whether getloadavg requires setgid" >&5
+echo $ECHO_N "checking whether getloadavg requires setgid... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_func_getloadavg_setgid'+set}'`\" = set"; then
+if test "${ac_cv_func_getloadavg_setgid+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 6996 "configure"
+#line 9574 "configure"
 #include "confdefs.h"
 #include "$srcdir/getloadavg.c"
 #ifdef LDAV_PRIVILEGED
 Yowza Am I SETGID yet
 #endif
-EOF
+_ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  egrep "Yowza Am I SETGID yet" >/dev/null 2>&1; then
-  rm -rf conftest*
  ac_cv_func_getloadavg_setgid=yes
 else
-  rm -rf conftest*
  ac_cv_func_getloadavg_setgid=no
 fi
 rm -f conftest*
 fi
+echo "$as_me:9590: result: $ac_cv_func_getloadavg_setgid" >&5
-echo "$ac_t""$ac_cv_func_getloadavg_setgid" 1>&6
+echo "${ECHO_T}$ac_cv_func_getloadavg_setgid" >&6
 if test $ac_cv_func_getloadavg_setgid = yes; then
-  NEED_SETGID=true; cat >> confdefs.h <<\EOF
+  NEED_SETGID=true
+cat >>confdefs.h <<\EOF
 #define GETLOADAVG_PRIVILEGED 1
 EOF
@@ -7022,12 +9601,12 @@ else
 fi
 if test $ac_cv_func_getloadavg_setgid = yes; then
-  echo $ac_n "checking group of /dev/kmem""... $ac_c" 1>&6
+  echo "$as_me:9604: checking group of /dev/kmem" >&5
-echo "configure:7027: checking group of /dev/kmem" >&5
+echo $ECHO_N "checking group of /dev/kmem... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_group_kmem'+set}'`\" = set"; then
+if test "${ac_cv_group_kmem+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-    # On Solaris, /dev/kmem is a symlink.  Get info on the real file.
+   # On Solaris, /dev/kmem is a symlink.  Get info on the real file.
  ac_ls_output=`ls -lgL /dev/kmem 2>/dev/null`
  # If we got an error (system does not support symlinks), try without -L.
  test -z "$ac_ls_output" && ac_ls_output=`ls -lg /dev/kmem`
@@ -7037,638 +9616,823 @@ else
               / /s/.* //;p;'`
 fi
+echo "$as_me:9619: result: $ac_cv_group_kmem" >&5
-echo "$ac_t""$ac_cv_group_kmem" 1>&6
+echo "${ECHO_T}$ac_cv_group_kmem" >&6
  KMEM_GROUP=$ac_cv_group_kmem
 fi
+if test "x$ac_save_LIBS" = x; then
+  GETLOADAVG_LIBS=$LIBS
+else
+  GETLOADAVG_LIBS=`echo "$LIBS" | sed "s!$ac_save_LIBS!!"`
+fi
+LIBS=$ac_save_LIBS
+echo "$as_me:9630: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
+echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
-echo "configure:7048: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+if test "${ac_cv_sys_largefile_source+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_sys_largefile_source'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
+  while :; do
  ac_cv_sys_largefile_source=no
-      cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 7054 "configure"
+#line 9638 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-int main() {
+int
+main ()
+{
 return !fseeko;
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:7061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+}
-  :
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:9650: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:9653: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:9656: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9659: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  break
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+fi
-  cat > conftest.$ac_ext <<EOF
+rm -f conftest.$ac_objext conftest.$ac_ext
-#line 7068 "configure"
+  cat >conftest.$ac_ext <<_ACEOF
+#line 9668 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
-           
+int
-int main() {
+main ()
+{
 return !fseeko;
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:7077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+}
-  rm -rf conftest*
+_ACEOF
-  ac_cv_sys_largefile_source=1
+rm -f conftest.$ac_objext
-else
+if { (eval echo "$as_me:9681: \"$ac_compile\"") >&5
-  echo "configure: failed program was:" >&5
+  (eval $ac_compile) 2>&5
-  cat conftest.$ac_ext >&5
+  ac_status=$?
-fi
+  echo "$as_me:9684: \$? = $ac_status" >&5
-rm -f conftest*
+  (exit $ac_status); } &&
-fi
+         { ac_try='test -s conftest.$ac_objext'
-rm -f conftest*
+  { (eval echo "$as_me:9687: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9690: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sys_largefile_source=1; break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  break
+done
 fi
+echo "$as_me:9701: result: $ac_cv_sys_largefile_source" >&5
+echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
+if test "$ac_cv_sys_largefile_source" != no; then
-echo "$ac_t""$ac_cv_sys_largefile_source" 1>&6
+cat >>confdefs.h <<EOF
-   if test "$ac_cv_sys_largefile_source" != no; then
-     cat >> confdefs.h <<EOF
 #define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
 EOF
-   fi
+fi
-   # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+rm -f conftest*
-   # in glibc 2.1.3, but that breaks too many other things.
-   # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-   echo $ac_n "checking for fseeko""... $ac_c" 1>&6
+# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
-echo "configure:7101: checking for fseeko" >&5
+# in glibc 2.1.3, but that breaks too many other things.
-if eval "test \"`echo '$''{'ac_cv_func_fseeko'+set}'`\" = set"; then
+# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:9715: checking for fseeko" >&5
+echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
+if test "${ac_cv_func_fseeko+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_func_fseeko=no
+  cat >conftest.$ac_ext <<_ACEOF
-      cat > conftest.$ac_ext <<EOF
+#line 9721 "configure"
-#line 7107 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-int main() {
+int
+main ()
+{
 return fseeko && fseeko (stdin, 0, 0);
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:7114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:9733: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9736: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:9739: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9742: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  ac_cv_func_fseeko=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_fseeko=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
+echo "$as_me:9752: result: $ac_cv_func_fseeko" >&5
+echo "${ECHO_T}$ac_cv_func_fseeko" >&6
+if test $ac_cv_func_fseeko = yes; then
-echo "$ac_t""$ac_cv_func_fseeko" 1>&6
+cat >>confdefs.h <<\EOF
-   if test $ac_cv_func_fseeko != no; then
-     cat >> confdefs.h <<\EOF
 #define HAVE_FSEEKO 1
 EOF
-   fi
+fi
 # UNIX98 PTYs.
 for ac_func in grantpt
 do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "configure:7136: checking for $ac_func" >&5
+echo "$as_me:9767: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 7141 "configure"
+#line 9773 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
+    which can conflict with char $ac_func (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char $ac_func();
+char $ac_func ();
+char (*f) ();
-int main() {
+int
+main ()
+{
 /* The GNU C library defines this for functions which it implements
    to always fail with ENOSYS.  Some functions are actually named
    something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
-; return 0; }
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:9804: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9807: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:9810: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9813: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:9823: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
-if { (eval echo configure:7164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-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*
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
 fi
 done
 # PTY-related GNU extensions.
 for ac_func in getpt
 do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "configure:7193: checking for $ac_func" >&5
+echo "$as_me:9838: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 7198 "configure"
+#line 9844 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
+    which can conflict with char $ac_func (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char $ac_func();
+char $ac_func ();
+char (*f) ();
-int main() {
+int
+main ()
+{
 /* The GNU C library defines this for functions which it implements
    to always fail with ENOSYS.  Some functions are actually named
    something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
-; return 0; }
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:9875: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:9878: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:9881: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9884: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:9894: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
-if { (eval echo configure:7221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-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*
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
 fi
 done
 # Check this now, so that we will NOT find the above functions in ncurses.
 # That is because we have not set up to link ncurses in lib-src.
 # It's better to believe a function is not available
 # than to expect to find it in ncurses.
-echo $ac_n "checking for tparm in -lncurses""... $ac_c" 1>&6
-echo "configure:7251: checking for tparm in -lncurses" >&5
+echo "$as_me:9909: checking for tparm in -lncurses" >&5
-ac_lib_var=`echo ncurses'_'tparm | sed 'y%./+-%__p_%'`
+echo $ECHO_N "checking for tparm in -lncurses... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if test "${ac_cv_lib_ncurses_tparm+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 7259 "configure"
+#line 9917 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char tparm();
+char tparm ();
+int
-int main() {
+main ()
-tparm()
+{
-; return 0; }
+tparm ();
-EOF
+  ;
-if { (eval echo configure:7270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:9936: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:9939: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:9942: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:9945: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
-    ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+  ac_cv_lib_ncurses_tparm=yes
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+else
-  cat >> confdefs.h <<EOF
+  echo "$as_me: failed program was:" >&5
-#define $ac_tr_lib 1
+cat conftest.$ac_ext >&5
+ac_cv_lib_ncurses_tparm=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:9956: result: $ac_cv_lib_ncurses_tparm" >&5
+echo "${ECHO_T}$ac_cv_lib_ncurses_tparm" >&6
+if test $ac_cv_lib_ncurses_tparm = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBNCURSES 1
 EOF
  LIBS="-lncurses $LIBS"
-else
-  echo "$ac_t""no" 1>&6
 fi
 # These tell us which Kerberos-related libraries to use.
 if test "${with_kerberos+set}" = set; then
-  echo $ac_n "checking for com_err in -lcom_err""... $ac_c" 1>&6
-echo "configure:7301: checking for com_err in -lcom_err" >&5
+echo "$as_me:9970: checking for com_err in -lcom_err" >&5
-ac_lib_var=`echo com_err'_'com_err | sed 'y%./+-%__p_%'`
+echo $ECHO_N "checking for com_err in -lcom_err... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if test "${ac_cv_lib_com_err_com_err+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcom_err  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 7309 "configure"
+#line 9978 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char com_err();
+char com_err ();
+int
-int main() {
+main ()
-com_err()
+{
-; return 0; }
+com_err ();
-EOF
+  ;
-if { (eval echo configure:7320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:9997: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:10000: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:10003: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:10006: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
-    ac_tr_lib=HAVE_LIB`echo com_err | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+  ac_cv_lib_com_err_com_err=yes
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+else
-  cat >> confdefs.h <<EOF
+  echo "$as_me: failed program was:" >&5
-#define $ac_tr_lib 1
+cat conftest.$ac_ext >&5
+ac_cv_lib_com_err_com_err=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:10017: result: $ac_cv_lib_com_err_com_err" >&5
+echo "${ECHO_T}$ac_cv_lib_com_err_com_err" >&6
+if test $ac_cv_lib_com_err_com_err = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBCOM_ERR 1
 EOF
  LIBS="-lcom_err $LIBS"
-else
-  echo "$ac_t""no" 1>&6
 fi
-  echo $ac_n "checking for mit_des_cbc_encrypt in -lk5crypto""... $ac_c" 1>&6
+echo "$as_me:10028: checking for mit_des_cbc_encrypt in -lk5crypto" >&5
-echo "configure:7348: checking for mit_des_cbc_encrypt in -lk5crypto" >&5
+echo $ECHO_N "checking for mit_des_cbc_encrypt in -lk5crypto... $ECHO_C" >&6
-ac_lib_var=`echo k5crypto'_'mit_des_cbc_encrypt | sed 'y%./+-%__p_%'`
+if test "${ac_cv_lib_k5crypto_mit_des_cbc_encrypt+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lk5crypto  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 7356 "configure"
+#line 10036 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char mit_des_cbc_encrypt();
+char mit_des_cbc_encrypt ();
+int
-int main() {
+main ()
-mit_des_cbc_encrypt()
+{
-; return 0; }
+mit_des_cbc_encrypt ();
-EOF
+  ;
-if { (eval echo configure:7367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:10055: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:10058: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:10061: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:10064: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
-    ac_tr_lib=HAVE_LIB`echo k5crypto | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+  ac_cv_lib_k5crypto_mit_des_cbc_encrypt=yes
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+else
-  cat >> confdefs.h <<EOF
+  echo "$as_me: failed program was:" >&5
-#define $ac_tr_lib 1
+cat conftest.$ac_ext >&5
+ac_cv_lib_k5crypto_mit_des_cbc_encrypt=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:10075: result: $ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&5
+echo "${ECHO_T}$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&6
+if test $ac_cv_lib_k5crypto_mit_des_cbc_encrypt = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBK5CRYPTO 1
 EOF
  LIBS="-lk5crypto $LIBS"
-else
-  echo "$ac_t""no" 1>&6
 fi
-  echo $ac_n "checking for mit_des_cbc_encrypt in -lcrypto""... $ac_c" 1>&6
+echo "$as_me:10086: checking for mit_des_cbc_encrypt in -lcrypto" >&5
-echo "configure:7395: checking for mit_des_cbc_encrypt in -lcrypto" >&5
+echo $ECHO_N "checking for mit_des_cbc_encrypt in -lcrypto... $ECHO_C" >&6
-ac_lib_var=`echo crypto'_'mit_des_cbc_encrypt | sed 'y%./+-%__p_%'`
+if test "${ac_cv_lib_crypto_mit_des_cbc_encrypt+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 7403 "configure"
+#line 10094 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char mit_des_cbc_encrypt();
+char mit_des_cbc_encrypt ();
+int
-int main() {
+main ()
-mit_des_cbc_encrypt()
+{
-; return 0; }
+mit_des_cbc_encrypt ();
-EOF
+  ;
-if { (eval echo configure:7414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:10113: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:10116: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:10119: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:10122: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
-    ac_tr_lib=HAVE_LIB`echo crypto | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+  ac_cv_lib_crypto_mit_des_cbc_encrypt=yes
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+else
-  cat >> confdefs.h <<EOF
+  echo "$as_me: failed program was:" >&5
-#define $ac_tr_lib 1
+cat conftest.$ac_ext >&5
+ac_cv_lib_crypto_mit_des_cbc_encrypt=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:10133: result: $ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5
+echo "${ECHO_T}$ac_cv_lib_crypto_mit_des_cbc_encrypt" >&6
+if test $ac_cv_lib_crypto_mit_des_cbc_encrypt = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBCRYPTO 1
 EOF
  LIBS="-lcrypto $LIBS"
-else
-  echo "$ac_t""no" 1>&6
 fi
-  echo $ac_n "checking for krb5_init_context in -lkrb5""... $ac_c" 1>&6
+echo "$as_me:10144: checking for krb5_init_context in -lkrb5" >&5
-echo "configure:7442: checking for krb5_init_context in -lkrb5" >&5
+echo $ECHO_N "checking for krb5_init_context in -lkrb5... $ECHO_C" >&6
-ac_lib_var=`echo krb5'_'krb5_init_context | sed 'y%./+-%__p_%'`
+if test "${ac_cv_lib_krb5_krb5_init_context+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkrb5  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 7450 "configure"
+#line 10152 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char krb5_init_context();
+char krb5_init_context ();
+int
-int main() {
+main ()
-krb5_init_context()
+{
-; return 0; }
+krb5_init_context ();
-EOF
+  ;
-if { (eval echo configure:7461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:10171: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:10174: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:10177: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:10180: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
-    ac_tr_lib=HAVE_LIB`echo krb5 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+  ac_cv_lib_krb5_krb5_init_context=yes
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+else
-  cat >> confdefs.h <<EOF
+  echo "$as_me: failed program was:" >&5
-#define $ac_tr_lib 1
+cat conftest.$ac_ext >&5
+ac_cv_lib_krb5_krb5_init_context=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:10191: result: $ac_cv_lib_krb5_krb5_init_context" >&5
+echo "${ECHO_T}$ac_cv_lib_krb5_krb5_init_context" >&6
+if test $ac_cv_lib_krb5_krb5_init_context = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBKRB5 1
 EOF
  LIBS="-lkrb5 $LIBS"
-else
-  echo "$ac_t""no" 1>&6
 fi
  if test "${with_kerberos5+set}" != set; then
-    echo $ac_n "checking for des_cbc_encrypt in -ldes425""... $ac_c" 1>&6
-echo "configure:7490: checking for des_cbc_encrypt in -ldes425" >&5
+echo "$as_me:10204: checking for des_cbc_encrypt in -ldes425" >&5
-ac_lib_var=`echo des425'_'des_cbc_encrypt | sed 'y%./+-%__p_%'`
+echo $ECHO_N "checking for des_cbc_encrypt in -ldes425... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if test "${ac_cv_lib_des425_des_cbc_encrypt+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldes425  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 7498 "configure"
+#line 10212 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char des_cbc_encrypt();
+char des_cbc_encrypt ();
+int
-int main() {
+main ()
-des_cbc_encrypt()
+{
-; return 0; }
+des_cbc_encrypt ();
-EOF
+  ;
-if { (eval echo configure:7509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:10231: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:10234: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:10237: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:10240: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
-    ac_tr_lib=HAVE_LIB`echo des425 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+  ac_cv_lib_des425_des_cbc_encrypt=yes
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+else
-  cat >> confdefs.h <<EOF
+  echo "$as_me: failed program was:" >&5
-#define $ac_tr_lib 1
+cat conftest.$ac_ext >&5
+ac_cv_lib_des425_des_cbc_encrypt=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:10251: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5
+echo "${ECHO_T}$ac_cv_lib_des425_des_cbc_encrypt" >&6
+if test $ac_cv_lib_des425_des_cbc_encrypt = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBDES425 1
 EOF
  LIBS="-ldes425 $LIBS"
 else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for des_cbc_encrypt in -ldes""... $ac_c" 1>&6
+echo "$as_me:10262: checking for des_cbc_encrypt in -ldes" >&5
-echo "configure:7535: checking for des_cbc_encrypt in -ldes" >&5
+echo $ECHO_N "checking for des_cbc_encrypt in -ldes... $ECHO_C" >&6
-ac_lib_var=`echo des'_'des_cbc_encrypt | sed 'y%./+-%__p_%'`
+if test "${ac_cv_lib_des_des_cbc_encrypt+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldes  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 7543 "configure"
+#line 10270 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char des_cbc_encrypt();
+char des_cbc_encrypt ();
+int
-int main() {
+main ()
-des_cbc_encrypt()
+{
-; return 0; }
+des_cbc_encrypt ();
-EOF
+  ;
-if { (eval echo configure:7554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:10289: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:10292: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:10295: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:10298: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
-    ac_tr_lib=HAVE_LIB`echo des | sed -e 's/^a-zA-Z0-9_/_/g' \
+  ac_cv_lib_des_des_cbc_encrypt=yes
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+else
-  cat >> confdefs.h <<EOF
+  echo "$as_me: failed program was:" >&5
-#define $ac_tr_lib 1
+cat conftest.$ac_ext >&5
+ac_cv_lib_des_des_cbc_encrypt=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:10309: result: $ac_cv_lib_des_des_cbc_encrypt" >&5
+echo "${ECHO_T}$ac_cv_lib_des_des_cbc_encrypt" >&6
+if test $ac_cv_lib_des_des_cbc_encrypt = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBDES 1
 EOF
  LIBS="-ldes $LIBS"
-else
-  echo "$ac_t""no" 1>&6
 fi
 fi
-    echo $ac_n "checking for krb_get_cred in -lkrb4""... $ac_c" 1>&6
+echo "$as_me:10322: checking for krb_get_cred in -lkrb4" >&5
-echo "configure:7584: checking for krb_get_cred in -lkrb4" >&5
+echo $ECHO_N "checking for krb_get_cred in -lkrb4... $ECHO_C" >&6
-ac_lib_var=`echo krb4'_'krb_get_cred | sed 'y%./+-%__p_%'`
+if test "${ac_cv_lib_krb4_krb_get_cred+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkrb4  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 7592 "configure"
+#line 10330 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char krb_get_cred();
+char krb_get_cred ();
+int
-int main() {
+main ()
-krb_get_cred()
+{
-; return 0; }
+krb_get_cred ();
-EOF
+  ;
-if { (eval echo configure:7603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:10349: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:10352: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:10355: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:10358: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
-    ac_tr_lib=HAVE_LIB`echo krb4 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+  ac_cv_lib_krb4_krb_get_cred=yes
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+else
-  cat >> confdefs.h <<EOF
+  echo "$as_me: failed program was:" >&5
-#define $ac_tr_lib 1
+cat conftest.$ac_ext >&5
+ac_cv_lib_krb4_krb_get_cred=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:10369: result: $ac_cv_lib_krb4_krb_get_cred" >&5
+echo "${ECHO_T}$ac_cv_lib_krb4_krb_get_cred" >&6
+if test $ac_cv_lib_krb4_krb_get_cred = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBKRB4 1
 EOF
  LIBS="-lkrb4 $LIBS"
 else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for krb_get_cred in -lkrb""... $ac_c" 1>&6
+echo "$as_me:10380: checking for krb_get_cred in -lkrb" >&5
-echo "configure:7629: checking for krb_get_cred in -lkrb" >&5
+echo $ECHO_N "checking for krb_get_cred in -lkrb... $ECHO_C" >&6
-ac_lib_var=`echo krb'_'krb_get_cred | sed 'y%./+-%__p_%'`
+if test "${ac_cv_lib_krb_krb_get_cred+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lkrb  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 7637 "configure"
+#line 10388 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char krb_get_cred();
+char krb_get_cred ();
+int
-int main() {
+main ()
-krb_get_cred()
+{
-; return 0; }
+krb_get_cred ();
-EOF
+  ;
-if { (eval echo configure:7648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:10407: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:10410: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:10413: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:10416: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
-    ac_tr_lib=HAVE_LIB`echo krb | sed -e 's/^a-zA-Z0-9_/_/g' \
+  ac_cv_lib_krb_krb_get_cred=yes
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+else
-  cat >> confdefs.h <<EOF
+  echo "$as_me: failed program was:" >&5
-#define $ac_tr_lib 1
+cat conftest.$ac_ext >&5
+ac_cv_lib_krb_krb_get_cred=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:10427: result: $ac_cv_lib_krb_krb_get_cred" >&5
+echo "${ECHO_T}$ac_cv_lib_krb_krb_get_cred" >&6
+if test $ac_cv_lib_krb_krb_get_cred = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBKRB 1
 EOF
  LIBS="-lkrb $LIBS"
-else
-  echo "$ac_t""no" 1>&6
 fi
 fi
@@ -7676,158 +10440,196 @@ fi
  fi
  if test "${with_kerberos5+set}" = set; then
-    for ac_hdr in krb5.h
+for ac_header in krb5.h
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "$as_me:10447: checking for $ac_header" >&5
-echo "configure:7684: checking for $ac_hdr" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 7689 "configure"
+#line 10453 "configure"
-#include "confdefs.h"
+#include "confdefs.h"
-#include <$ac_hdr>
+#include <$ac_header>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:10457: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:7694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
-else
+  echo "$as_me:10463: \$? = $ac_status" >&5
-  echo "$ac_err" >&5
+  (exit $ac_status); } >/dev/null; then
-  echo "configure: failed program was:" >&5
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  eval "$as_ac_Header=no"
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:10482: result: `eval echo '${'$as_ac_Header'}'`" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >> confdefs.h <<EOF
+  cat >>confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
- 
-else
-  echo "$ac_t""no" 1>&6
 fi
 done
  else
-    for ac_hdr in des.h
+for ac_header in des.h
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "$as_me:10497: checking for $ac_header" >&5
-echo "configure:7725: checking for $ac_hdr" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 7730 "configure"
+#line 10503 "configure"
-#include "confdefs.h"
+#include "confdefs.h"
-#include <$ac_hdr>
+#include <$ac_header>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:10507: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:7735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
-else
+  echo "$as_me:10513: \$? = $ac_status" >&5
-  echo "$ac_err" >&5
+  (exit $ac_status); } >/dev/null; then
-  echo "configure: failed program was:" >&5
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  eval "$as_ac_Header=no"
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:10532: result: `eval echo '${'$as_ac_Header'}'`" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >> confdefs.h <<EOF
+  cat >>confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
- 
 else
-  echo "$ac_t""no" 1>&6
-for ac_hdr in kerberosIV/des.h
+for ac_header in kerberosIV/des.h
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "$as_me:10544: checking for $ac_header" >&5
-echo "configure:7762: checking for $ac_hdr" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 7767 "configure"
+#line 10550 "configure"
-#include "confdefs.h"
+#include "confdefs.h"
-#include <$ac_hdr>
+#include <$ac_header>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:10554: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:7772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
-else
+  echo "$as_me:10560: \$? = $ac_status" >&5
-  echo "$ac_err" >&5
+  (exit $ac_status); } >/dev/null; then
-  echo "configure: failed program was:" >&5
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  eval "$as_ac_Header=no"
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:10579: result: `eval echo '${'$as_ac_Header'}'`" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >> confdefs.h <<EOF
+  cat >>confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
- 
 else
-  echo "$ac_t""no" 1>&6
-for ac_hdr in kerberos/des.h
+for ac_header in kerberos/des.h
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "$as_me:10591: checking for $ac_header" >&5
-echo "configure:7799: checking for $ac_hdr" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 7804 "configure"
+#line 10597 "configure"
-#include "confdefs.h"
+#include "confdefs.h"
-#include <$ac_hdr>
+#include <$ac_header>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:10601: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:7809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
-else
+  echo "$as_me:10607: \$? = $ac_status" >&5
-  echo "$ac_err" >&5
+  (exit $ac_status); } >/dev/null; then
-  echo "configure: failed program was:" >&5
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  eval "$as_ac_Header=no"
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:10626: result: `eval echo '${'$as_ac_Header'}'`" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >> confdefs.h <<EOF
+  cat >>confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
- 
-else
-  echo "$ac_t""no" 1>&6
 fi
 done
@@ -7837,117 +10639,145 @@ done
 fi
 done
-    for ac_hdr in krb.h
+for ac_header in krb.h
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "$as_me:10645: checking for $ac_header" >&5
-echo "configure:7845: checking for $ac_hdr" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 7850 "configure"
+#line 10651 "configure"
-#include "confdefs.h"
+#include "confdefs.h"
-#include <$ac_hdr>
+#include <$ac_header>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:10655: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:7855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
-else
+  echo "$as_me:10661: \$? = $ac_status" >&5
-  echo "$ac_err" >&5
+  (exit $ac_status); } >/dev/null; then
-  echo "configure: failed program was:" >&5
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  eval "$as_ac_Header=no"
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:10680: result: `eval echo '${'$as_ac_Header'}'`" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >> confdefs.h <<EOF
+  cat >>confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
- 
 else
-  echo "$ac_t""no" 1>&6
-for ac_hdr in kerberosIV/krb.h
+for ac_header in kerberosIV/krb.h
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "$as_me:10692: checking for $ac_header" >&5
-echo "configure:7882: checking for $ac_hdr" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 7887 "configure"
+#line 10698 "configure"
-#include "confdefs.h"
+#include "confdefs.h"
-#include <$ac_hdr>
+#include <$ac_header>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:10702: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:7892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
-else
+  echo "$as_me:10708: \$? = $ac_status" >&5
-  echo "$ac_err" >&5
+  (exit $ac_status); } >/dev/null; then
-  echo "configure: failed program was:" >&5
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  eval "$as_ac_Header=no"
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:10727: result: `eval echo '${'$as_ac_Header'}'`" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >> confdefs.h <<EOF
+  cat >>confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
- 
 else
-  echo "$ac_t""no" 1>&6
-for ac_hdr in kerberos/krb.h
+for ac_header in kerberos/krb.h
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "$as_me:10739: checking for $ac_header" >&5
-echo "configure:7919: checking for $ac_hdr" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 7924 "configure"
+#line 10745 "configure"
-#include "confdefs.h"
+#include "confdefs.h"
-#include <$ac_hdr>
+#include <$ac_header>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:10749: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:7929: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
-else
+  echo "$as_me:10755: \$? = $ac_status" >&5
-  echo "$ac_err" >&5
+  (exit $ac_status); } >/dev/null; then
-  echo "configure: failed program was:" >&5
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  eval "$as_ac_Header=no"
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:10774: result: `eval echo '${'$as_ac_Header'}'`" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >> confdefs.h <<EOF
+  cat >>confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
- 
-else
-  echo "$ac_t""no" 1>&6
 fi
 done
@@ -7958,43 +10788,52 @@ fi
 done
  fi
-  for ac_hdr in com_err.h
+for ac_header in com_err.h
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "$as_me:10795: checking for $ac_header" >&5
-echo "configure:7966: checking for $ac_hdr" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 7971 "configure"
+#line 10801 "configure"
-#include "confdefs.h"
+#include "confdefs.h"
-#include <$ac_hdr>
+#include <$ac_header>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:10805: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:7976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
-else
+  echo "$as_me:10811: \$? = $ac_status" >&5
-  echo "$ac_err" >&5
+  (exit $ac_status); } >/dev/null; then
-  echo "configure: failed program was:" >&5
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  eval "$as_ac_Header=no"
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:10830: result: `eval echo '${'$as_ac_Header'}'`" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >> confdefs.h <<EOF
+  cat >>confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
- 
-else
-  echo "$ac_t""no" 1>&6
 fi
 done
@@ -8002,66 +10841,77 @@ fi
 # Solaris requires -lintl if you want strerror (which calls dgettext)
 # to return localized messages.
-echo $ac_n "checking for dgettext in -lintl""... $ac_c" 1>&6
-echo "configure:8007: checking for dgettext in -lintl" >&5
+echo "$as_me:10845: checking for dgettext in -lintl" >&5
-ac_lib_var=`echo intl'_'dgettext | sed 'y%./+-%__p_%'`
+echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if test "${ac_cv_lib_intl_dgettext+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 8015 "configure"
+#line 10853 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char dgettext();
+char dgettext ();
+int
-int main() {
+main ()
-dgettext()
+{
-; return 0; }
+dgettext ();
-EOF
+  ;
-if { (eval echo configure:8026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  return 0;
-  rm -rf conftest*
+}
-  eval "ac_cv_lib_$ac_lib_var=yes"
+_ACEOF
-else
+rm -f conftest.$ac_objext conftest$ac_exeext
-  echo "configure: failed program was:" >&5
+if { (eval echo "$as_me:10872: \"$ac_link\"") >&5
-  cat conftest.$ac_ext >&5
+  (eval $ac_link) 2>&5
-  rm -rf conftest*
+  ac_status=$?
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$as_me:10875: \$? = $ac_status" >&5
-fi
+  (exit $ac_status); } &&
-rm -f conftest*
+         { ac_try='test -s conftest$ac_exeext'
-LIBS="$ac_save_LIBS"
+  { (eval echo "$as_me:10878: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
-fi
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$as_me:10881: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
-    ac_tr_lib=HAVE_LIB`echo intl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+  ac_cv_lib_intl_dgettext=yes
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+else
-  cat >> confdefs.h <<EOF
+  echo "$as_me: failed program was:" >&5
-#define $ac_tr_lib 1
+cat conftest.$ac_ext >&5
+ac_cv_lib_intl_dgettext=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:10892: result: $ac_cv_lib_intl_dgettext" >&5
+echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6
+if test $ac_cv_lib_intl_dgettext = yes; then
+  cat >>confdefs.h <<EOF
+#define HAVE_LIBINTL 1
 EOF
  LIBS="-lintl $LIBS"
-else
-  echo "$ac_t""no" 1>&6
 fi
+echo "$as_me:10903: checking whether localtime caches TZ" >&5
-echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
+echo $ECHO_N "checking whether localtime caches TZ... $ECHO_C" >&6
-echo "configure:8055: checking whether localtime caches TZ" >&5
+if test "${emacs_cv_localtime_cache+set}" = set; then
-if eval "test \"`echo '$''{'emacs_cv_localtime_cache'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
  if test x$ac_cv_func_tzset = xyes; then
 if test "$cross_compiling" = yes; then
  # If we have tzset, assume the worst when cross-compiling.
 emacs_cv_localtime_cache=yes
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 8065 "configure"
+#line 10914 "configure"
 #include "confdefs.h"
 #include <time.h>
 extern char **environ;
@@ -8092,96 +10942,120 @@ main()
    exit (1);
  exit (0);
 }
-EOF
+_ACEOF
-if { (eval echo configure:8097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+rm -f conftest$ac_exeext
-then
+if { (eval echo "$as_me:10947: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:10950: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:10952: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:10955: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  emacs_cv_localtime_cache=no
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
-  cat conftest.$ac_ext >&5
+echo "$as_me: failed program was:" >&5
-  rm -fr conftest*
+cat conftest.$ac_ext >&5
-  emacs_cv_localtime_cache=yes
+emacs_cv_localtime_cache=yes
 fi
-rm -fr conftest*
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 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
 fi
-echo "$ac_t""$emacs_cv_localtime_cache" 1>&6
+echo "$as_me:10972: result: $emacs_cv_localtime_cache" >&5
+echo "${ECHO_T}$emacs_cv_localtime_cache" >&6
 if test $emacs_cv_localtime_cache = yes; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define LOCALTIME_CACHE 1
 EOF
 fi
 if test "x$HAVE_TIMEVAL" = xyes; then
-  for ac_func in gettimeofday
+for ac_func in gettimeofday
 do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "configure:8127: checking for $ac_func" >&5
+echo "$as_me:10986: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 8132 "configure"
+#line 10992 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
+    which can conflict with char $ac_func (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char $ac_func();
+char $ac_func ();
+char (*f) ();
-int main() {
+int
+main ()
+{
 /* The GNU C library defines this for functions which it implements
    to always fail with ENOSYS.  Some functions are actually named
    something starting with __ and the normal name is an alias.  */
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
-; return 0; }
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:11023: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11026: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:11029: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11032: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:11042: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
-if { (eval echo configure:8155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-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*
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
 fi
 done
-  echo $ac_n "checking whether gettimeofday can accept two arguments""... $ac_c" 1>&6
+  echo "$as_me:11052: checking whether gettimeofday can accept two arguments" >&5
-echo "configure:8180: checking whether gettimeofday can accept two arguments" >&5
+echo $ECHO_N "checking whether gettimeofday can accept two arguments... $ECHO_C" >&6
-if eval "test \"`echo '$''{'emacs_cv_gettimeofday_two_arguments'+set}'`\" = set"; then
+if test "${emacs_cv_gettimeofday_two_arguments+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 8185 "configure"
+#line 11058 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
@@ -8194,26 +11068,39 @@ else
 #include <time.h>
 #endif
 #endif
-int main() {
+int
+main ()
+{
 struct timeval time;
     gettimeofday (&time, 0);
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:8203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:11081: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:11084: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:11087: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11090: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  emacs_cv_gettimeofday_two_arguments=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+emacs_cv_gettimeofday_two_arguments=no
-  emacs_cv_gettimeofday_two_arguments=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
+echo "$as_me:11100: result: $emacs_cv_gettimeofday_two_arguments" >&5
-echo "$ac_t""$emacs_cv_gettimeofday_two_arguments" 1>&6
+echo "${ECHO_T}$emacs_cv_gettimeofday_two_arguments" >&6
  if test $emacs_cv_gettimeofday_two_arguments = no; then
-    cat >> confdefs.h <<\EOF
+    cat >>confdefs.h <<\EOF
 #define GETTIMEOFDAY_ONE_ARGUMENT 1
 EOF
@@ -8221,26 +11108,40 @@ EOF
 fi
 if test "$ac_cv_func_gettimeofday" = yes; then
-  echo $ac_n "checking for struct timezone""... $ac_c" 1>&6
+  echo "$as_me:11111: checking for struct timezone" >&5
-echo "configure:8226: checking for struct timezone" >&5
+echo $ECHO_N "checking for struct timezone... $ECHO_C" >&6
-if eval "test \"`echo '$''{'emacs_cv_struct_timezone'+set}'`\" = set"; then
+if test "${emacs_cv_struct_timezone+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 8231 "configure"
+#line 11117 "configure"
 #include "confdefs.h"
 #include <sys/time.h>
-int main() {
+int
+main ()
+{
 struct timezone tz;
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:8238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+}
-  rm -rf conftest*
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:11129: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:11132: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:11135: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11138: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
              if test "$cross_compiling" = yes; then
  emacs_cv_struct_timezone=yes
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 8244 "configure"
+#line 11144 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
@@ -8258,327 +11159,485 @@ main () {
  struct timezone dummy;
  exit (gettimeofday (&time, &dummy));
 }
-EOF
+_ACEOF
-if { (eval echo configure:8263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+rm -f conftest$ac_exeext
-then
+if { (eval echo "$as_me:11164: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11167: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:11169: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11172: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  emacs_cv_struct_timezone=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
-  cat conftest.$ac_ext >&5
+echo "$as_me: failed program was:" >&5
-  rm -fr conftest*
+cat conftest.$ac_ext >&5
-  emacs_cv_struct_timezone=no
+emacs_cv_struct_timezone=no
 fi
-rm -fr conftest*
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+cat conftest.$ac_ext >&5
-  rm -rf conftest*
+emacs_cv_struct_timezone=no
-  emacs_cv_struct_timezone=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
+echo "$as_me:11190: result: $emacs_cv_struct_timezone" >&5
-echo "$ac_t""$emacs_cv_struct_timezone" 1>&6
+echo "${ECHO_T}$emacs_cv_struct_timezone" >&6
 fi
 ok_so_far=yes
-echo $ac_n "checking for socket""... $ac_c" 1>&6
+echo "$as_me:11195: checking for socket" >&5
-echo "configure:8289: checking for socket" >&5
+echo $ECHO_N "checking for socket... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
+if test "${ac_cv_func_socket+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 8294 "configure"
+#line 11201 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char socket(); below.  */
+    which can conflict with char socket (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char socket();
+char socket ();
+char (*f) ();
-int main() {
+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
-socket();
+f = socket;
 #endif
-; return 0; }
+  ;
-EOF
+  return 0;
-if { (eval echo configure:8317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+}
-  rm -rf conftest*
+_ACEOF
-  eval "ac_cv_func_socket=yes"
+rm -f conftest.$ac_objext conftest$ac_exeext
-else
+if { (eval echo "$as_me:11232: \"$ac_link\"") >&5
-  echo "configure: failed program was:" >&5
+  (eval $ac_link) 2>&5
-  cat conftest.$ac_ext >&5
+  ac_status=$?
-  rm -rf conftest*
+  echo "$as_me:11235: \$? = $ac_status" >&5
-  eval "ac_cv_func_socket=no"
+  (exit $ac_status); } &&
-fi
+         { ac_try='test -s conftest$ac_exeext'
-rm -f conftest*
+  { (eval echo "$as_me:11238: \"$ac_try\"") >&5
-fi
+  (eval $ac_try) 2>&5
+  ac_status=$?
-if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
+  echo "$as_me:11241: \$? = $ac_status" >&5
-  echo "$ac_t""yes" 1>&6
+  (exit $ac_status); }; }; then
+  ac_cv_func_socket=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_socket=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:11251: result: $ac_cv_func_socket" >&5
+echo "${ECHO_T}$ac_cv_func_socket" >&6
+if test $ac_cv_func_socket = yes; then
  :
 else
-  echo "$ac_t""no" 1>&6
+  ok_so_far=no
-ok_so_far=no
 fi
 if test $ok_so_far = yes; then
-  ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
+  echo "$as_me:11260: checking for netinet/in.h" >&5
-echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
+echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6
-echo "configure:8340: checking for netinet/in.h" >&5
+if test "${ac_cv_header_netinet_in_h+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 8345 "configure"
+#line 11266 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:11270: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:8350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
+  echo "$as_me:11276: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_cv_header_netinet_in_h=yes
 else
-  echo "$ac_err" >&5
+  echo "$as_me: failed program was:" >&5
-  echo "configure: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  ac_cv_header_netinet_in_h=no
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:11295: result: $ac_cv_header_netinet_in_h" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6
+if test $ac_cv_header_netinet_in_h = yes; then
  :
 else
-  echo "$ac_t""no" 1>&6
+  ok_so_far=no
-ok_so_far=no
 fi
 fi
 if test $ok_so_far = yes; then
-  ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
+  echo "$as_me:11305: checking for arpa/inet.h" >&5
-echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
+echo $ECHO_N "checking for arpa/inet.h... $ECHO_C" >&6
-echo "configure:8376: checking for arpa/inet.h" >&5
+if test "${ac_cv_header_arpa_inet_h+set}" = set; then
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 8381 "configure"
+#line 11311 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
-EOF
+_ACEOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+if { (eval echo "$as_me:11315: \"$ac_cpp conftest.$ac_ext\"") >&5
-{ (eval echo configure:8386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+  ac_status=$?
-if test -z "$ac_err"; then
+  egrep -v '^ *\+' conftest.er1 >conftest.err
-  rm -rf conftest*
+  rm -f conftest.er1
-  eval "ac_cv_header_$ac_safe=yes"
+  cat conftest.err >&5
+  echo "$as_me:11321: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
 else
-  echo "$ac_err" >&5
+  ac_cpp_err=yes
-  echo "configure: failed program was:" >&5
+fi
+if test -z "$ac_cpp_err"; then
+  ac_cv_header_arpa_inet_h=yes
+else
+  echo "$as_me: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  ac_cv_header_arpa_inet_h=no
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:11340: result: $ac_cv_header_arpa_inet_h" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}$ac_cv_header_arpa_inet_h" >&6
+if test $ac_cv_header_arpa_inet_h = yes; then
  :
 else
-  echo "$ac_t""no" 1>&6
+  ok_so_far=no
-ok_so_far=no
 fi
 fi
 if test $ok_so_far = yes; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define HAVE_INET_SOCKETS 1
 EOF
 fi
 if test -f /usr/lpp/X11/bin/smt.exp; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define HAVE_AIX_SMT_EXP 1
 EOF
 fi
-echo $ac_n "checking whether system supports dynamic ptys""... $ac_c" 1>&6
+echo "$as_me:11363: checking whether system supports dynamic ptys" >&5
-echo "configure:8424: checking whether system supports dynamic ptys" >&5
+echo $ECHO_N "checking whether system supports dynamic ptys... $ECHO_C" >&6
 if test -d /dev/pts && ls -d /dev/ptmx > /dev/null 2>&1 ; then
-  echo "$ac_t""yes" 1>&6
+  echo "$as_me:11366: result: yes" >&5
-  cat >> confdefs.h <<\EOF
+echo "${ECHO_T}yes" >&6
+  cat >>confdefs.h <<\EOF
 #define HAVE_DEV_PTMX 1
 EOF
 else
-  echo "$ac_t""no" 1>&6
+  echo "$as_me:11373: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
-echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+echo "$as_me:11377: checking for pid_t" >&5
-echo "configure:8436: checking for pid_t" >&5
+echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+if test "${ac_cv_type_pid_t+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 8441 "configure"
+#line 11383 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
+$ac_includes_default
-#if STDC_HEADERS
+int
-#include <stdlib.h>
+main ()
-#include <stddef.h>
+{
-#endif
+if ((pid_t *) 0)
-EOF
+  return 0;
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+if (sizeof (pid_t))
-  egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  return 0;
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:11398: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:11401: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:11404: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11407: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  ac_cv_type_pid_t=yes
 else
-  rm -rf conftest*
+  echo "$as_me: failed program was:" >&5
-  ac_cv_type_pid_t=no
+cat conftest.$ac_ext >&5
+ac_cv_type_pid_t=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$ac_t""$ac_cv_type_pid_t" 1>&6
+echo "$as_me:11417: result: $ac_cv_type_pid_t" >&5
-if test $ac_cv_type_pid_t = no; then
+echo "${ECHO_T}$ac_cv_type_pid_t" >&6
-  cat >> confdefs.h <<\EOF
+if test $ac_cv_type_pid_t = yes; then
+  :
+else
+cat >>confdefs.h <<EOF
 #define pid_t int
 EOF
 fi
-ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
+for ac_header in unistd.h vfork.h
-echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
+do
-echo "configure:8470: checking for vfork.h" >&5
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo "$as_me:11432: checking for $ac_header" >&5
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 11438 "configure"
+#include "confdefs.h"
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:11442: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  egrep -v '^ *\+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:11448: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
 else
-  cat > conftest.$ac_ext <<EOF
+  ac_cpp_err=yes
-#line 8475 "configure"
+fi
-#include "confdefs.h"
+if test -z "$ac_cpp_err"; then
-#include <vfork.h>
+  eval "$as_ac_Header=yes"
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
 else
-  echo "$ac_err" >&5
+  echo "$as_me: failed program was:" >&5
-  echo "configure: failed program was:" >&5
  cat conftest.$ac_ext >&5
-  rm -rf conftest*
+  eval "$as_ac_Header=no"
-  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_ext
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+echo "$as_me:11467: result: `eval echo '${'$as_ac_Header'}'`" >&5
-  echo "$ac_t""yes" 1>&6
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-  cat >> confdefs.h <<\EOF
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-#define HAVE_VFORK_H 1
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 EOF
-else
-  echo "$ac_t""no" 1>&6
 fi
+done
-echo $ac_n "checking for working vfork""... $ac_c" 1>&6
+for ac_func in fork vfork
-echo "configure:8505: checking for working vfork" >&5
+do
-if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-  echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:11480: checking for $ac_func" >&5
-else
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-  if test "$cross_compiling" = yes; then
+if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ac_n "checking for vfork""... $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
-echo "configure:8511: checking for vfork" >&5
-if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 8516 "configure"
+#line 11486 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char vfork(); below.  */
+    which can conflict with char $ac_func (); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
+   builtin and then its argument prototype would still apply.  */
-char vfork();
+char $ac_func ();
+char (*f) ();
-int main() {
+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_vfork) || defined (__stub___vfork)
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-vfork();
+f = $ac_func;
 #endif
-; return 0; }
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:11517: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11520: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:11523: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11526: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:11536: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
-if { (eval echo configure:8539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_vfork=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_vfork=no"
-fi
-rm -f conftest*
 fi
+done
-if eval "test \"`echo '$ac_cv_func_'vfork`\" = yes"; then
+ac_cv_func_fork_works=$ac_cv_func_fork
-  echo "$ac_t""yes" 1>&6
+if test "x$ac_cv_func_fork" = xyes; then
-  :
+  echo "$as_me:11548: checking for working fork" >&5
+echo $ECHO_N "checking for working fork... $ECHO_C" >&6
+if test "${ac_cv_func_fork_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  echo "$ac_t""no" 1>&6
+  if test "$cross_compiling" = yes; then
+  ac_cv_func_fork_works=cross
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* By R�diger Kuhlmann. */
+      #include <sys/types.h>
+      #if HAVE_UNISTD_H
+      # include <unistd.h>
+      #endif
+      /* Some systems only have a dummy stub for fork() */
+      int main ()
+      {
+        if (fork() < 0)
+          exit (1);
+        exit (0);
+      }
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:11571: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11574: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:11576: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11579: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_fork_works=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_func_fork_works=no
+fi
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+echo "$as_me:11591: result: $ac_cv_func_fork_works" >&5
+echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+fi
+if test "x$ac_cv_func_fork_works" = xcross; then
+  case $host in
+    *-*-amigaos* | *-*-msdosdjgpp*)
+      # Override, as these systems have only a dummy fork() stub
+      ac_cv_func_fork_works=no
+      ;;
+    *)
+      ac_cv_func_fork_works=yes
+      ;;
+  esac
+  { echo "$as_me:11605: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
 fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
+if test "x$ac_cv_func_vfork" = xyes; then
+  echo "$as_me:11610: checking for working vfork" >&5
+echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
+if test "${ac_cv_func_vfork_works+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  if test "$cross_compiling" = yes; then
-#line 8561 "configure"
+  ac_cv_func_vfork_works=cross
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 11619 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
-#ifdef HAVE_VFORK_H
+#if HAVE_VFORK_H
-#include <vfork.h>
+# include <vfork.h>
 #endif
 /* On some sparc systems, changes by the child to local and incoming
-   argument registers are propagated back to the parent.
+   argument registers are propagated back to the parent.  The compiler
-   The compiler is told about this with #include <vfork.h>,
+   is told about this with #include <vfork.h>, but some compilers
-   but some compilers (e.g. gcc -O) don't grok <vfork.h>.
+   (e.g. gcc -O) don't grok <vfork.h>.  Test for this by using a
-   Test for this by using a static variable whose address
+   static variable whose address is put into a register that is
-   is put into a register that is clobbered by the vfork.  */
+   clobbered by the vfork.  */
 static
 #ifdef __cplusplus
 sparc_address_test (int arg)
-#else
+# else
 sparc_address_test (arg) int arg;
 #endif
 {
@@ -8596,7 +11655,10 @@ sparc_address_test (arg) int arg;
    }
  }
 }
-main() {
+int
+main ()
+{
  pid_t parent = getpid ();
  pid_t child;
@@ -8605,16 +11667,15 @@ main() {
  child = vfork ();
  if (child == 0) {
-    /* Here is another test for sparc vfork register problems.
+    /* Here is another test for sparc vfork register problems.  This
-       This test uses lots of local variables, at least
+       test uses lots of local variables, at least as many local
-       as many local variables as main has allocated so far
+       variables as main has allocated so far including compiler
-       including compiler temporaries.  4 locals are enough for
+       temporaries.  4 locals are enough for gcc 1.40.3 on a Solaris
-       gcc 1.40.3 on a Solaris 4.1.3 sparc, but we use 8 to be safe.
+       4.1.3 sparc, but we use 8 to be safe.  A buggy compiler should
-       A buggy compiler should reuse the register of parent
+       reuse the register of parent for one of the local variables,
-       for one of the local variables, since it will think that
+       since it will think that parent can't possibly be used any more
-       parent can't possibly be used any more in this routine.
+       in this routine.  Assigning to the local variable will thus
-       Assigning to the local variable will thus munge parent
+       munge parent in the parent process.  */
-       in the parent process.  */
    pid_t
      p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
      p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
@@ -8624,11 +11685,10 @@ main() {
        || p != p5 || p != p6 || p != p7)
      _exit(1);
-    /* On some systems (e.g. IRIX 3.3),
+    /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent
-       vfork doesn't separate parent from child file descriptors.
+       from child file descriptors.  If the child closes a descriptor
-       If the child closes a descriptor before it execs or exits,
+       before it execs or exits, this munges the parent's descriptor
-       this munges the parent's descriptor as well.
+       as well.  Test for this by closing stdout in the child.  */
-       Test for this by closing stdout in the child.  */
    _exit(close(fileno(stdout)) != 0);
  } else {
    int status;
@@ -8651,65 +11711,112 @@ main() {
         );
  }
 }
-EOF
+_ACEOF
-if { (eval echo configure:8656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+rm -f conftest$ac_exeext
-then
+if { (eval echo "$as_me:11716: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:11719: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:11721: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11724: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  ac_cv_func_vfork_works=yes
 else
-  echo "configure: failed program was:" >&5
+  echo "$as_me: program exited with status $ac_status" >&5
-  cat conftest.$ac_ext >&5
+echo "$as_me: failed program was:" >&5
-  rm -fr conftest*
+cat conftest.$ac_ext >&5
-  ac_cv_func_vfork_works=no
+ac_cv_func_vfork_works=no
+fi
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-rm -fr conftest*
 fi
+echo "$as_me:11736: result: $ac_cv_func_vfork_works" >&5
+echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
+fi;
+if test "x$ac_cv_func_fork_works" = xcross; then
+  ac_cv_func_vfork_works=ac_cv_func_vfork
+  { echo "$as_me:11742: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
 fi
-echo "$ac_t""$ac_cv_func_vfork_works" 1>&6
+if test "x$ac_cv_func_vfork_works" = xyes; then
-if test $ac_cv_func_vfork_works = no; then
-  cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
+#define HAVE_WORKING_VFORK 1
+EOF
+else
+cat >>confdefs.h <<\EOF
 #define vfork fork
 EOF
 fi
+if test "x$ac_cv_func_fork_works" = xyes; then
+cat >>confdefs.h <<\EOF
+#define HAVE_WORKING_FORK 1
+EOF
+fi
 # Fixme: This should be replaced when we have autoconf 2.14.
-echo $ac_n "checking for size_t""... $ac_c" 1>&6
+echo "$as_me:11768: checking for size_t" >&5
-echo "configure:8681: checking for size_t" >&5
+echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat > conftest.$ac_ext <<EOF
+  cat >conftest.$ac_ext <<_ACEOF
-#line 8686 "configure"
+#line 11774 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
+$ac_includes_default
-#if STDC_HEADERS
+int
-#include <stdlib.h>
+main ()
-#include <stddef.h>
+{
-#endif
+if ((size_t *) 0)
-EOF
+  return 0;
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+if (sizeof (size_t))
-  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  return 0;
-  rm -rf conftest*
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:11789: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:11792: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:11795: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:11798: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
  ac_cv_type_size_t=yes
 else
-  rm -rf conftest*
+  echo "$as_me: failed program was:" >&5
-  ac_cv_type_size_t=no
+cat conftest.$ac_ext >&5
+ac_cv_type_size_t=no
 fi
-rm -f conftest*
+rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$ac_t""$ac_cv_type_size_t" 1>&6
+echo "$as_me:11808: result: $ac_cv_type_size_t" >&5
-if test $ac_cv_type_size_t = no; then
+echo "${ECHO_T}$ac_cv_type_size_t" >&6
-  cat >> confdefs.h <<\EOF
+if test $ac_cv_type_size_t = yes; then
+  :
+else
+cat >>confdefs.h <<EOF
 #define size_t unsigned
 EOF
 fi
 # Set up the CFLAGS for real compilation, so we can substitute it.
 CFLAGS="$REAL_CFLAGS"
 CPPFLAGS="$REAL_CPPFLAGS"
@@ -8718,113 +11825,84 @@ CPPFLAGS="$REAL_CPPFLAGS"
 version=`grep 'defconst[         ]*emacs-version' ${srcdir}/lisp/version.el \
         | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
 if test x"${version}" = x; then
-  { echo "configure: error: can't find current emacs version in \`${srcdir}/lisp/version.el'." 1>&2; exit 1; }
+  { { echo "$as_me:11828: error: can't find current emacs version in \`${srcdir}/lisp/version.el'." >&5
+echo "$as_me: error: can't find current emacs version in \`${srcdir}/lisp/version.el'." >&2;}
+   { (exit 1); exit 1; }; }
 fi
 ### Specify what sort of things we'll be editing into Makefile and config.h.
 ### Use configuration here uncanonicalized to avoid exceeding size limits.
+cat >>confdefs.h <<EOF
-cat >> confdefs.h <<EOF
 #define EMACS_CONFIGURATION "${canonical}"
 EOF
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define EMACS_CONFIG_OPTIONS "${ac_configure_args}"
 EOF
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define config_machfile "${machfile}"
 EOF
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define config_opsysfile "${opsysfile}"
 EOF
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define LD_SWITCH_X_SITE ${LD_SWITCH_X_SITE}
 EOF
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define LD_SWITCH_X_SITE_AUX ${LD_SWITCH_X_SITE_AUX}
 EOF
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define C_SWITCH_X_SITE ${C_SWITCH_X_SITE}
 EOF
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<EOF
 #define UNEXEC_SRC ${UNEXEC_SRC}
 EOF
 if test "${HAVE_X_WINDOWS}" = "yes" ; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define HAVE_X_WINDOWS 1
 EOF
 fi
 if test "${USE_X_TOOLKIT}" != "none" ; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define USE_X_TOOLKIT 1
 EOF
 fi
 if test "${HAVE_X11}" = "yes" ; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define HAVE_X11 1
 EOF
 fi
 if test "${HAVE_XFREE386}" = "yes" ; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define HAVE_XFREE386 1
 EOF
 fi
 if test "${HAVE_MENUS}" = "yes" ; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define HAVE_MENUS 1
 EOF
 fi
 if test "${GNU_MALLOC}" = "yes" ; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define GNU_MALLOC 1
 EOF
 fi
 if test "${REL_ALLOC}" = "yes" ; then
-  cat >> confdefs.h <<\EOF
+  cat >>confdefs.h <<\EOF
 #define REL_ALLOC 1
 EOF
@@ -8875,413 +11953,881 @@ test "${exec_prefix}" != NONE &&
 ## from Makefile.c can correctly provide the arg `-traditional' to the
 ## C preprocessor.
-cat > conftest.$ac_ext <<EOF
+cat >conftest.$ac_ext <<_ACEOF
-#line 8880 "configure"
+#line 11957 "configure"
 #include "confdefs.h"
 yes..yes
-EOF
+_ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
  egrep "yes..yes" >/dev/null 2>&1; then
-  rm -rf conftest*
  CPP_NEED_TRADITIONAL=no
 else
-  rm -rf conftest*
  CPP_NEED_TRADITIONAL=yes
 fi
 rm -f conftest*
+ac_config_files="$ac_config_files Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile man/Makefile lwlib/Makefile src/Makefile.c:src/Makefile.in lisp/Makefile leim/Makefile"
-trap '' 1 2 15
+ac_config_commands="$ac_config_commands default"
-cat > confcache <<\EOF
+cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
+# scripts and configure runs, see configure's option --config-cache.
-# If it contains results you don't want to keep, you may remove or edit it.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
 #
-# By default, configure uses ./config.cache as the cache file,
+# config.status only pays attention to the cache file if you give it
-# creating it if it does not exist already.  You can give configure
+# the --recheck option to rerun configure.
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
 #
-EOF
+# `ac_cv_env_foo' variables (set or unset) will be overriden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+_ACEOF
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
+{
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  (set) 2>&1 |
-  *ac_space=\ *)
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    # `set' does not quote correctly, so add quotes (double-quote substitution
+    *ac_space=\ *)
-    # turns \\\\ into \\, and sed turns \\ into \).
+      # `set' does not quote correctly, so add quotes (double-quote
-    sed -n \
+      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      -e "s/'/'\\\\''/g" \
+      sed -n \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+        "s/'/'\\\\''/g;
-    ;;
+          s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-  *)
+      ;;
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    *)
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
-    ;;
+      sed -n \
-  esac >> confcache
+        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-if cmp -s $cache_file confcache; then
+      ;;
-  :
+    esac;
-else
+} |
+  sed '
+     t clear
+     : clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     : end' >>confcache
+if cmp -s $cache_file confcache; then :; else
  if test -w $cache_file; then
-    echo "updating cache $cache_file"
+    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache > $cache_file
+    cat confcache >$cache_file
  else
    echo "not updating unwritable cache $cache_file"
  fi
 fi
 rm -f confcache
-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
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# the first set of double-colon rules, so remove it if not needed.
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# If there is a colon in the path, we need to keep it.
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[         ]*VPATH[        ]*=[^:]*$/d'
+  ac_vpsub='/^[         ]*VPATH[        ]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[    ]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[      ]*$//;
+}'
 fi
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
 DEFS=-DHAVE_CONFIG_H
-# Without the "./", some shells look in PATH for config.status.
 : ${CONFIG_STATUS=./config.status}
+ac_clean_files_save=$ac_clean_files
-echo creating $CONFIG_STATUS
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-rm -f $CONFIG_STATUS
+{ echo "$as_me:12050: creating $CONFIG_STATUS" >&5
-cat > $CONFIG_STATUS <<EOF
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
-#! /bin/sh
+cat >$CONFIG_STATUS <<_ACEOF
+#! $SHELL
 # 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 $ac_configure_args
-#
 # Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
+# configure, is in config.log if it exists.
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
+debug=false
-for ac_option
+SHELL=\${CONFIG_SHELL-$SHELL}
+ac_cs_invocation="\$0 \$@"
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+  set -o posix
+fi
+# Name of the executable.
+as_me=`echo "$0" |sed 's,.*[\\/],,'`
+if expr a : '\(a\)' >/dev/null 2>&1; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+  # We could just check for DJGPP; but this test a) works b) is more generic
+  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+  if test -f conf$$.exe; then
+    # Don't use ln at all; we don't have any links
+    as_ln_s='cp -p'
+  else
+    as_ln_s='ln -s'
+  fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+  as_ln_s=ln
+else
+  as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+as_executable_p="test -f"
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+  as_unset=unset
+else
+  as_unset=false
+fi
+# NLS nuisances.
+$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS="   $as_nl"
+# CDPATH.
+$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+exec 6>&1
+_ACEOF
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
+cat >>$CONFIG_STATUS <<\EOF
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+Usage: $0 [OPTIONS] [FILE]...
+  -h, --help       print this help, then exit
+  -V, --version    print version number, then exit
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+  --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+  --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+Configuration files:
+$config_files
+Configuration headers:
+$config_headers
+Configuration commands:
+$config_commands
+Report bugs to <bug-autoconf@gnu.org>."
+EOF
+cat >>$CONFIG_STATUS <<EOF
+ac_cs_version="\\
+config.status
+configured by $0, generated by GNU Autoconf 2.52,
+  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+srcdir=$srcdir
+INSTALL="$INSTALL"
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+# If no file are specified by the user, then we need to provide default
+# value.  By we need to know if files were specified by the user.
+ac_need_defaults=:
+while test $# != 0
 do
-  case "\$ac_option" in
+  case $1 in
+  --*=*)
+    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+    shift
+    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
+    shift
+    ;;
+  -*);;
+  *) # This is not an option, so the user has probably given explicit
+     # arguments.
+     ac_need_defaults=false;;
+  esac
+  case $1 in
+  # Handling of the options.
+EOF
+cat >>$CONFIG_STATUS <<EOF
  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+EOF
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+cat >>$CONFIG_STATUS <<\EOF
-    exit 0 ;;
+  --version | --vers* | -V )
-  -help | --help | --hel | --he | --h)
+    echo "$ac_cs_version"; exit 0 ;;
-    echo "\$ac_cs_usage"; exit 0 ;;
+  --he | --h)
-  *) echo "\$ac_cs_usage"; exit 1 ;;
+    # Conflict between --help and --header
+    { { echo "$as_me:12226: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    shift
+    CONFIG_FILES="$CONFIG_FILES $1"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $1"
+    ac_need_defaults=false;;
+  # This is an error.
+  -*) { { echo "$as_me:12245: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2;}
+   { (exit 1); exit 1; }; } ;;
+  *) ac_config_targets="$ac_config_targets $1" ;;
  esac
+  shift
 done
-ac_given_srcdir=$srcdir
+exec 5>>config.log
-ac_given_INSTALL="$INSTALL"
+cat >&5 << _ACEOF
-trap 'rm -fr `echo "Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \
+## ----------------------- ##
-        man/Makefile lwlib/Makefile src/Makefile.c:src/Makefile.in \
+## Running config.status.  ##
-        lisp/Makefile leim/Makefile src/config.h:src/config.in" | 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.
+This file was extended by $as_me 2.52, executed with
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
+  CONFIG_FILES    = $CONFIG_FILES
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
+  CONFIG_HEADERS  = $CONFIG_HEADERS
-$ac_vpsub
+  CONFIG_LINKS    = $CONFIG_LINKS
-$extrasub
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
-s%@SHELL@%$SHELL%g
+  > $ac_cs_invocation
-s%@CFLAGS@%$CFLAGS%g
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@CC@%$CC%g
-s%@LN_S@%$LN_S%g
-s%@CPP@%$CPP%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@YACC@%$YACC%g
-s%@RANLIB@%$RANLIB%g
-s%@LIBSOUND@%$LIBSOUND%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@ALLOCA@%$ALLOCA%g
-s%@liblockfile@%$liblockfile%g
-s%@LIBOBJS@%$LIBOBJS%g
-s%@NEED_SETGID@%$NEED_SETGID%g
-s%@KMEM_GROUP@%$KMEM_GROUP%g
-s%@version@%$version%g
-s%@configuration@%$configuration%g
-s%@canonical@%$canonical%g
-s%@srcdir@%$srcdir%g
-s%@lispdir@%$lispdir%g
-s%@locallisppath@%$locallisppath%g
-s%@lisppath@%$lisppath%g
-s%@x_default_search_path@%$x_default_search_path%g
-s%@etcdir@%$etcdir%g
-s%@archlibdir@%$archlibdir%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%@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%@X_TOOLKIT_TYPE@%$X_TOOLKIT_TYPE%g
-s%@machfile@%$machfile%g
-s%@opsysfile@%$opsysfile%g
-s%@GETLOADAVG_LIBS@%$GETLOADAVG_LIBS%g
-CEOF
+_ACEOF
 EOF
-cat >> $CONFIG_STATUS <<\EOF
+cat >>$CONFIG_STATUS <<EOF
+#
+# INIT-COMMANDS section.
+#
-# Split the substitutions into bite-sized pieces for seds with
+GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPP_NEED_TRADITIONAL="$CPP_NEED_TRADITIONAL" CPPFLAGS="$CPPFLAGS"
-# 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.
+EOF
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
+cat >>$CONFIG_STATUS <<\EOF
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
+for ac_config_target in $ac_config_targets
-ac_more_lines=:
+do
-ac_sed_cmds=""
+  case "$ac_config_target" in
-while $ac_more_lines; do
+  # Handling of arguments.
-  if test $ac_beg -gt 1; then
+  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+  "lib-src/Makefile.c" ) CONFIG_FILES="$CONFIG_FILES lib-src/Makefile.c:lib-src/Makefile.in" ;;
-  else
+  "oldXMenu/Makefile" ) CONFIG_FILES="$CONFIG_FILES oldXMenu/Makefile" ;;
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+  "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
-  fi
+  "lwlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lwlib/Makefile" ;;
-  if test ! -s conftest.s$ac_file; then
+  "src/Makefile.c" ) CONFIG_FILES="$CONFIG_FILES src/Makefile.c:src/Makefile.in" ;;
-    ac_more_lines=false
+  "lisp/Makefile" ) CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;;
-    rm -f conftest.s$ac_file
+  "leim/Makefile" ) CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;;
-  else
+  "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-    if test -z "$ac_sed_cmds"; then
+  "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:src/config.in" ;;
-      ac_sed_cmds="sed -f conftest.s$ac_file"
+  *) { { echo "$as_me:12299: error: invalid argument: $ac_config_target" >&5
-    else
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+   { (exit 1); exit 1; }; };;
-    fi
+  esac
-    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
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
+# Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+  trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+: ${TMPDIR=/tmp}
+{
+  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
+  test -n "$tmp" && test -d "$tmp"
+}  ||
+{
+  tmp=$TMPDIR/cs$$-$RANDOM
+  (umask 077 && mkdir $tmp)
+} ||
+{
+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+   { (exit 1); exit 1; }
+}
 EOF
-cat >> $CONFIG_STATUS <<EOF
+cat >>$CONFIG_STATUS <<EOF
+#
+# CONFIG_FILES section.
+#
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+  # Protect against being on the right side of a sed subst in config.status.
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+s,@build_alias@,$build_alias,;t t
+s,@host_alias@,$host_alias,;t t
+s,@target_alias@,$target_alias,;t t
+s,@ECHO_C@,$ECHO_C,;t t
+s,@ECHO_N@,$ECHO_N,;t t
+s,@ECHO_T@,$ECHO_T,;t t
+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@DEFS@,$DEFS,;t t
+s,@LIBS@,$LIBS,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@LN_S@,$LN_S,;t t
+s,@CPP@,$CPP,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@YACC@,$YACC,;t t
+s,@RANLIB@,$RANLIB,;t t
+s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+s,@LIBSOUND@,$LIBSOUND,;t t
+s,@SET_MAKE@,$SET_MAKE,;t t
+s,@ALLOCA@,$ALLOCA,;t t
+s,@liblockfile@,$liblockfile,;t t
+s,@LIBOBJS@,$LIBOBJS,;t t
+s,@NEED_SETGID@,$NEED_SETGID,;t t
+s,@KMEM_GROUP@,$KMEM_GROUP,;t t
+s,@GETLOADAVG_LIBS@,$GETLOADAVG_LIBS,;t t
+s,@version@,$version,;t t
+s,@configuration@,$configuration,;t t
+s,@canonical@,$canonical,;t t
+s,@srcdir@,$srcdir,;t t
+s,@lispdir@,$lispdir,;t t
+s,@locallisppath@,$locallisppath,;t t
+s,@lisppath@,$lisppath,;t t
+s,@x_default_search_path@,$x_default_search_path,;t t
+s,@etcdir@,$etcdir,;t t
+s,@archlibdir@,$archlibdir,;t t
+s,@docdir@,$docdir,;t t
+s,@bitmapdir@,$bitmapdir,;t t
+s,@c_switch_system@,$c_switch_system,;t t
+s,@c_switch_machine@,$c_switch_machine,;t t
+s,@LD_SWITCH_X_SITE@,$LD_SWITCH_X_SITE,;t t
+s,@LD_SWITCH_X_SITE_AUX@,$LD_SWITCH_X_SITE_AUX,;t t
+s,@C_SWITCH_X_SITE@,$C_SWITCH_X_SITE,;t t
+s,@X_TOOLKIT_TYPE@,$X_TOOLKIT_TYPE,;t t
+s,@machfile@,$machfile,;t t
+s,@opsysfile@,$opsysfile,;t t
+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_lines=48
+  ac_sed_frag=1 # Number of current file.
+  ac_beg=1 # First line for current file.
+  ac_end=$ac_max_sed_lines # Line after last line for current file.
+  ac_more_lines=:
+  ac_sed_cmds=
+  while $ac_more_lines; do
+    if test $ac_beg -gt 1; then
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    else
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+    fi
+    if test ! -s $tmp/subs.frag; then
+      ac_more_lines=false
+    else
+      # The purpose of the label and of the branching condition is to
+      # speed up the sed processing (if there are no `@' at all, there
+      # is no need to browse any of the substitutions).
+      # These are the two extra sed commands mentioned above.
+      (echo ':t
+  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+      if test -z "$ac_sed_cmds"; then
+        ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+      else
+        ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+      fi
+      ac_sed_frag=`expr $ac_sed_frag + 1`
+      ac_beg=$ac_end
+      ac_end=`expr $ac_end + $ac_max_sed_lines`
+    fi
+  done
+  if test -z "$ac_sed_cmds"; then
+    ac_sed_cmds=cat
+  fi
+fi # test -n "$CONFIG_FILES"
-CONFIG_FILES=\${CONFIG_FILES-"Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \
-        man/Makefile lwlib/Makefile src/Makefile.c:src/Makefile.in \
-        lisp/Makefile leim/Makefile"}
 EOF
-cat >> $CONFIG_STATUS <<\EOF
+cat >>$CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
+  case $ac_file in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+  - | *:- | *:-:* ) # input from stdin
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+        cat >$tmp/stdin
-  *) ac_file_in="${ac_file}.in" ;;
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
  esac
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+  ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-  # Remove last slash and all that follows it.  Not all systems have dirname.
+         X"$ac_file" : 'X\(//\)[^/]' \| \
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+          /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+          /^X\(\/\/\)$/{ s//\1/; q; }
+          /^X\(\/\).*/{ s//\1/; q; }
+          s/.*/./; q'`
  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
+    { case "$ac_dir" in
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
+  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+  *)                      as_incr_dir=.;;
+esac
+as_dummy="$ac_dir"
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+  case $as_mkdir_dir in
+    # Skip DOS drivespec
+    ?:) as_incr_dir=$as_mkdir_dir ;;
+    *)
+      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
+    ;;
+  esac
+done; }
+    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'`
+    ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
  else
    ac_dir_suffix= ac_dots=
  fi
-  case "$ac_given_srcdir" in
+  case $srcdir in
-  .)  srcdir=.
+  .)  ac_srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
+      if test -z "$ac_dots"; then
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
+         ac_top_srcdir=.
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+      else
+         ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
+      fi ;;
+  [\\/]* | ?:[\\/]* )
+      ac_srcdir=$srcdir$ac_dir_suffix;
+      ac_top_srcdir=$srcdir ;;
  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+    ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
+    ac_top_srcdir=$ac_dots$srcdir ;;
  esac
-  case "$ac_given_INSTALL" in
+  case $INSTALL in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+  *) ac_INSTALL=$ac_dots$INSTALL ;;
  esac
-  echo creating "$ac_file"
+  if test x"$ac_file" != x-; then
-  rm -f "$ac_file"
+    { echo "$as_me:12546: creating $ac_file" >&5
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+echo "$as_me: creating $ac_file" >&6;}
-  case "$ac_file" in
+    rm -f "$ac_file"
-  *Makefile*) ac_comsub="1i\\
+  fi
-# $configure_input" ;;
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  *) ac_comsub= ;;
+  # use $as_me), people would be surprised to read:
-  esac
+  #    /* config.h.  Generated automatically by config.status.  */
+  configure_input="Generated automatically from `echo $ac_file_in |
+                                                 sed 's,.*/,,'` by configure."
+  # First look for the input files in the build tree, otherwise in the
+  # src tree.
+  ac_file_inputs=`IFS=:
+    for f in $ac_file_in; do
+      case $f in
+      -) echo $tmp/stdin ;;
+      [\\/$]*)
+         # Absolute (can't be DOS-style, as IFS=:)
+         test -f "$f" || { { echo "$as_me:12564: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         echo $f;;
+      *) # Relative
+         if test -f "$f"; then
+           # Build tree
+           echo $f
+         elif test -f "$srcdir/$f"; then
+           # Source tree
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:12577: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         fi;;
+      esac
+    done` || { (exit 1); exit 1; }
+EOF
+cat >>$CONFIG_STATUS <<EOF
+  sed "$ac_vpsub
+$extrasub
+EOF
+cat >>$CONFIG_STATUS <<\EOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  rm -f $tmp/stdin
+  if test x"$ac_file" != x-; then
+    mv $tmp/out $ac_file
+  else
+    cat $tmp/out
+    rm -f $tmp/out
+  fi
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+done
-  sed -e "$ac_comsub
+EOF
-s%@configure_input@%$configure_input%g
+cat >>$CONFIG_STATUS <<\EOF
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
+#
-s%@INSTALL@%$INSTALL%g
+# CONFIG_HEADER section.
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+#
-fi; done
-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_dA='s,^\([   ]*\)#\([        ]*define[       ][      ]*\)'
-ac_dB='\([      ][      ]*\)[^  ]*%\1#\2'
+ac_dB='[        ].*$,\1#\2'
-ac_dC='\3'
+ac_dC=' '
-ac_dD='%g'
+ac_dD=',;t'
-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
+# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s%^\([   ]*\)#\([        ]*\)undef\([    ][      ]*\)'
+ac_uA='s,^\([   ]*\)#\([        ]*\)undef\([    ][      ]*\)'
-ac_uB='\([      ]\)%\1#\2define\3'
+ac_uB='$,\1#\2define\3'
 ac_uC=' '
-ac_uD='\4%g'
+ac_uD=',;t'
-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s%^\([   ]*\)#\([        ]*\)undef\([    ][      ]*\)'
-ac_eB='$%\1#\2define\3'
-ac_eC=' '
-ac_eD='%g'
-if test "${CONFIG_HEADERS+set}" != set; then
+for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-EOF
-cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="src/config.h:src/config.in"
-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
+  case $ac_file in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+  - | *:- | *:-:* ) # input from stdin
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+        cat >$tmp/stdin
-  *) ac_file_in="${ac_file}.in" ;;
+        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+  * )   ac_file_in=$ac_file.in ;;
  esac
-  echo creating $ac_file
+  test x"$ac_file" != x- && { echo "$as_me:12638: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
-  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"`
+  # First look for the input files in the build tree, otherwise in the
-  cat $ac_file_inputs > conftest.in
+  # src tree.
+  ac_file_inputs=`IFS=:
-EOF
+    for f in $ac_file_in; do
+      case $f in
-# Transform confdefs.h into a sed script conftest.vals that substitutes
+      -) echo $tmp/stdin ;;
-# 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.
+         # Absolute (can't be DOS-style, as IFS=:)
-# Protect against being in an unquoted here document in config.status.
+         test -f "$f" || { { echo "$as_me:12649: error: cannot find input file: $f" >&5
-rm -f conftest.vals
+echo "$as_me: error: cannot find input file: $f" >&2;}
-cat > conftest.hdr <<\EOF
+   { (exit 1); exit 1; }; }
-s/[\\&%]/\\&/g
+         echo $f;;
-s%[\\$`]%\\&%g
+      *) # Relative
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
+         if test -f "$f"; then
-s%ac_d%ac_u%gp
+           # Build tree
-s%ac_u%ac_e%gp
+           echo $f
-EOF
+         elif test -f "$srcdir/$f"; then
-sed -n -f conftest.hdr confdefs.h > conftest.vals
+           # Source tree
-rm -f conftest.hdr
+           echo $srcdir/$f
+         else
+           # /dev/null tree
+           { { echo "$as_me:12662: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+   { (exit 1); exit 1; }; }
+         fi;;
+      esac
+    done` || { (exit 1); exit 1; }
+  # Remove the trailing spaces.
+  sed 's/[      ]*$//' $ac_file_inputs >$tmp/in
+EOF
+# Transform confdefs.h into two sed scripts, `conftest.defines' and
+# `conftest.undefs', that substitutes the proper values into
+# config.h.in to produce config.h.  The first handles `#define'
+# templates, and the second `#undef' templates.
+# 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.defines conftest.undefs
+# Using a here document instead of a string reduces the quoting nightmare.
+# Putting comments in sed scripts is not portable.
+#
+# `end' is used to avoid that the second main sed command (meant for
+# 0-ary CPP macros) applies to n-ary macro definitions.
+# See the Autoconf documentation for `clear'.
+cat >confdef2sed.sed <<\EOF
+s/[\\&,]/\\&/g
+s,[\\$`],\\&,g
+t clear
+: clear
+s,^[    ]*#[    ]*define[       ][      ]*\(\([^        (][^    (]*\)([^)]*)\)[         ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp
+t end
+s,^[    ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+: end
+EOF
+# If some macros were called several times there might be several times
+# the same #defines, which is useless.  Nevertheless, we may not want to
+# sort them, since we want the *last* AC-DEFINE to be honored.
+uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
+sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
+rm -f confdef2sed.sed
 # 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
+cat >>conftest.undefs <<\EOF
-s%^[    ]*#[    ]*undef[        ][      ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
+s,^[    ]*#[    ]*undef[        ][      ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
 EOF
-# Break up conftest.vals because some shells have a limit on
+# Break up conftest.defines because some shells have a limit on the size
-# the size of here documents, and old seds have small limits too.
+# of here documents, and old seds have small limits too (100 cmds).
+echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+echo '  if egrep "^[    ]*#[    ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+echo '  :' >>$CONFIG_STATUS
+rm -f conftest.tail
+while grep . conftest.defines >/dev/null
+do
+  # Write a limited-size here document to $tmp/defines.sed.
+  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+  # Speed up: don't consider the non `#define' lines.
+  echo '/^[     ]*#[    ]*define/!b' >>$CONFIG_STATUS
+  # Work around the forget-to-reset-the-flag bug.
+  echo 't clr' >>$CONFIG_STATUS
+  echo ': clr' >>$CONFIG_STATUS
+  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
+  echo 'CEOF
+  sed -f $tmp/defines.sed $tmp/in >$tmp/out
+  rm -f $tmp/in
+  mv $tmp/out $tmp/in
+' >>$CONFIG_STATUS
+  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
+  rm -f conftest.defines
+  mv conftest.tail conftest.defines
+done
+rm -f conftest.defines
+echo '  fi # egrep' >>$CONFIG_STATUS
+echo >>$CONFIG_STATUS
+# Break up conftest.undefs because some shells have a limit on the size
+# of here documents, and old seds have small limits too (100 cmds).
+echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
 rm -f conftest.tail
-while :
+while grep . conftest.undefs >/dev/null
 do
-  ac_lines=`grep -c . conftest.vals`
+  # Write a limited-size here document to $tmp/undefs.sed.
-  # grep -c gives empty output for an empty file on some AIX systems.
+  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
+  # Speed up: don't consider the non `#undef'
-  # Write a limited-size here document to conftest.frag.
+  echo '/^[     ]*#[    ]*undef/!b' >>$CONFIG_STATUS
-  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
+  # Work around the forget-to-reset-the-flag bug.
-  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
+  echo 't clr' >>$CONFIG_STATUS
+  echo ': clr' >>$CONFIG_STATUS
+  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
  echo 'CEOF
-  sed -f conftest.frag conftest.in > conftest.out
+  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f conftest.in
+  rm -f $tmp/in
-  mv conftest.out conftest.in
+  mv $tmp/out $tmp/in
-' >> $CONFIG_STATUS
+' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
+  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.vals
+  rm -f conftest.undefs
-  mv conftest.tail conftest.vals
+  mv conftest.tail conftest.undefs
 done
-rm -f conftest.vals
+rm -f conftest.undefs
-cat >> $CONFIG_STATUS <<\EOF
+cat >>$CONFIG_STATUS <<\EOF
-  rm -f conftest.frag conftest.h
+  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
+  # use $as_me), people would be surprised to read:
-  cat conftest.in >> conftest.h
+  #    /* config.h.  Generated automatically by config.status.  */
-  rm -f conftest.in
+  if test x"$ac_file" = x-; then
-  if cmp -s $ac_file conftest.h 2>/dev/null; then
+    echo "/* Generated automatically by configure.  */" >$tmp/config.h
-    echo "$ac_file is unchanged"
-    rm -f conftest.h
  else
-    # Remove last slash and all that follows it.  Not all systems have dirname.
+    echo "/* $ac_file.  Generated automatically by configure.  */" >$tmp/config.h
-      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+  fi
+  cat $tmp/in >>$tmp/config.h
+  rm -f $tmp/in
+  if test x"$ac_file" != x-; then
+    if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
+      { echo "$as_me:12779: $ac_file is unchanged" >&5
+echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$ac_file" : 'X\(//\)[^/]' \| \
+         X"$ac_file" : 'X\(//\)$' \| \
+         X"$ac_file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+          /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+          /^X\(\/\/\)$/{ s//\1/; q; }
+          /^X\(\/\).*/{ s//\1/; q; }
+          s/.*/./; q'`
      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-      # The file is in a subdirectory.
+        { case "$ac_dir" in
-      test ! -d "$ac_dir" && mkdir "$ac_dir"
+  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+  *)                      as_incr_dir=.;;
+esac
+as_dummy="$ac_dir"
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+  case $as_mkdir_dir in
+    # Skip DOS drivespec
+    ?:) as_incr_dir=$as_mkdir_dir ;;
+    *)
+      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
+    ;;
+  esac
+done; }
+      fi
+      rm -f $ac_file
+      mv $tmp/config.h $ac_file
    fi
-    rm -f $ac_file
+  else
-    mv conftest.h $ac_file
+    cat $tmp/config.h
+    rm -f $tmp/config.h
  fi
-fi; done
+done
-EOF
-cat >> $CONFIG_STATUS <<EOF
-GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPP_NEED_TRADITIONAL="$CPP_NEED_TRADITIONAL" CPPFLAGS="$CPPFLAGS"
 EOF
-cat >> $CONFIG_STATUS <<\EOF
+cat >>$CONFIG_STATUS <<\EOF
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+  case $ac_dest in
+    default )
 ### Make the necessary directories, if they don't exist.
 for dir in etc lisp ; do
@@ -9321,7 +12867,7 @@ echo creating lib-src/Makefile
  sed -e '1,/start of cpp stuff/d'\
      -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
      < Makefile.c > junk.c
-  $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
+  $CPP $undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
      sed -e 's/^ /     /' -e '/^#/d' -e '/^[   ]*$/d' > junk2.c
  cat junk1.c junk2.c > Makefile.new
  rm -f junk.c junk1.c junk2.c
@@ -9337,7 +12883,7 @@ echo creating src/Makefile
  sed -e '1,/start of cpp stuff/d'\
      -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
      < Makefile.c > junk.c
-  $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
+  $CPP $undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
      sed -e 's/^ /     /' -e '/^#/d' -e '/^[   ]*$/d' > junk2.c
  cat junk1.c junk2.c > Makefile.new
  rm -f junk.c junk1.c junk2.c
@@ -9345,19 +12891,41 @@ echo creating src/Makefile
  mv -f Makefile.new Makefile
 )
-if test ! -f src/.gdbinit && test -f $top_srcdir/src/.gdbinit; then
+if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then
  echo creating src/.gdbinit
-  echo source $top_srcdir/src/.gdbinit > src/.gdbinit
+  echo source $srcdir/src/.gdbinit > src/.gdbinit
 fi
 # This is how we know whether to re-run configure in certain cases.
 touch src/config.stamp
+ ;;
+  esac
+done
+EOF
+cat >>$CONFIG_STATUS <<\EOF
-exit 0
+{ (exit 0); exit 0; }
 EOF
 chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
+ac_clean_files=$ac_clean_files_save
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi
author	Andreas Schwab	2001-10-19 12:33:10 +0000
committer	Andreas Schwab	2001-10-19 12:33:10 +0000
commit	503d2be044b52f0e792dd51e3a31fed5c87447f1 (patch)
tree	fc3a2ebdcba3c47dd58b0ec6054de28a507dc9ea
parent	96ac8fc97108b142159de3a8432a7a0b2d66d140 (diff)
download	emacs-503d2be044b52f0e792dd51e3a31fed5c87447f1.tar.gz emacs-503d2be044b52f0e792dd51e3a31fed5c87447f1.zip