From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 14 May 2000 05:30:48 +0000 (-0000)
Subject: config.h.in, configure, configure.in:
X-Git-Tag: NTP_4_0_99_J~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=575e2730b358131d9cbb5a985869530464479987;p=thirdparty%2Fntp.git

config.h.in, configure, configure.in:
  Autoconf upgrade for ULONG_CONST checks

bk: 391e3a08u2v1o-E2wqMo4B4dO73jrA
---

diff --git a/config.h.in b/config.h.in
index 034d7fdff..afd9757eb 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,4 +1,9 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* Package */
+#undef PACKAGE
+
+/* Version */
+#undef VERSION
 
 /* debugging code */
 #undef DEBUG
@@ -6,6 +11,9 @@
 /* Minutes per DST adjustment */
 #undef DSTMINUTES
 
+/* MD5 authentication */
+#undef MD5
+
 /* DES authentication (COCOM only) */
 #undef DES
 
@@ -261,6 +269,9 @@
 /* can we use SIGPOLL for tty IO? */
 #undef USE_TTY_SIGPOLL
 
+/* should we use clock_settime()? */
+#undef USE_CLOCK_SETTIME
+
 /* do we want the CHU driver? */
 #undef CLOCK_CHU
 
@@ -288,6 +299,9 @@
 /* do we need an s_char typedef? */
 #undef NEED_S_CHAR_TYPEDEF
 
+/* include the GDT Surveying code? */
+#undef GDT_SURVEYING
+
 /* does SIOCGIFCONF return size in the buffer? */
 #undef SIZE_RETURNED_IN_BUFFER
 
@@ -373,6 +387,10 @@
 /* Do we have support for SHMEM_STATUS? */
 #undef ONCORE_SHMEM_STATUS
 
+/***/
+
+/* Which way should we declare... */
+
 /* adjtime()? */
 #undef DECL_ADJTIME_0
 
@@ -394,6 +412,9 @@
 /* memmove()? */
 #undef DECL_MEMMOVE_0
 
+/* memset()? */
+#undef DECL_MEMSET_0
+
 /* mkstemp()? */
 #undef DECL_MKSTEMP_0
 
diff --git a/configure b/configure
index 615555f89..e4665911c 100755
--- a/configure
+++ b/configure
@@ -1,27 +1,69 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using Autoconf version 2.14a.
+# Generated by Autoconf 2.14a.
+#
 # Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000
 # Free Software Foundation, Inc.
-#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 
-# Defaults:
+#
+# Initializations.
+#
 ac_default_prefix=/usr/local
-# Any additions from configure.in:
+subdirs=
+MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+# Maximum number of lines to put in a shell here document.
+: ${ac_max_here_lines=48}
+# Sed expression to map a string onto a valid sh and CPP variable names.
+ac_tr_sh='sed -e y%*+%pp%;s%[^a-zA-Z0-9_]%_%g'
+ac_tr_cpp='sed -e y%*abcdefghijklmnopqrstuvwxyz%PABCDEFGHIJKLMNOPQRSTUVWXYZ%;s%[^A-Z0-9_]%_%g'
+
+# By default always use an empty string as the executable extension.
+# Only change it if the script calls AC_EXEEXT.
+ac_exeext=
+# By default assume that objects files use an extension of .o.  Only
+# change it if the script calls AC_OBJEXT.
+ac_objext=o
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#include <sys/types.h>
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#else
+# if HAVE_STRINGS_H
+#  include <strings.h>
+# endif
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+ac_unique_file="ntpd/ntp_refclock.c"
 
 # Initialize some variables set by options.
-ac_init_help=false
+ac_init_help=
 ac_init_version=false
 # The variables have the same names as the options, with
 # dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
+cache_file=/dev/null
 exec_prefix=NONE
-host=NONE
 no_create=
-nonopt=NONE
 no_recursion=
 prefix=NONE
 program_prefix=NONE
@@ -30,7 +72,6 @@ program_transform_name=s,x,x,
 silent=
 site=
 srcdir=
-target=NONE
 verbose=
 x_includes=NONE
 x_libraries=NONE
@@ -47,16 +88,6 @@ oldincludedir='/usr/include'
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-: ${ac_max_here_lines=48}
-# Sed expression to map a string onto a valid sh and CPP variable names.
-ac_tr_sh='sed -e y%*+%pp%;s%[^a-zA-Z0-9_]%_%g'
-ac_tr_cpp='sed -e y%*abcdefghijklmnopqrstuvwxyz%PABCDEFGHIJKLMNOPQRSTUVWXYZ%;s%[^A-Z0-9_]%_%g'
-
 ac_prev=
 for ac_option
 do
@@ -76,31 +107,31 @@ do
   -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 ;;
   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
+    build=$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 ;;
 
   -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-//'`
     # Reject names that are not valid shell variable names.
     if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
-      { echo "configure: error: invalid feature: $ac_feature" 1>&2; exit 1; }
+      { echo "configure: error: invalid feature: $ac_feature" >&2; exit 1; }
     fi
     ac_feature=`echo $ac_feature| sed 's/-/_/g'`
     eval "enable_${ac_feature}=no" ;;
@@ -109,7 +140,7 @@ do
     ac_feature=`echo "$ac_option"|sed -e 's/-*enable-//' -e 's/=.*//'`
     # Reject names that are not valid shell variable names.
     if echo "$ac_feature" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
-      { echo "configure: error: invalid feature: $ac_feature" 1>&2; exit 1; }
+      { echo "configure: error: invalid feature: $ac_feature" >&2; exit 1; }
     fi
     ac_feature=`echo $ac_feature| sed 's/-/_/g'`
     case "$ac_option" in
@@ -125,42 +156,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 | -h)
-    ac_init_help=: ;;
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
   -host | --host | --hos | --ho)
     ac_prev=host ;;
   -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
+    host=$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 \
@@ -169,12 +205,12 @@ do
   -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.
@@ -195,26 +231,26 @@ do
   -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 \
@@ -231,7 +267,7 @@ do
   | --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)
@@ -241,7 +277,7 @@ do
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
   | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
+    sbindir=$ac_optarg ;;
 
   -sharedstatedir | --sharedstatedir | --sharedstatedi \
   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
@@ -252,29 +288,29 @@ do
   | --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 ;;
   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
+    target=$ac_optarg ;;
 
   -v | -verbose | --verbose | --verbos | --verbo | --verb)
     verbose=yes ;;
@@ -286,7 +322,7 @@ do
     ac_package=`echo "$ac_option"|sed -e 's/-*with-//' -e 's/=.*//'`
     # Reject names that are not valid shell variable names.
     if echo "$ac_package" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
-      { echo "configure: error: invalid package: $ac_package" 1>&2; exit 1; }
+      { echo "configure: error: invalid package: $ac_package" >&2; exit 1; }
     fi
     ac_package=`echo $ac_package| sed 's/-/_/g'`
     case "$ac_option" in
@@ -299,7 +335,7 @@ do
     ac_package=`echo "$ac_option"|sed -e 's/-*without-//'`
     # Reject names that are not valid shell variable names.
     if echo "$ac_package" | grep '[^-a-zA-Z0-9_]' >/dev/null 2>&1; then
-      { echo "configure: error: invalid package: $ac_package" 1>&2; exit 1; }
+      { echo "configure: error: invalid package: $ac_package" >&2; exit 1; }
     fi
     ac_package=`echo $ac_package| sed 's/-/_/g'`
     eval "with_${ac_package}=no" ;;
@@ -313,24 +349,24 @@ do
     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: unrecognized option: $ac_option
-Try \`configure --help' for more information." 1>&2; exit 1; }
+Try \`configure --help' for more information." >&2; exit 1; }
     ;;
 
   *=*)
     ac_envvar=`echo "$ac_option" | sed -e 's/=.*//'`
     # Reject names that are not valid shell variable names.
     if echo "$ac_envvar" | grep '[^a-zA-Z0-9_]' >/dev/null 2>&1; then
-      { echo "configure: error: invalid variable name: $ac_envvar" 1>&2; exit 1; }
+      { echo "configure: error: invalid variable name: $ac_envvar" >&2; exit 1; }
     fi
     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
     eval "$ac_envvar='$ac_optarg'"
@@ -338,72 +374,110 @@ Try \`configure --help' for more information." 1>&2; exit 1; }
 
   *)
     if echo "$ac_option" | grep '[^-a-zA-Z0-9.]' >/dev/null 2>&1; then
-      echo "configure: warning: invalid host type: $ac_option" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
+      echo "configure: warning: invalid host type: $ac_option" >&2
     fi
-    nonopt="$ac_option"
+    echo "configure: warning: you should use --build, --host, --target" >&2
+    : ${build=$ac_option} ${host=$ac_option} ${target=$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; }
+  { echo "configure: error: missing argument to --\`echo $ac_prev | sed 's/_/-/g'\`" >&2; exit 1; }
 fi
-if $ac_init_help; then
+
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+              localstatedir libdir includedir oldincludedir infodir mandir \
+              exec_prefix prefix
+do
+  eval ac_val=$`echo $ac_var`
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* ) ;;
+    NONE ) ;;
+    *)  { echo "configure: error: expected an absolute path for --$ac_var: $ac_val" >&2; exit 1; };;
+  esac
+done
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then its parent.
+  ac_prog=$0
+  ac_confdir=`echo "$ac_prog" | sed 's%/[^/][^/]*$%%'`
+  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
+  srcdir=$ac_confdir
+  if test ! -r $srcdir/$ac_unique_file; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r $srcdir/$ac_unique_file; then
+  if test "$ac_srcdir_defaulted" = yes; then
+    { echo "configure: error: cannot find sources in $ac_confdir or .." >&2; exit 1; }
+  else
+    { echo "configure: error: cannot find sources in $srcdir" >&2; exit 1; }
+  fi
+fi
+srcdir=`echo "$srcdir" | sed 's%\([^/]\)/*$%\1%'`
+
+#
+# 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 software source code packages to adapt to many kinds
-of systems.
+  cat <<EOF
+\`configure' configures this package to adapt to many kinds of systems.
 
-Usage: configure [OPTION]... [VAR=VALUE]... [HOST]
+Usage: $0 [OPTION]... [VAR=VALUE]...
 
-To safely assign special values to environment variables (e.g., CC,
-CFLAGS...), give to `configure' the definition as VAR=VALUE.
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.
 
 Defaults for the options are specified in brackets.
 
 Configuration:
-  -h, --help              print this message
-  -V, --version           print the version of autoconf that created configure
-  -q, --quiet, --silent   do not print `checking...' messages
-      --cache-file=FILE   cache test results in FILE
+  -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]
   -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
 EOF
 
   cat <<EOF
-Directories:
+Installation directories:
   --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 ..]
-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]
+                          [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
@@ -413,9 +487,20 @@ Program names:
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
 
+Hosts type:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       configure for building programs running on HOST [BUILD]
+  --target=TARGET   configure for building compilers for TARGET [HOST]
+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
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-dependency-tracking Speeds up one-time builds
   --enable-dependency-tracking  Do not reject slow dependency extractors
   --enable-debugging      + include debugging code
@@ -482,21 +567,53 @@ Optional Features:
   --enable-kernel-fll-bug s if we should avoid a kernel FLL bug
 
 Optional Packages:
-  --with-PACKAGE=ARG    use PACKAGE ARG=yes
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-crypto           + ={md5,autokey,rsaref}
 
 Some influent environment variables:
   CFLAGS      Extra flags for the C compiler
 EOF
-  exit 0
 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 -e '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; then
+      echo
+      $SHELL $ac_sub_srcdir/configure  --help=recursive
+    elif test -f $ac_sub_srcdir/configure.in; then
+      echo
+      $ac_configure --help
+    else
+      echo "configure: 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
-Generated automatically using Autoconf version 2.14a.
+
 Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000
 Free Software Foundation, Inc.
-
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 EOF
@@ -513,9 +630,10 @@ if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
 if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 
 # IFS
-# We need space, tab and new line.
-IFS="
- 	"
+# We need space, tab and new line, in precisely that order.
+ac_nl='
+'
+IFS=" 	$ac_nl"
 
 trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
 
@@ -523,6 +641,7 @@ trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2
 # 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
@@ -531,10 +650,13 @@ do
   -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_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+    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
 
 # File descriptor usage:
@@ -556,42 +678,15 @@ echo "\
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by configure version 2.14a, executed with
+It was created by configure  2.14a, executed with
  > $0 $ac_configure_args
-" 1>&5
+" >&5
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -rf conftest* confdefs.h
 # AIX cpp loses on an empty file, so make sure it contains at least a newline.
 echo >confdefs.h
 
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo "$ac_prog" | sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: cannot find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: cannot find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "$srcdir" | sed 's%\([^/]\)/*$%\1%'`
-
 # Prefer explicitly selected file to automatically selected ones.
 if test -z "$CONFIG_SITE"; then
   if test "x$prefix" != xNONE; then
@@ -608,7 +703,7 @@ for ac_site_file in $CONFIG_SITE; do
 done
 
 if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
+  test "x$cache_file" != "x/dev/null" && echo "loading cache $cache_file"
       test -f "$cache_file" && . $cache_file
 else
   echo "creating cache $cache_file"
@@ -618,41 +713,10 @@ fi
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
-ac_exeext=
-ac_objext=o
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#include <sys/types.h>
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#else
-# if HAVE_STRINGS_H
-#  include <strings.h>
-# endif
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says Kaveh R. Ghazi.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -682,143 +746,92 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { echo "configure: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+  { echo "configure: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2; exit 1; }
 fi
 ac_config_guess="$SHELL $ac_aux_dir/config.guess"
 ac_config_sub="$SHELL $ac_aux_dir/config.sub"
 ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
-echo $ECHO_N "checking host system type... $ECHO_C" 1>&6
-echo "configure:693: checking host system type" 1>&5
-if test "x$ac_cv_host" = "x" || (test "x$host" != "xNONE" && test "x$host" != "x$ac_cv_host_alias"); then
+# Make sure we can run config.sub.
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+  { echo "configure: error: cannot run $ac_config_sub" >&2; exit 1; }
 
-  # Make sure we can run config.sub.
-  if $ac_config_sub sun4 >/dev/null 2>&1; then :; else
-    { echo "configure: error: cannot run $ac_config_sub" 1>&2; exit 1; }
-  fi
+echo "configure:670: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6
+if test "x$ac_cv_build" = "x" ||
+   (test "x$build" != "x" && test "x$build" != "x$ac_cv_build_alias"); then
 
-  ac_cv_host_alias=$host
-  case "$ac_cv_host_alias" in
-  NONE)
-    case $nonopt in
-    NONE)
-      if ac_cv_host_alias=`$ac_config_guess`; then :
-      else { echo "configure: error: cannot guess host type; you must specify one" 1>&2; exit 1; }
-      fi ;;    *) ac_cv_host_alias=$nonopt ;;
-    esac ;;
-  esac
-
-  ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || exit 1
-  ac_cv_host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-  ac_cv_host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-  ac_cv_host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+  ac_cv_build_alias=$build
+  test "x$ac_cv_build_alias" = "x" &&
+    { ac_cv_build_alias=`$ac_config_guess` ||
+      { echo "configure: error: cannot guess build (this machine) type; you must specify one" >&2; exit 1; }; }
 else
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || exit 1
+ac_cv_build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ac_cv_build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ac_cv_build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+build=$ac_cv_build
+build_alias=$ac_cv_build_alias
+build_cpu=$ac_cv_build_cpu
+build_vendor=$ac_cv_build_vendor
+build_os=$ac_cv_build_os
 
-echo "$ECHO_T""$ac_cv_host" 1>&6
+echo "configure:690: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6
+echo "configure:692: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6
+if test "x$ac_cv_host" = "x" ||
+   (test "x$host" != "x" && test "x$host" != "x$ac_cv_host_alias"); then
 
+  ac_cv_host_alias=$host
+  test "x$ac_cv_host_alias" = "x" &&
+    ac_cv_host_alias=$build_alias
+else
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || exit 1
+ac_cv_host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ac_cv_host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ac_cv_host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 host=$ac_cv_host
 host_alias=$ac_cv_host_alias
 host_cpu=$ac_cv_host_cpu
 host_vendor=$ac_cv_host_vendor
 host_os=$ac_cv_host_os
 
-echo $ECHO_N "checking target system type... $ECHO_C" 1>&6
-echo "configure:729: checking target system type" 1>&5
-if test "x$ac_cv_target" = "x" || (test "x$target" != "xNONE" && test "x$target" != "x$ac_cv_target_alias"); then
-
-  # Make sure we can run config.sub.
-  if $ac_config_sub sun4 >/dev/null 2>&1; then :; else
-    { echo "configure: error: cannot run $ac_config_sub" 1>&2; exit 1; }
-  fi
+echo "configure:711: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6
+echo "configure:713: checking target system type" >&5
+echo $ECHO_N "checking target system type... $ECHO_C" >&6
+if test "x$ac_cv_target" = "x" ||
+   (test "x$target" != "x" && test "x$target" != "x$ac_cv_target_alias"); then
 
   ac_cv_target_alias=$target
-  case "$ac_cv_target_alias" in
-  NONE)
-    case $nonopt in
-    NONE)
-      ac_cv_target_alias=$host_alias ;;
-    *) ac_cv_target_alias=$nonopt ;;
-    esac ;;
-  esac
-
-  ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || exit 1
-  ac_cv_target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-  ac_cv_target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-  ac_cv_target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+  test "x$ac_cv_target_alias" = "x" &&
+    ac_cv_target_alias=$host_alias
 else
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-
-echo "$ECHO_T""$ac_cv_target" 1>&6
-
+ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || exit 1
+ac_cv_target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ac_cv_target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ac_cv_target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 target=$ac_cv_target
 target_alias=$ac_cv_target_alias
 target_cpu=$ac_cv_target_cpu
 target_vendor=$ac_cv_target_vendor
 target_os=$ac_cv_target_os
 
-echo $ECHO_N "checking build system type... $ECHO_C" 1>&6
-echo "configure:764: checking build system type" 1>&5
-if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then
-
-  # Make sure we can run config.sub.
-  if $ac_config_sub sun4 >/dev/null 2>&1; then :; else
-    { echo "configure: error: cannot run $ac_config_sub" 1>&2; exit 1; }
-  fi
-
-  ac_cv_build_alias=$build
-  case "$ac_cv_build_alias" in
-  NONE)
-    case $nonopt in
-    NONE)
-      ac_cv_build_alias=$host_alias ;;
-    *) ac_cv_build_alias=$nonopt ;;
-    esac ;;
-  esac
-
-  ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || exit 1
-  ac_cv_build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-  ac_cv_build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-  ac_cv_build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-else
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
-fi
-
-echo "$ECHO_T""$ac_cv_build" 1>&6
-
-build=$ac_cv_build
-build_alias=$ac_cv_build_alias
-build_cpu=$ac_cv_build_cpu
-build_vendor=$ac_cv_build_vendor
-build_os=$ac_cv_build_os
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
+echo "configure:732: result: $ac_cv_target" >&5
+echo "${ECHO_T}$ac_cv_target" >&6
 # The aliases save the names the user supplied, while $host etc.
 # will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
 test "$host_alias" != "$target_alias" &&
   test "$program_prefix$program_suffix$program_transform_name" = \
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
-
 cat >>confdefs.h <<EOF
 #define STR_SYSTEM "$target"
 EOF
@@ -840,7 +853,7 @@ test "$program_suffix" != NONE &&
   program_transform_name="s,\$\$,${program_suffix},;$program_transform_name"
 
 # sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+test -z "$program_transform_name" && program_transform_name="s,x,x,"
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -853,11 +866,11 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 # 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 $ECHO_N "checking for a BSD compatible install... $ECHO_C" 1>&6
-echo "configure:858: checking for a BSD compatible install" 1>&5
+echo "configure:771: checking for a BSD compatible install" >&5
+echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     ac_save_IFS=$IFS; IFS=':'
   for ac_dir in $PATH; do
@@ -891,16 +904,17 @@ else
 
 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 "$ECHO_T""$INSTALL" 1>&6
+echo "configure:817: 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.
@@ -910,8 +924,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" 1>&6
-echo "configure:915: checking whether build environment is sane" 1>&5
+echo "configure:824: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -934,7 +948,7 @@ if (
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
       { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
+alias in your environment" >&2; exit 1; }
    fi
 
    test "$2" = conftestfile
@@ -944,10 +958,11 @@ then
    :
 else
    { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
+Check your system clock" >&2; exit 1; }
 fi
 rm -f conftest*
-echo "$ECHO_T""yes" 1>&6
+echo "configure:859: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 
 test x"${MISSING+set}" = xset || \
   MISSING="\${SHELL} `CDPATH=: && cd $ac_aux_dir && pwd`/missing"
@@ -956,17 +971,17 @@ if eval "$MISSING --run :"; then
 else
   am_missing_run=
   am_backtick='`'
-  echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2
+  echo "configure: warning: ${am_backtick}missing' script is too old or missing" >&2
 fi
 
 for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
-echo "configure:968: checking for $ac_word" 1>&5
+echo "configure:874: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -986,21 +1001,23 @@ IFS=$ac_save_ifs
   done
 fi
 fi
-AWK="$ac_cv_prog_AWK"
+AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$ECHO_T""$AWK" 1>&6
+  echo "configure:899: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
 else
-  echo "$ECHO_T""no" 1>&6
+  echo "configure:902: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 test -n "$AWK" && break
 done
 
-echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" 1>&6
-echo "configure:1001: checking whether ${MAKE-make} sets \${MAKE}" 1>&5
+echo "configure:907: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftestmake <<\EOF
 all:
@@ -1016,10 +1033,12 @@ fi
 rm -f conftestmake
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ECHO_T""yes" 1>&6
+  echo "configure:927: result: yes" >&5
+echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$ECHO_T""no" 1>&6
+  echo "configure:931: result: no" >&5
+echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -1057,8 +1076,9 @@ VERSION=4.0.99i9
 
 if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
+  { echo "configure: error: source directory already configured; run \"make distclean\" there first" >&2; exit 1; }
 fi
+
 cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
@@ -1097,10 +1117,10 @@ esac
 
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
-echo "configure:1102: checking for $ac_word" 1>&5
+echo "configure:991: 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" 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.
@@ -1120,20 +1140,22 @@ IFS=$ac_save_ifs
   done
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ECHO_T""$CC" 1>&6
+  echo "configure:1016: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ECHO_T""no" 1>&6
+  echo "configure:1019: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
   if test -z "$CC"; then
     # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
-echo "configure:1135: checking for $ac_word" 1>&5
+echo "configure:1025: 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" 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.
@@ -1165,18 +1187,20 @@ if test $ac_prog_rejected = yes; then
     # 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_path" "$@"
+    set dummy "$ac_path" ${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 "$ECHO_T""$CC" 1>&6
+  echo "configure:1069: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ECHO_T""no" 1>&6
+  echo "configure:1072: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
     if test -z "$CC"; then
@@ -1184,10 +1208,10 @@ fi
 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 $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
-echo "configure:1189: checking for $ac_word" 1>&5
+echo "configure:1080: 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" 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.
@@ -1207,11 +1231,13 @@ IFS=$ac_save_ifs
   done
 fi
 fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$ECHO_T""$CC" 1>&6
+  echo "configure:1105: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
 else
-  echo "$ECHO_T""no" 1>&6
+  echo "configure:1108: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 test -n "$CC" && break
@@ -1220,26 +1246,23 @@ done
     fi
   fi
 
-test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-
-echo $ECHO_N "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works... $ECHO_C" 1>&6
-echo "configure:1227: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" 1>&5
+test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" >&2; exit 1; }
 
+echo "configure:1116: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5
+echo $ECHO_N "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works... $ECHO_C" >&6
 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'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat >conftest.$ac_ext <<EOF
-
-#line 1238 "configure"
+#line 1125 "configure"
 #include "confdefs.h"
-
 int main(){return(0);}
 EOF
-if { (eval echo configure:1243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1129: \"$ac_link\") >&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
@@ -1252,40 +1275,42 @@ else
   cat conftest.$ac_ext >&5
   ac_cv_prog_cc_works=no
 fi
-rm -fr conftest*
+rm -f 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'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ECHO_T""$ac_cv_prog_cc_works" 1>&6
+echo "configure:1149: result: $ac_cv_prog_cc_works" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_works" >&6
 if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 77; }
+  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." >&2; exit 77; }
 fi
-echo $ECHO_N "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler... $ECHO_C" 1>&6
-echo "configure:1269: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" 1>&5
-echo "$ECHO_T""$ac_cv_prog_cc_cross" 1>&6
+echo "configure:1154: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo $ECHO_N "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler... $ECHO_C" >&6
+echo "configure:1156: result: $ac_cv_prog_cc_cross" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_cross" >&6
 cross_compiling=$ac_cv_prog_cc_cross
 
-echo $ECHO_N "checking whether we are using GNU C... $ECHO_C" 1>&6
-echo "configure:1274: checking whether we are using GNU C" 1>&5
+echo "configure:1159: checking whether we are using GNU C" >&5
+echo $ECHO_N "checking whether we are using GNU C... $ECHO_C" >&6
 if test "${ac_cv_prog_gcc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1169: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
 fi
 fi
-echo "$ECHO_T""$ac_cv_prog_gcc" 1>&6
+echo "configure:1175: result: $ac_cv_prog_gcc" >&5
+echo "${ECHO_T}$ac_cv_prog_gcc" >&6
 
 if test $ac_cv_prog_gcc = yes; then
   GCC=yes
@@ -1293,13 +1318,13 @@ else
   GCC=
 fi
 
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
 CFLAGS=
-echo $ECHO_N "checking whether ${CC-cc} accepts -g... $ECHO_C" 1>&6
-echo "configure:1301: checking whether ${CC-cc} accepts -g" 1>&5
+echo "configure:1185: checking whether ${CC-cc} accepts -g" >&5
+echo $ECHO_N "checking whether ${CC-cc} accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   echo 'void f(){}' >conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1310,9 +1335,10 @@ fi
 rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_prog_cc_g" 1>&6
+echo "configure:1198: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
+  CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
     CFLAGS="-g -O2"
@@ -1327,30 +1353,29 @@ else
   fi
 fi
 
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" 1>&6
-echo "configure:1332: checking how to run the C preprocessor" 1>&5
+echo "configure:1215: 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 test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     # This must be in double quotes, not single quotes, because CPP may get
   # substituted into the Makefile and "${CC-cc}" will confuse make.
   CPP="${CC-cc} -E"
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
-
-cat >conftest.$ac_ext <<EOF
-#line 1348 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 1231 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1237: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1359,15 +1384,14 @@ else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   CPP="${CC-cc} -E -traditional-cpp"
-
-cat >conftest.$ac_ext <<EOF
-#line 1365 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 1247 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1253: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1376,15 +1400,14 @@ else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   CPP="${CC-cc} -nologo -E"
-
-cat >conftest.$ac_ext <<EOF
-#line 1382 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 1263 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1269: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1399,20 +1422,21 @@ fi
 rm -f conftest*
 fi
 rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
+  ac_cv_prog_CPP=$CPP
 fi
-  CPP="$ac_cv_prog_CPP"
+  CPP=$ac_cv_prog_CPP
 else
-  ac_cv_prog_CPP="$CPP"
+  ac_cv_prog_CPP=$CPP
 fi
-echo "$ECHO_T""$CPP" 1>&6
+echo "configure:1290: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
 
 depcc="$CC"
 depcpp="$CPP"
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" 1>&6
-echo "configure:1414: checking dependency style of $depcc" 1>&5
+echo "configure:1294: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 if test -z "$AMDEP"; then
@@ -1450,33 +1474,33 @@ fi
 
 fi
 
-echo "$ECHO_T""$am_cv_CC_dependencies_compiler_type" 1>&6
+echo "configure:1330: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
 CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
 
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" 1>&6
-echo "configure:1458: checking how to run the C preprocessor" 1>&5
+echo "configure:1333: 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 test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     # This must be in double quotes, not single quotes, because CPP may get
   # substituted into the Makefile and "${CC-cc}" will confuse make.
   CPP="${CC-cc} -E"
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
-
-cat >conftest.$ac_ext <<EOF
-#line 1474 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 1349 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1355: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1485,15 +1509,14 @@ else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   CPP="${CC-cc} -E -traditional-cpp"
-
-cat >conftest.$ac_ext <<EOF
-#line 1491 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 1365 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1371: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1502,15 +1525,14 @@ else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   CPP="${CC-cc} -nologo -E"
-
-cat >conftest.$ac_ext <<EOF
-#line 1508 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 1381 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1387: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1525,13 +1547,14 @@ fi
 rm -f conftest*
 fi
 rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
+  ac_cv_prog_CPP=$CPP
 fi
-  CPP="$ac_cv_prog_CPP"
+  CPP=$ac_cv_prog_CPP
 else
-  ac_cv_prog_CPP="$CPP"
+  ac_cv_prog_CPP=$CPP
 fi
-echo "$ECHO_T""$CPP" 1>&6
+echo "configure:1408: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
 
 case "$target" in
  *-pc-cygwin*)
@@ -1560,7 +1583,7 @@ case "$host" in
      *-*-vxworks*)
 	# Quick and dirty sanity check
 	case "$VX_KERNEL" in
-	 '') { echo "configure: error: Please follow the directions in html/vxworks.html!" 1>&2; exit 1; }
+	 '') { echo "configure: error: Please follow the directions in html/vxworks.html!" >&2; exit 1; }
 	    ;;
 	esac
         CFLAGS="$CFLAGS -DSYS_VXWORKS"
@@ -1573,10 +1596,10 @@ for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
-echo "configure:1578: checking for $ac_word" 1>&5
+echo "configure:1448: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -1596,21 +1619,23 @@ IFS=$ac_save_ifs
   done
 fi
 fi
-AWK="$ac_cv_prog_AWK"
+AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$ECHO_T""$AWK" 1>&6
+  echo "configure:1473: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
 else
-  echo "$ECHO_T""no" 1>&6
+  echo "configure:1476: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 test -n "$AWK" && break
 done
 
-echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" 1>&6
-echo "configure:1611: checking whether ${MAKE-make} sets \${MAKE}" 1>&5
+echo "configure:1481: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftestmake <<\EOF
 all:
@@ -1626,10 +1651,12 @@ fi
 rm -f conftestmake
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ECHO_T""yes" 1>&6
+  echo "configure:1501: result: yes" >&5
+echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$ECHO_T""no" 1>&6
+  echo "configure:1505: result: no" >&5
+echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -1647,10 +1674,10 @@ case "$GCC" in
     # CFLAGS="$CFLAGS -Wcast-align"
     CFLAGS="$CFLAGS -Wstrict-prototypes"
 
-    echo $ECHO_N "checking whether ${CC-cc} -pipe works... $ECHO_C" 1>&6
-echo "configure:1652: checking whether ${CC-cc} -pipe works" 1>&5
+    echo "configure:1521: checking whether ${CC-cc} -pipe works" >&5
+echo $ECHO_N "checking whether ${CC-cc} -pipe works... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   echo 'void f(){}' > conftest.c
     if test -z "`${CC-cc} -pipe -c conftest.c 2>&1`" -a -s conftest.o; then
@@ -1661,7 +1688,8 @@ else
     rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_prog_cc_pipe" 1>&6
+echo "configure:1534: result: $ac_cv_prog_cc_pipe" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_pipe" >&6
 
     case "$ac_cv_prog_cc_pipe" in
      yes)
@@ -1710,17 +1738,17 @@ case "$ac_busted_vpath_in_make$srcdir" in
  yes.) ;;
  *) case "`${MAKE-make} -v -f /dev/null 2>/dev/null | sed -e 's/GNU Make version \(1-9.]*\).*/\1/' -e q`" in
      '')
-	{ echo "configure: error: building outside of the main directory requires GNU make" 1>&2; exit 1; }
+	{ echo "configure: error: building outside of the main directory requires GNU make" >&2; exit 1; }
 	;;
      *) ;;
     esac
     ;;
 esac
 
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" 1>&6
-echo "configure:1722: checking whether ln -s works" 1>&5
+echo "configure:1586: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 if test "${ac_cv_prog_LN_S+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   rm -f conftestdata
 if ln -s X conftestdata 2>/dev/null
@@ -1731,23 +1759,24 @@ else
   ac_cv_prog_LN_S=ln
 fi
 fi
-LN_S="$ac_cv_prog_LN_S"
+LN_S=$ac_cv_prog_LN_S
 if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ECHO_T""yes" 1>&6
+  echo "configure:1602: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 else
-  echo "$ECHO_T""no" 1>&6
+  echo "configure:1605: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 if test $ac_cv_prog_gcc = yes; then
-    echo $ECHO_N "checking whether ${CC-cc} needs -traditional... $ECHO_C" 1>&6
-echo "configure:1744: checking whether ${CC-cc} needs -traditional" 1>&5
+    echo "configure:1609: checking whether ${CC-cc} needs -traditional" >&5
+echo $ECHO_N "checking whether ${CC-cc} needs -traditional... $ECHO_C" >&6
 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     ac_pattern="Autoconf.*'x'"
-
-cat >conftest.$ac_ext <<EOF
-#line 1751 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 1616 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -1761,9 +1790,8 @@ fi
 rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
-
-cat >conftest.$ac_ext <<EOF
-#line 1767 "configure"
+    cat >conftest.$ac_ext <<EOF
+#line 1630 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -1776,17 +1804,17 @@ rm -f conftest*
 
   fi
 fi
-echo "$ECHO_T""$ac_cv_prog_gcc_traditional" 1>&6
+echo "configure:1642: result: $ac_cv_prog_gcc_traditional" >&5
+echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
 fi
 
-echo $ECHO_N "checking for AIX... $ECHO_C" 1>&6
-echo "configure:1787: checking for AIX" 1>&5
-
+echo "configure:1648: checking for AIX" >&5
+echo $ECHO_N "checking for AIX... $ECHO_C" >&6
 cat >conftest.$ac_ext <<EOF
-#line 1790 "configure"
+#line 1651 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -1795,30 +1823,31 @@ cat >conftest.$ac_ext <<EOF
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
-  echo "$ECHO_T""yes" 1>&6
+  echo "configure:1659: result: yes" >&5
+echo "${ECHO_T}yes" >&6
 cat >>confdefs.h <<\EOF
 #define _ALL_SOURCE 1
 EOF
 
 else
-  echo "$ECHO_T""no" 1>&6
+  echo "configure:1665: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 rm -f conftest*
 
-echo $ECHO_N "checking for minix/config.h... $ECHO_C" 1>&6
-echo "configure:1810: checking for minix/config.h" 1>&5
+echo "configure:1669: checking for minix/config.h" >&5
+echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6
 if test "${ac_cv_header_minix_config_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 1816 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 1675 "configure"
 #include "confdefs.h"
 #include <minix/config.h>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1822: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1680: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   ac_cv_header_minix_config_h=yes
@@ -1830,7 +1859,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_header_minix_config_h" 1>&6
+echo "configure:1692: result: $ac_cv_header_minix_config_h" >&5
+echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
 if test $ac_cv_header_minix_config_h = yes; then
   MINIX=yes
 else
@@ -1838,28 +1868,31 @@ else
 fi
 
 if test "$MINIX" = yes; then
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define _POSIX_SOURCE 1
 EOF
 
-  cat >>confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define _POSIX_1_SOURCE 2
 EOF
 
-  cat >>confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define _MINIX 1
 EOF
 
 fi
 
-echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" 1>&6
-echo "configure:1857: checking for POSIXized ISC" 1>&5
+echo "configure:1710: checking for POSIXized ISC" >&5
+echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
 if test -d /etc/conf/kconfig.d &&
    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
-  echo "$ECHO_T""yes" 1>&6
+  echo "configure:1715: result: yes" >&5
+echo "${ECHO_T}yes" >&6
   ISC=yes # If later tests want to check for ISC.
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define _POSIX_SOURCE 1
 EOF
 
@@ -1869,16 +1902,17 @@ EOF
     CC="$CC -Xp"
   fi
 else
-  echo "$ECHO_T""no" 1>&6
+  echo "configure:1727: result: no" >&5
+echo "${ECHO_T}no" >&6
   ISC=
 fi
 
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
-echo "configure:1880: checking for $ac_word" 1>&5
+echo "configure:1733: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -1899,22 +1933,24 @@ IFS=$ac_save_ifs
   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 "$ECHO_T""$RANLIB" 1>&6
+  echo "configure:1759: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$ECHO_T""no" 1>&6
+  echo "configure:1762: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "sh", so it can be a program name with args.
 set dummy sh; ac_word=$2
-echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
-echo "configure:1913: checking for $ac_word" 1>&5
+echo "configure:1767: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PATH_SH+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case "$PATH_SH" in
-  [/\\]* | ?:[/\\]*)
+  [\\/]* | ?:[\\/]*)
   ac_cv_path_PATH_SH="$PATH_SH" # Let the user override the test with a path.
   ;;
   *)
@@ -1923,7 +1959,7 @@ else
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_word"; then
-      ac_cv_path_PATH_SH="$ac_dir/$ac_word"
+      ac_cv_path_PATH_SH=$ac_dir/$ac_word
       break
     fi
   done
@@ -1931,22 +1967,24 @@ else
   ;;
 esac
 fi
-PATH_SH="$ac_cv_path_PATH_SH"
+PATH_SH=$ac_cv_path_PATH_SH
 if test -n "$PATH_SH"; then
-  echo "$ECHO_T""$PATH_SH" 1>&6
+  echo "configure:1792: result: $PATH_SH" >&5
+echo "${ECHO_T}$PATH_SH" >&6
 else
-  echo "$ECHO_T""no" 1>&6
+  echo "configure:1795: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-echo $ECHO_N "checking for $ac_word... $ECHO_C" 1>&6
-echo "configure:1945: checking for $ac_word" 1>&5
+echo "configure:1800: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PATH_PERL+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case "$PATH_PERL" in
-  [/\\]* | ?:[/\\]*)
+  [\\/]* | ?:[\\/]*)
   ac_cv_path_PATH_PERL="$PATH_PERL" # Let the user override the test with a path.
   ;;
   *)
@@ -1955,7 +1993,7 @@ else
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_word"; then
-      ac_cv_path_PATH_PERL="$ac_dir/$ac_word"
+      ac_cv_path_PATH_PERL=$ac_dir/$ac_word
       break
     fi
   done
@@ -1963,16 +2001,17 @@ else
   ;;
 esac
 fi
-PATH_PERL="$ac_cv_path_PATH_PERL"
+PATH_PERL=$ac_cv_path_PATH_PERL
 if test -n "$PATH_PERL"; then
-  echo "$ECHO_T""$PATH_PERL" 1>&6
+  echo "configure:1825: result: $PATH_PERL" >&5
+echo "${ECHO_T}$PATH_PERL" >&6
 else
-  echo "$ECHO_T""no" 1>&6
+  echo "configure:1828: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-echo
-cat >conftest.$ac_ext <<EOF
-#line 1976 "configure"
+ cat >conftest.$ac_ext <<EOF
+#line 1832 "configure"
 #include "confdefs.h"
 #define ACAT(a,b)a ## b
 ACAT(Cir,cus)
@@ -1985,45 +2024,8 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 EOF
 
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 1991 "configure"
-#include "confdefs.h"
-#define RCAT(a,b)a/**/b
-RCAT(Rei,ser)
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "Reiser" >/dev/null 2>&1; then
-  cat >>confdefs.h <<\EOF
-#define ULONG_CONST(a) a/**/U
-EOF
-
-else
-  { echo "configure: error: How do we create an unsigned long constant?" 1>&2; exit 1; }
-fi
-rm -f conftest*
-
-fi
-rm -f conftest*
-
-cat >conftest.$ac_ext <<EOF
-#line 2012 "configure"
-#include "confdefs.h"
-#define ACAT(a,b)a ## b
-ACAT(Cir,cus)
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "Circus" >/dev/null 2>&1; then
-  cat >>confdefs.h <<\EOF
-#define ULONG_CONST(a) a ## UL
-EOF
-
-else
-
-cat >conftest.$ac_ext <<EOF
-#line 2027 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 1844 "configure"
 #include "confdefs.h"
 #define RCAT(a,b)a/**/b
 RCAT(Rei,ser)
@@ -2036,7 +2038,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 EOF
 
 else
-  { echo "configure: error: How do we create an unsigned long constant?" 1>&2; exit 1; }
+  { echo "configure: error: How do we create an unsigned long constant?" >&2; exit 1; }
 fi
 rm -f conftest*
 
@@ -2060,11 +2062,11 @@ esac
 # 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 $ECHO_N "checking for a BSD compatible install... $ECHO_C" 1>&6
-echo "configure:2065: checking for a BSD compatible install" 1>&5
+echo "configure:1876: checking for a BSD compatible install" >&5
+echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     ac_save_IFS=$IFS; IFS=':'
   for ac_dir in $PATH; do
@@ -2098,16 +2100,17 @@ else
 
 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 "$ECHO_T""$INSTALL" 1>&6
+echo "configure:1922: 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.
@@ -2119,26 +2122,27 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 case "$target" in
  *-pc-cygwin*)
-    echo $ECHO_N "checking for main in -ladvapi32... $ECHO_C" 1>&6
-echo "configure:2124: checking for main in -ladvapi32" 1>&5
+
+echo "configure:1931: checking for main in -ladvapi32" >&5
+echo $ECHO_N "checking for main in -ladvapi32... $ECHO_C" >&6
 if test "${ac_cv_lib_advapi32_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_save_LIBS=$LIBS
 LIBS="-ladvapi32  $LIBS"
 cat >conftest.$ac_ext <<EOF
-#line 2131 "configure"
+#line 1939 "configure"
 #include "confdefs.h"
 
 int
-main()
+main ()
 {
-main()
+main ();
   ;
   return 0;
 }
 EOF
-if { (eval echo configure:2142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1949: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_lib_advapi32_main=yes
 else
   echo "configure: failed program was:" >&5
@@ -2146,10 +2150,10 @@ else
   ac_cv_lib_advapi32_main=no
 fi
 rm -f conftest*
-
-LIBS="$ac_save_LIBS"
+LIBS=$ac_save_LIBS
 fi
-echo "$ECHO_T""$ac_cv_lib_advapi32_main" 1>&6
+echo "configure:1959: result: $ac_cv_lib_advapi32_main" >&5
+echo "${ECHO_T}$ac_cv_lib_advapi32_main" >&6
 if test $ac_cv_lib_advapi32_main = yes; then
   cat >>confdefs.h <<EOF
 #define HAVE_LIBADVAPI32 1
@@ -2161,30 +2165,34 @@ fi
 
     ;;
 esac
-echo $ECHO_N "checking for nlist in -lelf... $ECHO_C" 1>&6
-echo "configure:2166: checking for nlist in -lelf" 1>&5
+
+echo "configure:1969: checking for nlist in -lelf" >&5
+echo $ECHO_N "checking for nlist in -lelf... $ECHO_C" >&6
 if test "${ac_cv_lib_elf_nlist+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_save_LIBS=$LIBS
 LIBS="-lelf  $LIBS"
 cat >conftest.$ac_ext <<EOF
-#line 2173 "configure"
+#line 1977 "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 nlist();
-
+   builtin and then its argument prototype would still apply.  */
+char nlist ();
 int
-main()
+main ()
 {
-nlist()
+nlist ();
   ;
   return 0;
 }
 EOF
-if { (eval echo configure:2188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1994: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_lib_elf_nlist=yes
 else
   echo "configure: failed program was:" >&5
@@ -2192,10 +2200,10 @@ else
   ac_cv_lib_elf_nlist=no
 fi
 rm -f conftest*
-
-LIBS="$ac_save_LIBS"
+LIBS=$ac_save_LIBS
 fi
-echo "$ECHO_T""$ac_cv_lib_elf_nlist" 1>&6
+echo "configure:2004: result: $ac_cv_lib_elf_nlist" >&5
+echo "${ECHO_T}$ac_cv_lib_elf_nlist" >&6
 if test $ac_cv_lib_elf_nlist = yes; then
   cat >>confdefs.h <<EOF
 #define HAVE_LIBELF 1
@@ -2205,26 +2213,26 @@ EOF
 
 fi
 
-echo $ECHO_N "checking for main in -lkvm... $ECHO_C" 1>&6
-echo "configure:2210: checking for main in -lkvm" 1>&5
+echo "configure:2012: checking for main in -lkvm" >&5
+echo $ECHO_N "checking for main in -lkvm... $ECHO_C" >&6
 if test "${ac_cv_lib_kvm_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_save_LIBS=$LIBS
 LIBS="-lkvm  $LIBS"
 cat >conftest.$ac_ext <<EOF
-#line 2217 "configure"
+#line 2020 "configure"
 #include "confdefs.h"
 
 int
-main()
+main ()
 {
-main()
+main ();
   ;
   return 0;
 }
 EOF
-if { (eval echo configure:2228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2030: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_lib_kvm_main=yes
 else
   echo "configure: failed program was:" >&5
@@ -2232,10 +2240,10 @@ else
   ac_cv_lib_kvm_main=no
 fi
 rm -f conftest*
-
-LIBS="$ac_save_LIBS"
+LIBS=$ac_save_LIBS
 fi
-echo "$ECHO_T""$ac_cv_lib_kvm_main" 1>&6
+echo "configure:2040: result: $ac_cv_lib_kvm_main" >&5
+echo "${ECHO_T}$ac_cv_lib_kvm_main" >&6
 if test $ac_cv_lib_kvm_main = yes; then
   cat >>confdefs.h <<EOF
 #define HAVE_LIBKVM 1
@@ -2244,30 +2252,34 @@ EOF
   LIBS="-lkvm $LIBS"
 
 fi
-		echo $ECHO_N "checking for nlist in -lld... $ECHO_C" 1>&6
-echo "configure:2249: checking for nlist in -lld" 1>&5
+		
+echo "configure:2049: checking for nlist in -lld" >&5
+echo $ECHO_N "checking for nlist in -lld... $ECHO_C" >&6
 if test "${ac_cv_lib_ld_nlist+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_save_LIBS=$LIBS
 LIBS="-lld  $LIBS"
 cat >conftest.$ac_ext <<EOF
-#line 2256 "configure"
+#line 2057 "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 nlist();
-
+   builtin and then its argument prototype would still apply.  */
+char nlist ();
 int
-main()
+main ()
 {
-nlist()
+nlist ();
   ;
   return 0;
 }
 EOF
-if { (eval echo configure:2271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2074: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_lib_ld_nlist=yes
 else
   echo "configure: failed program was:" >&5
@@ -2275,10 +2287,10 @@ else
   ac_cv_lib_ld_nlist=no
 fi
 rm -f conftest*
-
-LIBS="$ac_save_LIBS"
+LIBS=$ac_save_LIBS
 fi
-echo "$ECHO_T""$ac_cv_lib_ld_nlist" 1>&6
+echo "configure:2084: result: $ac_cv_lib_ld_nlist" >&5
+echo "${ECHO_T}$ac_cv_lib_ld_nlist" >&6
 if test $ac_cv_lib_ld_nlist = yes; then
   cat >>confdefs.h <<EOF
 #define HAVE_LIBLD 1
@@ -2288,30 +2300,33 @@ EOF
 
 fi
 
-echo $ECHO_N "checking for nlist in -lmld... $ECHO_C" 1>&6
-echo "configure:2293: checking for nlist in -lmld" 1>&5
+echo "configure:2092: checking for nlist in -lmld" >&5
+echo $ECHO_N "checking for nlist in -lmld... $ECHO_C" >&6
 if test "${ac_cv_lib_mld_nlist+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_save_LIBS=$LIBS
 LIBS="-lmld  $LIBS"
 cat >conftest.$ac_ext <<EOF
-#line 2300 "configure"
+#line 2100 "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 nlist();
-
+   builtin and then its argument prototype would still apply.  */
+char nlist ();
 int
-main()
+main ()
 {
-nlist()
+nlist ();
   ;
   return 0;
 }
 EOF
-if { (eval echo configure:2315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2117: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_lib_mld_nlist=yes
 else
   echo "configure: failed program was:" >&5
@@ -2319,10 +2334,10 @@ else
   ac_cv_lib_mld_nlist=no
 fi
 rm -f conftest*
-
-LIBS="$ac_save_LIBS"
+LIBS=$ac_save_LIBS
 fi
-echo "$ECHO_T""$ac_cv_lib_mld_nlist" 1>&6
+echo "configure:2127: result: $ac_cv_lib_mld_nlist" >&5
+echo "${ECHO_T}$ac_cv_lib_mld_nlist" >&6
 if test $ac_cv_lib_mld_nlist = yes; then
   cat >>confdefs.h <<EOF
 #define HAVE_LIBMLD 1
@@ -2332,25 +2347,28 @@ EOF
 
 fi
 
-echo $ECHO_N "checking for gethostent... $ECHO_C" 1>&6
-echo "configure:2337: checking for gethostent" 1>&5
+echo "configure:2135: checking for gethostent" >&5
+echo $ECHO_N "checking for gethostent... $ECHO_C" >&6
 if test "${ac_cv_func_gethostent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 2342 "configure"
+#line 2141 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostent(); 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 gethostent();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -2366,7 +2384,7 @@ f = gethostent;
   return 0;
 }
 EOF
-if { (eval echo configure:2370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2169: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_func_gethostent=yes
 else
   echo "configure: failed program was:" >&5
@@ -2374,36 +2392,40 @@ else
   ac_cv_func_gethostent=no
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""$ac_cv_func_gethostent" 1>&6
+echo "configure:2178: result: $ac_cv_func_gethostent" >&5
+echo "${ECHO_T}$ac_cv_func_gethostent" >&6
 if test $ac_cv_func_gethostent = yes; then
   :
 else
-  echo $ECHO_N "checking for gethostent in -lnsl... $ECHO_C" 1>&6
-echo "configure:2385: checking for gethostent in -lnsl" 1>&5
+
+echo "configure:2183: checking for gethostent in -lnsl" >&5
+echo $ECHO_N "checking for gethostent in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_save_LIBS=$LIBS
 LIBS="-lnsl -lsocket $LIBS"
 cat >conftest.$ac_ext <<EOF
-#line 2392 "configure"
+#line 2191 "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 gethostent();
-
+   builtin and then its argument prototype would still apply.  */
+char gethostent ();
 int
-main()
+main ()
 {
-gethostent()
+gethostent ();
   ;
   return 0;
 }
 EOF
-if { (eval echo configure:2407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2208: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_lib_nsl_gethostent=yes
 else
   echo "configure: failed program was:" >&5
@@ -2411,10 +2433,10 @@ else
   ac_cv_lib_nsl_gethostent=no
 fi
 rm -f conftest*
-
-LIBS="$ac_save_LIBS"
+LIBS=$ac_save_LIBS
 fi
-echo "$ECHO_T""$ac_cv_lib_nsl_gethostent" 1>&6
+echo "configure:2218: result: $ac_cv_lib_nsl_gethostent" >&5
+echo "${ECHO_T}$ac_cv_lib_nsl_gethostent" >&6
 if test $ac_cv_lib_nsl_gethostent = yes; then
   cat >>confdefs.h <<EOF
 #define HAVE_LIBNSL 1
@@ -2426,25 +2448,28 @@ fi
 
 fi
 
-echo $ECHO_N "checking for openlog... $ECHO_C" 1>&6
-echo "configure:2431: checking for openlog" 1>&5
+echo "configure:2227: checking for openlog" >&5
+echo $ECHO_N "checking for openlog... $ECHO_C" >&6
 if test "${ac_cv_func_openlog+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 2436 "configure"
+#line 2233 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char openlog(); 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 openlog();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -2460,7 +2485,7 @@ f = openlog;
   return 0;
 }
 EOF
-if { (eval echo configure:2464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2261: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_func_openlog=yes
 else
   echo "configure: failed program was:" >&5
@@ -2468,36 +2493,40 @@ else
   ac_cv_func_openlog=no
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""$ac_cv_func_openlog" 1>&6
+echo "configure:2270: result: $ac_cv_func_openlog" >&5
+echo "${ECHO_T}$ac_cv_func_openlog" >&6
 if test $ac_cv_func_openlog = yes; then
   :
 else
-  echo $ECHO_N "checking for openlog in -lgen... $ECHO_C" 1>&6
-echo "configure:2479: checking for openlog in -lgen" 1>&5
+
+echo "configure:2275: checking for openlog in -lgen" >&5
+echo $ECHO_N "checking for openlog in -lgen... $ECHO_C" >&6
 if test "${ac_cv_lib_gen_openlog+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_save_LIBS=$LIBS
 LIBS="-lgen  $LIBS"
 cat >conftest.$ac_ext <<EOF
-#line 2486 "configure"
+#line 2283 "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 openlog();
-
+   builtin and then its argument prototype would still apply.  */
+char openlog ();
 int
-main()
+main ()
 {
-openlog()
+openlog ();
   ;
   return 0;
 }
 EOF
-if { (eval echo configure:2501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2300: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_lib_gen_openlog=yes
 else
   echo "configure: failed program was:" >&5
@@ -2505,10 +2534,10 @@ else
   ac_cv_lib_gen_openlog=no
 fi
 rm -f conftest*
-
-LIBS="$ac_save_LIBS"
+LIBS=$ac_save_LIBS
 fi
-echo "$ECHO_T""$ac_cv_lib_gen_openlog" 1>&6
+echo "configure:2310: result: $ac_cv_lib_gen_openlog" >&5
+echo "${ECHO_T}$ac_cv_lib_gen_openlog" >&6
 if test $ac_cv_lib_gen_openlog = yes; then
   cat >>confdefs.h <<EOF
 #define HAVE_LIBGEN 1
@@ -2520,30 +2549,33 @@ fi
 
 fi
 
-echo $ECHO_N "checking for sched_setscheduler in -lrt... $ECHO_C" 1>&6
-echo "configure:2525: checking for sched_setscheduler in -lrt" 1>&5
+echo "configure:2319: checking for sched_setscheduler in -lrt" >&5
+echo $ECHO_N "checking for sched_setscheduler in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_sched_setscheduler+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >conftest.$ac_ext <<EOF
-#line 2532 "configure"
+#line 2327 "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 sched_setscheduler();
-
+   builtin and then its argument prototype would still apply.  */
+char sched_setscheduler ();
 int
-main()
+main ()
 {
-sched_setscheduler()
+sched_setscheduler ();
   ;
   return 0;
 }
 EOF
-if { (eval echo configure:2547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2344: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_lib_rt_sched_setscheduler=yes
 else
   echo "configure: failed program was:" >&5
@@ -2551,10 +2583,10 @@ else
   ac_cv_lib_rt_sched_setscheduler=no
 fi
 rm -f conftest*
-
-LIBS="$ac_save_LIBS"
+LIBS=$ac_save_LIBS
 fi
-echo "$ECHO_T""$ac_cv_lib_rt_sched_setscheduler" 1>&6
+echo "configure:2354: result: $ac_cv_lib_rt_sched_setscheduler" >&5
+echo "${ECHO_T}$ac_cv_lib_rt_sched_setscheduler" >&6
 if test $ac_cv_lib_rt_sched_setscheduler = yes; then
   cat >>confdefs.h <<EOF
 #define HAVE_LIBRT 1
@@ -2563,30 +2595,34 @@ EOF
   LIBS="-lrt $LIBS"
 
 else
-  echo $ECHO_N "checking for sched_setscheduler in -lposix4... $ECHO_C" 1>&6
-echo "configure:2568: checking for sched_setscheduler in -lposix4" 1>&5
+
+echo "configure:2362: checking for sched_setscheduler in -lposix4" >&5
+echo $ECHO_N "checking for sched_setscheduler in -lposix4... $ECHO_C" >&6
 if test "${ac_cv_lib_posix4_sched_setscheduler+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_save_LIBS=$LIBS
 LIBS="-lposix4  $LIBS"
 cat >conftest.$ac_ext <<EOF
-#line 2575 "configure"
+#line 2370 "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 sched_setscheduler();
-
+   builtin and then its argument prototype would still apply.  */
+char sched_setscheduler ();
 int
-main()
+main ()
 {
-sched_setscheduler()
+sched_setscheduler ();
   ;
   return 0;
 }
 EOF
-if { (eval echo configure:2590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2387: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_lib_posix4_sched_setscheduler=yes
 else
   echo "configure: failed program was:" >&5
@@ -2594,10 +2630,10 @@ else
   ac_cv_lib_posix4_sched_setscheduler=no
 fi
 rm -f conftest*
-
-LIBS="$ac_save_LIBS"
+LIBS=$ac_save_LIBS
 fi
-echo "$ECHO_T""$ac_cv_lib_posix4_sched_setscheduler" 1>&6
+echo "configure:2397: result: $ac_cv_lib_posix4_sched_setscheduler" >&5
+echo "${ECHO_T}$ac_cv_lib_posix4_sched_setscheduler" >&6
 if test $ac_cv_lib_posix4_sched_setscheduler = yes; then
   cat >>confdefs.h <<EOF
 #define HAVE_LIBPOSIX4 1
@@ -2609,25 +2645,28 @@ fi
 
 fi
 
-echo $ECHO_N "checking for setsockopt... $ECHO_C" 1>&6
-echo "configure:2614: checking for setsockopt" 1>&5
+echo "configure:2406: checking for setsockopt" >&5
+echo $ECHO_N "checking for setsockopt... $ECHO_C" >&6
 if test "${ac_cv_func_setsockopt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 2619 "configure"
+#line 2412 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char setsockopt(); 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 setsockopt();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -2643,7 +2682,7 @@ f = setsockopt;
   return 0;
 }
 EOF
-if { (eval echo configure:2647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2440: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_func_setsockopt=yes
 else
   echo "configure: failed program was:" >&5
@@ -2651,36 +2690,40 @@ else
   ac_cv_func_setsockopt=no
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""$ac_cv_func_setsockopt" 1>&6
+echo "configure:2449: result: $ac_cv_func_setsockopt" >&5
+echo "${ECHO_T}$ac_cv_func_setsockopt" >&6
 if test $ac_cv_func_setsockopt = yes; then
   :
 else
-  echo $ECHO_N "checking for setsockopt in -lsocket... $ECHO_C" 1>&6
-echo "configure:2662: checking for setsockopt in -lsocket" 1>&5
+
+echo "configure:2454: checking for setsockopt in -lsocket" >&5
+echo $ECHO_N "checking for setsockopt in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_setsockopt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_save_LIBS="$LIBS"
+  ac_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat >conftest.$ac_ext <<EOF
-#line 2669 "configure"
+#line 2462 "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 setsockopt();
-
+   builtin and then its argument prototype would still apply.  */
+char setsockopt ();
 int
-main()
+main ()
 {
-setsockopt()
+setsockopt ();
   ;
   return 0;
 }
 EOF
-if { (eval echo configure:2684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2479: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_lib_socket_setsockopt=yes
 else
   echo "configure: failed program was:" >&5
@@ -2688,10 +2731,10 @@ else
   ac_cv_lib_socket_setsockopt=no
 fi
 rm -f conftest*
-
-LIBS="$ac_save_LIBS"
+LIBS=$ac_save_LIBS
 fi
-echo "$ECHO_T""$ac_cv_lib_socket_setsockopt" 1>&6
+echo "configure:2489: result: $ac_cv_lib_socket_setsockopt" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_setsockopt" >&6
 if test $ac_cv_lib_socket_setsockopt = yes; then
   cat >>confdefs.h <<EOF
 #define HAVE_LIBSOCKET 1
@@ -2703,14 +2746,13 @@ fi
 
 fi
 
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" 1>&6
-echo "configure:2708: checking for ANSI C header files" 1>&5
+echo "configure:2498: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 2714 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 2504 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2719,7 +2761,7 @@ cat >conftest.$ac_ext <<EOF
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2723: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2512: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   ac_cv_header_stdc=yes
@@ -2733,9 +2775,8 @@ rm -f conftest*
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-
 cat >conftest.$ac_ext <<EOF
-#line 2739 "configure"
+#line 2526 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -2752,9 +2793,8 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-
 cat >conftest.$ac_ext <<EOF
-#line 2758 "configure"
+#line 2541 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -2775,7 +2815,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat >conftest.$ac_ext <<EOF
-#line 2779 "configure"
+#line 2559 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -2800,23 +2840,24 @@ main ()
   exit (0);
 }
 EOF
-if { (eval echo configure:2804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
-   (./conftest; exit) 2>/dev/null; then
+if { (eval echo configure:2583: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
   :
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   ac_cv_header_stdc=no
 fi
-rm -fr conftest*
-
+rm -f conftest*
 fi
 
 fi
 fi
-echo "$ECHO_T""$ac_cv_header_stdc" 1>&6
+echo "configure:2595: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define STDC_HEADERS 1
 EOF
 
@@ -2825,20 +2866,19 @@ fi
 for ac_header in bstring.h errno.h fcntl.h ieeefp.h memory.h netdb.h poll.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:2830: checking for $ac_header" 1>&5
+echo "configure:2605: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 2836 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 2611 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2616: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -2850,7 +2890,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:2628: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -2862,20 +2903,19 @@ done
 for ac_header in resolv.h sched.h sgtty.h stdlib.h string.h termio.h termios.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:2867: checking for $ac_header" 1>&5
+echo "configure:2639: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 2873 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 2645 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2650: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -2887,7 +2927,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:2662: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -2899,20 +2940,19 @@ done
 for ac_header in timepps.h timex.h unistd.h utmp.h utmpx.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:2904: checking for $ac_header" 1>&5
+echo "configure:2673: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 2910 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 2679 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2684: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -2924,7 +2964,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:2696: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -2936,20 +2977,19 @@ done
 for ac_header in arpa/nameser.h net/if.h netinet/in_systm.h netinet/in.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:2941: checking for $ac_header" 1>&5
+echo "configure:2707: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 2947 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 2713 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2718: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -2961,7 +3001,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:2730: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -2973,20 +3014,19 @@ done
 for ac_header in netinfo/ni.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:2978: checking for $ac_header" 1>&5
+echo "configure:2741: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 2984 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 2747 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2752: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -2998,7 +3038,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:2764: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -3013,20 +3054,19 @@ done
 for ac_header in sun/audioio.h sys/audioio.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:3018: checking for $ac_header" 1>&5
+echo "configure:2778: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 3024 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 2784 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2789: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -3038,7 +3078,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:2801: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -3050,20 +3091,19 @@ done
 for ac_header in sys/clkdefs.h sys/file.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:3055: checking for $ac_header" 1>&5
+echo "configure:2812: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 3061 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 2818 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2823: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -3075,7 +3115,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:2835: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -3086,23 +3127,23 @@ done
 
 case "$target" in
  *-*-sunos4*) ;;
- *) for ac_header in sys/ioctl.h
+ *)
+for ac_header in sys/ioctl.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:3094: checking for $ac_header" 1>&5
+echo "configure:2849: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 3100 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 2855 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2860: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -3114,7 +3155,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:2872: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -3125,23 +3167,23 @@ done
 
     ;;
 esac
+
 for ac_header in sys/lock.h sys/mman.h sys/modem.h sys/param.h sys/ppsclock.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:3133: checking for $ac_header" 1>&5
+echo "configure:2885: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 3139 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 2891 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2896: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -3153,7 +3195,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:2908: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -3165,20 +3208,19 @@ done
 for ac_header in sys/ppstime.h sys/proc.h sys/resource.h sys/sched.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:3170: checking for $ac_header" 1>&5
+echo "configure:2919: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 3176 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 2925 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2930: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -3190,7 +3232,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:2942: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -3201,23 +3244,23 @@ done
 
 case "$target" in
  *-*-sco*)
-    for ac_header in sys/sio.h
+
+for ac_header in sys/sio.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:3209: checking for $ac_header" 1>&5
+echo "configure:2955: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 3215 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 2961 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2966: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -3229,7 +3272,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:2978: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -3240,23 +3284,23 @@ done
 
     ;;
 esac
+
 for ac_header in sys/select.h sys/sockio.h sys/stat.h sys/stream.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:3248: checking for $ac_header" 1>&5
+echo "configure:2991: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 3254 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 2997 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3260: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3002: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -3268,7 +3312,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:3014: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -3280,20 +3325,19 @@ done
 for ac_header in sys/stropts.h sys/sysctl.h sys/syssgi.h sys/termios.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:3285: checking for $ac_header" 1>&5
+echo "configure:3025: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 3291 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 3031 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3036: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -3305,7 +3349,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:3048: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -3317,20 +3362,19 @@ done
 for ac_header in sys/time.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:3322: checking for $ac_header" 1>&5
+echo "configure:3059: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 3328 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 3065 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3070: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -3342,7 +3386,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:3082: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -3352,7 +3397,7 @@ fi
 done
 
 cat >conftest.$ac_ext <<EOF
-#line 3356 "configure"
+#line 3091 "configure"
 #include "confdefs.h"
 #include <sys/timepps.h>
 #ifdef PPS_API_VERS_1
@@ -3362,23 +3407,23 @@ yes
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
-  for ac_header in sys/timepps.h
+
+for ac_header in sys/timepps.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:3370: checking for $ac_header" 1>&5
+echo "configure:3103: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 3376 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 3109 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3114: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -3390,7 +3435,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:3126: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -3405,20 +3451,19 @@ rm -f conftest*
 for ac_header in sys/timers.h sys/timex.h sys/tpro.h sys/types.h sys/wait.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:3410: checking for $ac_header" 1>&5
+echo "configure:3139: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 3416 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 3145 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3150: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -3430,7 +3475,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:3162: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -3439,13 +3485,13 @@ EOF
 fi
 done
 
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" 1>&6
-echo "configure:3444: checking whether time.h and sys/time.h may both be included" 1>&5
+echo "configure:3170: 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 test "${ac_cv_header_time+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 3449 "configure"
+#line 3176 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3459,7 +3505,7 @@ struct tm *tp;
   return 0;
 }
 EOF
-if { (eval echo configure:3463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3189: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_header_time=yes
 else
   echo "configure: failed program was:" >&5
@@ -3468,9 +3514,11 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_header_time" 1>&6
+echo "configure:3198: result: $ac_cv_header_time" >&5
+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
 
@@ -3478,23 +3526,23 @@ fi
 
 case "$target" in
 *-convex-*)
-  for ac_header in /sys/sync/queue.h /sys/sync/sema.h
+
+for ac_header in /sys/sync/queue.h /sys/sync/sema.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:3486: checking for $ac_header" 1>&5
+echo "configure:3210: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 3492 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 3216 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3221: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -3506,7 +3554,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:3233: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -3517,23 +3566,23 @@ done
 
   ;;
 *-*-bsdi*)
-  for ac_header in machine/inline.h sys/pcl720.h sys/i8253.h
+
+for ac_header in machine/inline.h sys/pcl720.h sys/i8253.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:3525: checking for $ac_header" 1>&5
+echo "configure:3246: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 3531 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 3252 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3257: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -3545,7 +3594,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:3269: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -3557,20 +3607,19 @@ done
   ;;
 esac
 
-echo $ECHO_N "checking for nlist.h... $ECHO_C" 1>&6
-echo "configure:3562: checking for nlist.h" 1>&5
+echo "configure:3279: checking for nlist.h" >&5
+echo $ECHO_N "checking for nlist.h... $ECHO_C" >&6
 if test "${ac_cv_header_nlist_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 3568 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 3285 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3290: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   ac_cv_header_nlist_h=yes
@@ -3582,19 +3631,20 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_header_nlist_h" 1>&6
+echo "configure:3302: result: $ac_cv_header_nlist_h" >&5
+echo "${ECHO_T}$ac_cv_header_nlist_h" >&6
 if test $ac_cv_header_nlist_h = yes; then
   cat >>confdefs.h <<\EOF
 #define NLIST_STRUCT 1
 EOF
 
-echo $ECHO_N "checking for n_un in struct nlist... $ECHO_C" 1>&6
-echo "configure:3593: checking for n_un in struct nlist" 1>&5
+echo "configure:3308: checking for n_un in struct nlist" >&5
+echo $ECHO_N "checking for n_un in struct nlist... $ECHO_C" >&6
 if test "${ac_cv_struct_nlist_n_un+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 3598 "configure"
+#line 3314 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 int
@@ -3605,7 +3655,7 @@ struct nlist n; n.n_un.n_name = 0;
   return 0;
 }
 EOF
-if { (eval echo configure:3609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3325: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_struct_nlist_n_un=yes
 else
   echo "configure: failed program was:" >&5
@@ -3614,7 +3664,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_struct_nlist_n_un" 1>&6
+echo "configure:3334: result: $ac_cv_struct_nlist_n_un" >&5
+echo "${ECHO_T}$ac_cv_struct_nlist_n_un" >&6
 if test $ac_cv_struct_nlist_n_un = yes; then
   cat >>confdefs.h <<\EOF
 #define NLIST_NAME_UNION 1
@@ -3624,13 +3675,13 @@ fi
 
 fi
 
-echo $ECHO_N "checking for basic volatile support... $ECHO_C" 1>&6
-echo "configure:3629: checking for basic volatile support" 1>&5
+echo "configure:3342: checking for basic volatile support" >&5
+echo $ECHO_N "checking for basic volatile support... $ECHO_C" >&6
 if test "${ac_cv_c_volatile+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 3634 "configure"
+#line 3348 "configure"
 #include "confdefs.h"
 
 int
@@ -3642,7 +3693,7 @@ volatile int x;
   return 0;
 }
 EOF
-if { (eval echo configure:3646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3358: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_c_volatile=yes
 else
   echo "configure: failed program was:" >&5
@@ -3652,7 +3703,8 @@ fi
 rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_c_volatile" 1>&6
+echo "configure:3367: result: $ac_cv_c_volatile" >&5
+echo "${ECHO_T}$ac_cv_c_volatile" >&6
 case "$ac_cv_c_volatile" in
  yes)
     ;;
@@ -3669,10 +3721,10 @@ case "$target" in
     ;;
  *)
 
-echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" 1>&6
-echo "configure:3674: checking for ${CC-cc} option to accept ANSI C" 1>&5
+echo "configure:3382: checking for ${CC-cc} option to accept ANSI C" >&5
+echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
 if test "${am_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   am_cv_prog_cc_stdc=no
 ac_save_CC="$CC"
@@ -3687,7 +3739,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   cat >conftest.$ac_ext <<EOF
-#line 3691 "configure"
+#line 3400 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -3728,12 +3780,11 @@ return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
   return 0;
 }
 EOF
-if { (eval echo configure:3732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3438: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   am_cv_prog_cc_stdc="$ac_arg"; break
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-
 fi
 rm -f conftest*
 done
@@ -3742,37 +3793,40 @@ CC="$ac_save_CC"
 fi
 
 if test -z "$am_cv_prog_cc_stdc"; then
-  echo "$ECHO_T""none needed" 1>&6
+  echo "configure:3449: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6
 else
-  echo "$ECHO_T""$am_cv_prog_cc_stdc" 1>&6
+  echo "configure:3452: result: $am_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6
 fi
 case "x$am_cv_prog_cc_stdc" in
   x|xno) ;;
   *) CC="$CC $am_cv_prog_cc_stdc" ;;
 esac
 
-echo $ECHO_N "checking for function prototypes... $ECHO_C" 1>&6
-echo "configure:3756: checking for function prototypes" 1>&5
+echo "configure:3459: checking for function prototypes" >&5
+echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
 if test "$am_cv_prog_cc_stdc" != no; then
-  echo "$ECHO_T""yes" 1>&6
-  cat >>confdefs.h <<\EOF
+  echo "configure:3462: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\EOF
 #define PROTOTYPES 1
 EOF
 
   U= ANSI2KNR=
 else
-  echo "$ECHO_T""no" 1>&6
+  echo "configure:3469: result: no" >&5
+echo "${ECHO_T}no" >&6
   U=_ ANSI2KNR=./ansi2knr
   # Ensure some checks needed by ansi2knr itself.
-
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" 1>&6
-echo "configure:3770: checking for ANSI C header files" 1>&5
+  echo "configure:3473: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 3776 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 3479 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3781,7 +3835,7 @@ cat >conftest.$ac_ext <<EOF
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3487: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   ac_cv_header_stdc=yes
@@ -3795,9 +3849,8 @@ rm -f conftest*
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-
 cat >conftest.$ac_ext <<EOF
-#line 3801 "configure"
+#line 3501 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -3814,9 +3867,8 @@ fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-
 cat >conftest.$ac_ext <<EOF
-#line 3820 "configure"
+#line 3516 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -3837,7 +3889,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat >conftest.$ac_ext <<EOF
-#line 3841 "configure"
+#line 3534 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -3862,45 +3914,45 @@ main ()
   exit (0);
 }
 EOF
-if { (eval echo configure:3866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
-   (./conftest; exit) 2>/dev/null; then
+if { (eval echo configure:3558: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
   :
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   ac_cv_header_stdc=no
 fi
-rm -fr conftest*
-
+rm -f conftest*
 fi
 
 fi
 fi
-echo "$ECHO_T""$ac_cv_header_stdc" 1>&6
+echo "configure:3570: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define STDC_HEADERS 1
 EOF
 
 fi
 
-  for ac_header in string.h
+for ac_header in string.h
 do
 ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_header... $ECHO_C" 1>&6
-echo "configure:3892: checking for $ac_header" 1>&5
+echo "configure:3580: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 3898 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 3586 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3591: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   eval "$ac_ac_Header=yes"
@@ -3912,7 +3964,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_Header'}'`" 1>&6
+echo "configure:3603: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
 if test `eval echo '${'$ac_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
@@ -3925,13 +3978,13 @@ fi
 
     ;;
 esac
-echo $ECHO_N "checking if C compiler permits function prototypes... $ECHO_C" 1>&6
-echo "configure:3930: checking if C compiler permits function prototypes" 1>&5
+echo "configure:3614: checking if C compiler permits function prototypes" >&5
+echo $ECHO_N "checking if C compiler permits function prototypes... $ECHO_C" >&6
 if test "${ac_cv_have_prototypes+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 3935 "configure"
+#line 3620 "configure"
 #include "confdefs.h"
 
 extern int foo (short);
@@ -3945,7 +3998,7 @@ int i;
   return 0;
 }
 EOF
-if { (eval echo configure:3949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3632: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_have_prototypes=yes
 else
   echo "configure: failed program was:" >&5
@@ -3955,7 +4008,8 @@ fi
 rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_have_prototypes" 1>&6
+echo "configure:3641: result: $ac_cv_have_prototypes" >&5
+echo "${ECHO_T}$ac_cv_have_prototypes" >&6
 if test "$ac_cv_have_prototypes" = yes; then
   cat >>confdefs.h <<\EOF
 #define HAVE_PROTOTYPES 1
@@ -3963,13 +4017,13 @@ EOF
 
 fi
 
-echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" 1>&6
-echo "configure:3968: checking for ${CC-cc} option to accept ANSI C" 1>&5
+echo "configure:3648: checking for ${CC-cc} option to accept ANSI C" >&5
+echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&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
 # breaks some systems' header files.
 # AIX			-qlanglvl=ansi
@@ -3981,7 +4035,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   cat >conftest.$ac_ext <<EOF
-#line 3985 "configure"
+#line 3666 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -4019,34 +4073,35 @@ return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
   return 0;
 }
 EOF
-if { (eval echo configure:4023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  ac_cv_prog_cc_stdc="$ac_arg"; break
+if { (eval echo configure:3704: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
+  ac_cv_prog_cc_stdc=$ac_arg; break
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-
 fi
 rm -f conftest*
 done
-CC="$ac_save_CC"
+CC=$ac_save_CC
 
 fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$ECHO_T""none needed" 1>&6 ;;
+    echo "configure:3716: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$ECHO_T""$ac_cv_prog_cc_stdc" 1>&6
+    echo "configure:3719: 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 $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" 1>&6
-echo "configure:4045: checking for an ANSI C-conforming const" 1>&5
+echo "configure:3723: checking for an ANSI C-conforming const" >&5
+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 4050 "configure"
+#line 3729 "configure"
 #include "confdefs.h"
 
 int
@@ -4103,7 +4158,7 @@ main ()
   return 0;
 }
 EOF
-if { (eval echo configure:4107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3783: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_c_const=yes
 else
   echo "configure: failed program was:" >&5
@@ -4112,9 +4167,11 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_c_const" 1>&6
+echo "configure:3792: result: $ac_cv_c_const" >&5
+echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define const
 EOF
 
@@ -4122,15 +4179,15 @@ fi
 
 case "$host" in
  $target)
-    echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" 1>&6
-echo "configure:4127: checking whether byte ordering is bigendian" 1>&5
+    echo "configure:3801: checking whether byte ordering is bigendian" >&5
+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
 if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat >conftest.$ac_ext <<EOF
-#line 4134 "configure"
+#line 3809 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4146,10 +4203,10 @@ main ()
   return 0;
 }
 EOF
-if { (eval echo configure:4150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3823: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat >conftest.$ac_ext <<EOF
-#line 4153 "configure"
+#line 3826 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4165,7 +4222,7 @@ main ()
   return 0;
 }
 EOF
-if { (eval echo configure:4169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3840: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_c_bigendian=yes
 else
   echo "configure: failed program was:" >&5
@@ -4176,15 +4233,14 @@ rm -f conftest*
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-
 fi
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 if test "$cross_compiling" = yes; then
-    { echo "configure: error: cannot run test program while cross compiling" 1>&2; exit 1; }
+  { echo "configure: error: cannot run test program while cross compiling" >&2; exit 1; }
 else
   cat >conftest.$ac_ext <<EOF
-#line 4188 "configure"
+#line 3858 "configure"
 #include "confdefs.h"
 int
 main ()
@@ -4199,23 +4255,24 @@ main ()
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:4203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
-   (./conftest; exit) 2>/dev/null; then
+if { (eval echo configure:3873: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
   ac_cv_c_bigendian=no
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   ac_cv_c_bigendian=yes
 fi
-rm -fr conftest*
-
+rm -f conftest*
 fi
 
 fi
 fi
-echo "$ECHO_T""$ac_cv_c_bigendian" 1>&6
+echo "configure:3885: result: $ac_cv_c_bigendian" >&5
+echo "${ECHO_T}$ac_cv_c_bigendian" >&6
 if test $ac_cv_c_bigendian = yes; then
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define WORDS_BIGENDIAN 1
 EOF
 
@@ -4232,18 +4289,18 @@ fi
 EOF
 
 	;;
-     *) { echo "configure: error: Cross-compiling needs explicit byte order" 1>&2; exit 1; }
+     *) { echo "configure: error: Cross-compiling needs explicit byte order" >&2; exit 1; }
 	;;
     esac
     ;;
 esac
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" 1>&6
-echo "configure:4242: checking return type of signal handlers" 1>&5
+echo "configure:3907: checking return type of signal handlers" >&5
+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
 if test "${ac_cv_type_signal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 4247 "configure"
+#line 3913 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4264,7 +4321,7 @@ int i;
   return 0;
 }
 EOF
-if { (eval echo configure:4268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3933: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_type_signal=void
 else
   echo "configure: failed program was:" >&5
@@ -4273,18 +4330,20 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_type_signal" 1>&6
+echo "configure:3942: result: $ac_cv_type_signal" >&5
+echo "${ECHO_T}$ac_cv_type_signal" >&6
+
 cat >>confdefs.h <<EOF
 #define RETSIGTYPE $ac_cv_type_signal
 EOF
 
-echo $ECHO_N "checking for off_t... $ECHO_C" 1>&6
-echo "configure:4283: checking for off_t" 1>&5
+echo "configure:3947: checking for off_t" >&5
+echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 4288 "configure"
+#line 3953 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4298,7 +4357,7 @@ if (sizeof (off_t))
   return 0;
 }
 EOF
-if { (eval echo configure:4302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3967: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_type_off_t=yes
 else
   echo "configure: failed program was:" >&5
@@ -4307,23 +4366,25 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_type_off_t" 1>&6
+echo "configure:3976: result: $ac_cv_type_off_t" >&5
+echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
   :
 else
-  cat >>confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define off_t long
 EOF
 
 fi
 
-echo $ECHO_N "checking for size_t... $ECHO_C" 1>&6
-echo "configure:4322: checking for size_t" 1>&5
+echo "configure:3985: checking for size_t" >&5
+echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 4327 "configure"
+#line 3991 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4337,7 +4398,7 @@ if (sizeof (size_t))
   return 0;
 }
 EOF
-if { (eval echo configure:4341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4005: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_type_size_t=yes
 else
   echo "configure: failed program was:" >&5
@@ -4346,23 +4407,25 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_type_size_t" 1>&6
+echo "configure:4014: result: $ac_cv_type_size_t" >&5
+echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
 else
-  cat >>confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define size_t unsigned
 EOF
 
 fi
 
-echo $ECHO_N "checking for time_t... $ECHO_C" 1>&6
-echo "configure:4361: checking for time_t" 1>&5
+echo "configure:4023: checking for time_t" >&5
+echo $ECHO_N "checking for time_t... $ECHO_C" >&6
 if test "${ac_cv_type_time_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 4366 "configure"
+#line 4029 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4376,7 +4439,7 @@ if (sizeof (time_t))
   return 0;
 }
 EOF
-if { (eval echo configure:4380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4043: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_type_time_t=yes
 else
   echo "configure: failed program was:" >&5
@@ -4385,23 +4448,25 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_type_time_t" 1>&6
+echo "configure:4052: result: $ac_cv_type_time_t" >&5
+echo "${ECHO_T}$ac_cv_type_time_t" >&6
 if test $ac_cv_type_time_t = yes; then
   :
 else
-  cat >>confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define time_t long
 EOF
 
 fi
 
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" 1>&6
-echo "configure:4400: checking whether struct tm is in sys/time.h or time.h" 1>&5
+echo "configure:4061: 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 test "${ac_cv_struct_tm+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 4405 "configure"
+#line 4067 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -4414,7 +4479,7 @@ struct tm *tp; tp->tm_sec;
   return 0;
 }
 EOF
-if { (eval echo configure:4418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4079: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_struct_tm=time.h
 else
   echo "configure: failed program was:" >&5
@@ -4423,18 +4488,20 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_struct_tm" 1>&6
+echo "configure:4088: result: $ac_cv_struct_tm" >&5
+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 $ECHO_N "checking for a fallback value for HZ... $ECHO_C" 1>&6
-echo "configure:4436: checking for a fallback value for HZ" 1>&5
+echo "configure:4095: checking for a fallback value for HZ" >&5
+echo $ECHO_N "checking for a fallback value for HZ... $ECHO_C" >&6
 if test "${ac_cv_var_default_hz+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_var_default_hz=100
 case "$target" in
@@ -4446,15 +4513,16 @@ case "$target" in
     ;;
 esac
 fi
-echo "$ECHO_T""$ac_cv_var_default_hz" 1>&6
+echo "configure:4110: result: $ac_cv_var_default_hz" >&5
+echo "${ECHO_T}$ac_cv_var_default_hz" >&6
 cat >>confdefs.h <<EOF
 #define DEFAULT_HZ $ac_cv_var_default_hz
 EOF
 
-echo $ECHO_N "checking if we need to override the system's value for HZ... $ECHO_C" 1>&6
-echo "configure:4456: checking if we need to override the system's value for HZ" 1>&5
+echo "configure:4115: checking if we need to override the system's value for HZ" >&5
+echo $ECHO_N "checking if we need to override the system's value for HZ... $ECHO_C" >&6
 if test "${ac_cv_var_override_hz+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_var_override_hz=no
 case "$target" in
@@ -4472,7 +4540,8 @@ case "$target" in
     ;;
 esac
 fi
-echo "$ECHO_T""$ac_cv_var_override_hz" 1>&6
+echo "configure:4136: result: $ac_cv_var_override_hz" >&5
+echo "${ECHO_T}$ac_cv_var_override_hz" >&6
 case "$ac_cv_var_override_hz" in
  yes)
     cat >>confdefs.h <<\EOF
@@ -4482,14 +4551,14 @@ EOF
     ;;
 esac
 
-echo $ECHO_N "checking struct sigaction for sa_sigaction... $ECHO_C" 1>&6
-echo "configure:4487: checking struct sigaction for sa_sigaction" 1>&5
+echo "configure:4145: checking struct sigaction for sa_sigaction" >&5
+echo $ECHO_N "checking struct sigaction for sa_sigaction... $ECHO_C" >&6
 if test "${ac_cv_struct_sigaction_has_sa_sigaction+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<EOF
-#line 4493 "configure"
+#line 4151 "configure"
 #include "confdefs.h"
 #include <signal.h>
 int
@@ -4500,7 +4569,7 @@ struct sigaction act; act.sa_sigaction = 0;
   return 0;
 }
 EOF
-if { (eval echo configure:4504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4162: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_struct_sigaction_has_sa_sigaction=yes
 else
   echo "configure: failed program was:" >&5
@@ -4511,7 +4580,8 @@ fi
 rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_struct_sigaction_has_sa_sigaction" 1>&6
+echo "configure:4171: result: $ac_cv_struct_sigaction_has_sa_sigaction" >&5
+echo "${ECHO_T}$ac_cv_struct_sigaction_has_sa_sigaction" >&6
 if test $ac_cv_struct_sigaction_has_sa_sigaction = yes; then
   cat >>confdefs.h <<\EOF
 #define HAVE_SA_SIGACTION_IN_STRUCT_SIGACTION 1
@@ -4519,13 +4589,13 @@ EOF
 
 fi
 
-echo $ECHO_N "checking for struct ppsclockev... $ECHO_C" 1>&6
-echo "configure:4524: checking for struct ppsclockev" 1>&5
+echo "configure:4178: checking for struct ppsclockev" >&5
+echo $ECHO_N "checking for struct ppsclockev... $ECHO_C" >&6
 if test "${ac_cv_struct_ppsclockev+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 4529 "configure"
+#line 4184 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4548,7 +4618,7 @@ return pce->serial;
   return 0;
 }
 EOF
-if { (eval echo configure:4552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4205: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_struct_ppsclockev=yes
 else
   echo "configure: failed program was:" >&5
@@ -4558,7 +4628,8 @@ fi
 rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_struct_ppsclockev" 1>&6
+echo "configure:4214: result: $ac_cv_struct_ppsclockev" >&5
+echo "${ECHO_T}$ac_cv_struct_ppsclockev" >&6
 if test $ac_cv_struct_ppsclockev = yes; then
     cat >>confdefs.h <<\EOF
 #define HAVE_STRUCT_PPSCLOCKEV 1
@@ -4566,13 +4637,13 @@ EOF
 
 fi
 
-echo $ECHO_N "checking struct sockaddr for sa_len... $ECHO_C" 1>&6
-echo "configure:4571: checking struct sockaddr for sa_len" 1>&5
+echo "configure:4221: checking struct sockaddr for sa_len" >&5
+echo $ECHO_N "checking struct sockaddr for sa_len... $ECHO_C" >&6
 if test "${ac_cv_struct_sockaddr_has_sa_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 4576 "configure"
+#line 4227 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4587,7 +4658,7 @@ return ps->sa_len;
   return 0;
 }
 EOF
-if { (eval echo configure:4591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4240: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_struct_sockaddr_has_sa_len=yes
 else
   echo "configure: failed program was:" >&5
@@ -4597,7 +4668,8 @@ fi
 rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_struct_sockaddr_has_sa_len" 1>&6
+echo "configure:4249: result: $ac_cv_struct_sockaddr_has_sa_len" >&5
+echo "${ECHO_T}$ac_cv_struct_sockaddr_has_sa_len" >&6
 if test $ac_cv_struct_sockaddr_has_sa_len = yes; then
     cat >>confdefs.h <<\EOF
 #define HAVE_SA_LEN_IN_STRUCT_SOCKADDR 1
@@ -4605,13 +4677,13 @@ EOF
 
 fi
 
-echo $ECHO_N "checking struct clockinfo for hz... $ECHO_C" 1>&6
-echo "configure:4610: checking struct clockinfo for hz" 1>&5
+echo "configure:4256: checking struct clockinfo for hz" >&5
+echo $ECHO_N "checking struct clockinfo for hz... $ECHO_C" >&6
 if test "${ac_cv_struct_clockinfo_has_hz+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 4615 "configure"
+#line 4262 "configure"
 #include "confdefs.h"
 
 #include <sys/time.h>
@@ -4625,7 +4697,7 @@ return pc->hz;
   return 0;
 }
 EOF
-if { (eval echo configure:4629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4274: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_struct_clockinfo_has_hz=yes
 else
   echo "configure: failed program was:" >&5
@@ -4635,7 +4707,8 @@ fi
 rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_struct_clockinfo_has_hz" 1>&6
+echo "configure:4283: result: $ac_cv_struct_clockinfo_has_hz" >&5
+echo "${ECHO_T}$ac_cv_struct_clockinfo_has_hz" >&6
 if test $ac_cv_struct_clockinfo_has_hz = yes; then
     cat >>confdefs.h <<\EOF
 #define HAVE_HZ_IN_STRUCT_CLOCKINFO 1
@@ -4643,13 +4716,13 @@ EOF
 
 fi
 
-echo $ECHO_N "checking struct clockinfo for tickadj... $ECHO_C" 1>&6
-echo "configure:4648: checking struct clockinfo for tickadj" 1>&5
+echo "configure:4290: checking struct clockinfo for tickadj" >&5
+echo $ECHO_N "checking struct clockinfo for tickadj... $ECHO_C" >&6
 if test "${ac_cv_struct_clockinfo_has_tickadj+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 4653 "configure"
+#line 4296 "configure"
 #include "confdefs.h"
 
 #include <sys/time.h>
@@ -4663,7 +4736,7 @@ return pc->tickadj;
   return 0;
 }
 EOF
-if { (eval echo configure:4667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4308: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_struct_clockinfo_has_tickadj=yes
 else
   echo "configure: failed program was:" >&5
@@ -4673,7 +4746,8 @@ fi
 rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_struct_clockinfo_has_tickadj" 1>&6
+echo "configure:4317: result: $ac_cv_struct_clockinfo_has_tickadj" >&5
+echo "${ECHO_T}$ac_cv_struct_clockinfo_has_tickadj" >&6
 if test $ac_cv_struct_clockinfo_has_tickadj = yes; then
     cat >>confdefs.h <<\EOF
 #define HAVE_TICKADJ_IN_STRUCT_CLOCKINFO 1
@@ -4681,13 +4755,13 @@ EOF
 
 fi
 
-echo $ECHO_N "checking for struct ntptimeval... $ECHO_C" 1>&6
-echo "configure:4686: checking for struct ntptimeval" 1>&5
+echo "configure:4324: checking for struct ntptimeval" >&5
+echo $ECHO_N "checking for struct ntptimeval... $ECHO_C" >&6
 if test "${ac_cv_struct_ntptimeval+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 4691 "configure"
+#line 4330 "configure"
 #include "confdefs.h"
 
 #include <sys/time.h>
@@ -4700,7 +4774,7 @@ struct ntptimeval n;
   return 0;
 }
 EOF
-if { (eval echo configure:4704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4342: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_struct_ntptimeval=yes
 else
   echo "configure: failed program was:" >&5
@@ -4709,21 +4783,23 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_struct_ntptimeval" 1>&6
+echo "configure:4351: result: $ac_cv_struct_ntptimeval" >&5
+echo "${ECHO_T}$ac_cv_struct_ntptimeval" >&6
 if test $ac_cv_struct_ntptimeval = yes; then
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define HAVE_STRUCT_NTPTIMEVAL 1
 EOF
 
 fi
 
-echo $ECHO_N "checking struct ntptimeval for time.tv_nsec... $ECHO_C" 1>&6
-echo "configure:4722: checking struct ntptimeval for time.tv_nsec" 1>&5
+echo "configure:4358: checking struct ntptimeval for time.tv_nsec" >&5
+echo $ECHO_N "checking struct ntptimeval for time.tv_nsec... $ECHO_C" >&6
 if test "${ac_cv_struct_ntptimeval_tv_nsec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 4727 "configure"
+#line 4364 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYS_TIME_H
@@ -4750,7 +4826,7 @@ return ntv->time.tv_nsec;
   return 0;
 }
 EOF
-if { (eval echo configure:4754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4389: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_struct_ntptimeval_tv_nsec=yes
 else
   echo "configure: failed program was:" >&5
@@ -4760,7 +4836,8 @@ fi
 rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_struct_ntptimeval_tv_nsec" 1>&6
+echo "configure:4398: result: $ac_cv_struct_ntptimeval_tv_nsec" >&5
+echo "${ECHO_T}$ac_cv_struct_ntptimeval_tv_nsec" >&6
 if test "$ac_cv_struct_ntptimeval_tv_nsec" = "yes"; then
 	cat >>confdefs.h <<\EOF
 #define HAVE_TV_NSEC_IN_NTPTIMEVAL 1
@@ -4768,13 +4845,13 @@ EOF
 
 fi
 
-echo $ECHO_N "checking for struct timespec in struct ntptimeval... $ECHO_C" 1>&6
-echo "configure:4773: checking for struct timespec in struct ntptimeval" 1>&5
+echo "configure:4405: checking for struct timespec in struct ntptimeval" >&5
+echo $ECHO_N "checking for struct timespec in struct ntptimeval... $ECHO_C" >&6
 if test "${ac_cv_struct_ntptimeval_timespec+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 4778 "configure"
+#line 4411 "configure"
 #include "confdefs.h"
 #include <sys/time.h>
 #include <sys/timex.h>
@@ -4786,7 +4863,7 @@ struct ntptimeval n; n.time.tv_nsec = 0;
   return 0;
 }
 EOF
-if { (eval echo configure:4790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4423: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_struct_ntptimeval_timespec=yes
 else
   echo "configure: failed program was:" >&5
@@ -4795,51 +4872,47 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_struct_ntptimeval_timespec" 1>&6
+echo "configure:4432: result: $ac_cv_struct_ntptimeval_timespec" >&5
+echo "${ECHO_T}$ac_cv_struct_ntptimeval_timespec" >&6
 if test $ac_cv_struct_ntptimeval_timespec = yes; then
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define TIMESPEC_IN_NTPTIMEVAL 1
 EOF
 
 fi
 
-echo $ECHO_N "checking for inline... $ECHO_C" 1>&6
-echo "configure:4808: checking for inline" 1>&5
+echo "configure:4439: checking for inline" >&5
+echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<EOF
-#line 4815 "configure"
+#line 4447 "configure"
 #include "confdefs.h"
-
-int
-main ()
-{
 #ifndef __cplusplus
-  } $ac_kw int foo() {
+$ac_kw int foo () {return 0; }
 #endif
 
-  ;
-  return 0;
-}
 EOF
-if { (eval echo configure:4829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4453: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_c_inline=$ac_kw; break
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-
 fi
 rm -f conftest*
 done
 
 fi
-echo "$ECHO_T""$ac_cv_c_inline" 1>&6
+echo "configure:4462: result: $ac_cv_c_inline" >&5
+echo "${ECHO_T}$ac_cv_c_inline" >&6
 case "$ac_cv_c_inline" in
   inline | yes) ;;
-  no) cat >>confdefs.h <<\EOF
+  no)
+cat >>confdefs.h <<\EOF
 #define inline
 EOF
  ;;
@@ -4849,16 +4922,15 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking whether char is unsigned... $ECHO_C" 1>&6
-echo "configure:4854: checking whether char is unsigned" 1>&5
+echo "configure:4476: checking whether char is unsigned" >&5
+echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6
 if test "${ac_cv_c_char_unsigned+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$GCC" = yes; then
   # GCC predefines this symbol on systems where it applies.
-
 cat >conftest.$ac_ext <<EOF
-#line 4862 "configure"
+#line 4484 "configure"
 #include "confdefs.h"
 #ifdef __CHAR_UNSIGNED__
   yes
@@ -4875,10 +4947,10 @@ rm -f conftest*
 
 else
 if test "$cross_compiling" = yes; then
-    { echo "configure: error: cannot run test program while cross compiling" 1>&2; exit 1; }
+  { echo "configure: error: cannot run test program while cross compiling" >&2; exit 1; }
 else
   cat >conftest.$ac_ext <<EOF
-#line 4882 "configure"
+#line 4502 "configure"
 #include "confdefs.h"
 /* volatile prevents gcc2 from optimizing the test away on sparcs.  */
 #if !defined(__STDC__) || __STDC__ != 1
@@ -4891,21 +4963,21 @@ main()
   exit(c < 0);
 }
 EOF
-if { (eval echo configure:4895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
-   (./conftest; exit) 2>/dev/null; then
+if { (eval echo configure:4515: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
   ac_cv_c_char_unsigned=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   ac_cv_c_char_unsigned=no
 fi
-rm -fr conftest*
-
+rm -f conftest*
 fi
 
 fi
 fi
-echo "$ECHO_T""$ac_cv_c_char_unsigned" 1>&6
+echo "configure:4527: result: $ac_cv_c_char_unsigned" >&5
+echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6
 if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
   cat >>confdefs.h <<\EOF
 #define __CHAR_UNSIGNED__ 1
@@ -4914,16 +4986,16 @@ EOF
 fi
 		case "$host" in
  $target)
-    echo $ECHO_N "checking size of signed char... $ECHO_C" 1>&6
-echo "configure:4919: checking size of signed char" 1>&5
+    echo "configure:4536: checking size of signed char" >&5
+echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
 if test "${ac_cv_sizeof_signed_char+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
-    { echo "configure: error: cannot run test program while cross compiling" 1>&2; exit 1; }
+  { echo "configure: error: cannot run test program while cross compiling" >&2; exit 1; }
 else
   cat >conftest.$ac_ext <<EOF
-#line 4927 "configure"
+#line 4545 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4936,20 +5008,21 @@ main ()
   exit (0);
 }
 EOF
-if { (eval echo configure:4940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
-   (./conftest; exit) 2>/dev/null; then
+if { (eval echo configure:4558: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
   ac_cv_sizeof_signed_char=`cat conftestval`
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   ac_cv_sizeof_signed_char=0
 fi
-rm -fr conftest*
-
+rm -f conftest*
 fi
 
 fi
-echo "$ECHO_T""$ac_cv_sizeof_signed_char" 1>&6
+echo "configure:4569: result: $ac_cv_sizeof_signed_char" >&5
+echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
 EOF
@@ -4957,16 +5030,16 @@ EOF
     ;;
  *) case "$target" in
      *-*-vxworks*)
-	echo $ECHO_N "checking size of signed char... $ECHO_C" 1>&6
-echo "configure:4962: checking size of signed char" 1>&5
+	echo "configure:4577: checking size of signed char" >&5
+echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
 if test "${ac_cv_sizeof_signed_char+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_sizeof_signed_char=1
 else
   cat >conftest.$ac_ext <<EOF
-#line 4970 "configure"
+#line 4586 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -4979,26 +5052,27 @@ main ()
   exit (0);
 }
 EOF
-if { (eval echo configure:4983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
-   (./conftest; exit) 2>/dev/null; then
+if { (eval echo configure:4599: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
   ac_cv_sizeof_signed_char=`cat conftestval`
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   ac_cv_sizeof_signed_char=0
 fi
-rm -fr conftest*
-
+rm -f conftest*
 fi
 
 fi
-echo "$ECHO_T""$ac_cv_sizeof_signed_char" 1>&6
+echo "configure:4610: result: $ac_cv_sizeof_signed_char" >&5
+echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
+
 cat >>confdefs.h <<EOF
 #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
 EOF
 
 	;;
-     *) { echo "configure: error: Cross-compiling needs explicit SIZEOF_SIGNED_LONG" 1>&2; exit 1; }
+     *) { echo "configure: error: Cross-compiling needs explicit SIZEOF_SIGNED_LONG" >&2; exit 1; }
         ;;
     esac
     ;;
@@ -5006,16 +5080,16 @@ esac
 
 case "$host" in
  $target)
-    echo $ECHO_N "checking size of int... $ECHO_C" 1>&6
-echo "configure:5011: checking size of int" 1>&5
+    echo "configure:4623: checking size of int" >&5
+echo $ECHO_N "checking size of int... $ECHO_C" >&6
 if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
-    { echo "configure: error: cannot run test program while cross compiling" 1>&2; exit 1; }
+  { echo "configure: error: cannot run test program while cross compiling" >&2; exit 1; }
 else
   cat >conftest.$ac_ext <<EOF
-#line 5019 "configure"
+#line 4632 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5028,20 +5102,21 @@ main ()
   exit (0);
 }
 EOF
-if { (eval echo configure:5032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
-   (./conftest; exit) 2>/dev/null; then
+if { (eval echo configure:4645: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
   ac_cv_sizeof_int=`cat conftestval`
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   ac_cv_sizeof_int=0
 fi
-rm -fr conftest*
-
+rm -f conftest*
 fi
 
 fi
-echo "$ECHO_T""$ac_cv_sizeof_int" 1>&6
+echo "configure:4656: result: $ac_cv_sizeof_int" >&5
+echo "${ECHO_T}$ac_cv_sizeof_int" >&6
+
 cat >>confdefs.h <<EOF
 #define SIZEOF_INT $ac_cv_sizeof_int
 EOF
@@ -5049,16 +5124,16 @@ EOF
     ;;
  *) case "$target" in
      *-*-vxworks*)
-	echo $ECHO_N "checking size of int... $ECHO_C" 1>&6
-echo "configure:5054: checking size of int" 1>&5
+	echo "configure:4664: checking size of int" >&5
+echo $ECHO_N "checking size of int... $ECHO_C" >&6
 if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_sizeof_int=4
 else
   cat >conftest.$ac_ext <<EOF
-#line 5062 "configure"
+#line 4673 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5071,26 +5146,27 @@ main ()
   exit (0);
 }
 EOF
-if { (eval echo configure:5075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
-   (./conftest; exit) 2>/dev/null; then
+if { (eval echo configure:4686: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
   ac_cv_sizeof_int=`cat conftestval`
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   ac_cv_sizeof_int=0
 fi
-rm -fr conftest*
-
+rm -f conftest*
 fi
 
 fi
-echo "$ECHO_T""$ac_cv_sizeof_int" 1>&6
+echo "configure:4697: result: $ac_cv_sizeof_int" >&5
+echo "${ECHO_T}$ac_cv_sizeof_int" >&6
+
 cat >>confdefs.h <<EOF
 #define SIZEOF_INT $ac_cv_sizeof_int
 EOF
 
         ;;
-     *) { echo "configure: error: Cross-compiling needs explicit SIZEOF_INT" 1>&2; exit 1; }
+     *) { echo "configure: error: Cross-compiling needs explicit SIZEOF_INT" >&2; exit 1; }
 	;;
     esac
     ;;
@@ -5098,16 +5174,16 @@ esac
 
 case "$host" in
  $target)
-    echo $ECHO_N "checking size of long... $ECHO_C" 1>&6
-echo "configure:5103: checking size of long" 1>&5
+    echo "configure:4710: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6
 if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
-    { echo "configure: error: cannot run test program while cross compiling" 1>&2; exit 1; }
+  { echo "configure: error: cannot run test program while cross compiling" >&2; exit 1; }
 else
   cat >conftest.$ac_ext <<EOF
-#line 5111 "configure"
+#line 4719 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5120,20 +5196,21 @@ main ()
   exit (0);
 }
 EOF
-if { (eval echo configure:5124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
-   (./conftest; exit) 2>/dev/null; then
+if { (eval echo configure:4732: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
   ac_cv_sizeof_long=`cat conftestval`
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   ac_cv_sizeof_long=0
 fi
-rm -fr conftest*
-
+rm -f conftest*
 fi
 
 fi
-echo "$ECHO_T""$ac_cv_sizeof_long" 1>&6
+echo "configure:4743: result: $ac_cv_sizeof_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+
 cat >>confdefs.h <<EOF
 #define SIZEOF_LONG $ac_cv_sizeof_long
 EOF
@@ -5141,16 +5218,16 @@ EOF
     ;;
  *) case "$target" in
      *-*-vxworks*)
-	echo $ECHO_N "checking size of long... $ECHO_C" 1>&6
-echo "configure:5146: checking size of long" 1>&5
+	echo "configure:4751: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6
 if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   if test "$cross_compiling" = yes; then
   ac_cv_sizeof_long=4
 else
   cat >conftest.$ac_ext <<EOF
-#line 5154 "configure"
+#line 4760 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5163,38 +5240,39 @@ main ()
   exit (0);
 }
 EOF
-if { (eval echo configure:5167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} &&
-   (./conftest; exit) 2>/dev/null; then
+if { (eval echo configure:4773: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
   ac_cv_sizeof_long=`cat conftestval`
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   ac_cv_sizeof_long=0
 fi
-rm -fr conftest*
-
+rm -f conftest*
 fi
 
 fi
-echo "$ECHO_T""$ac_cv_sizeof_long" 1>&6
+echo "configure:4784: result: $ac_cv_sizeof_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+
 cat >>confdefs.h <<EOF
 #define SIZEOF_LONG $ac_cv_sizeof_long
 EOF
 
         ;;
-     *) { echo "configure: error: Cross-compiling needs explicit SIZEOF_LONG" 1>&2; exit 1; }
+     *) { echo "configure: error: Cross-compiling needs explicit SIZEOF_LONG" >&2; exit 1; }
 	;;
     esac
     ;;
 esac
 
-echo $ECHO_N "checking for s_char... $ECHO_C" 1>&6
-echo "configure:5193: checking for s_char" 1>&5
+echo "configure:4795: checking for s_char" >&5
+echo $ECHO_N "checking for s_char... $ECHO_C" >&6
 if test "${ac_cv_type_s_char+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 5198 "configure"
+#line 4801 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5208,7 +5286,7 @@ if (sizeof (s_char))
   return 0;
 }
 EOF
-if { (eval echo configure:5212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4815: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_type_s_char=yes
 else
   echo "configure: failed program was:" >&5
@@ -5217,9 +5295,11 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_type_s_char" 1>&6
+echo "configure:4824: result: $ac_cv_type_s_char" >&5
+echo "${ECHO_T}$ac_cv_type_s_char" >&6
 if test $ac_cv_type_s_char = yes; then
-  cat >>confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define HAVE_S_CHAR 1
 EOF
 
@@ -5245,7 +5325,7 @@ EOF
     ;;
  yes0no)
     # We have unsigned chars, can't say 'signed char', no s_char typedef.
-    { echo "configure: error: No way to specify a signed character!" 1>&2; exit 1; }
+    { echo "configure: error: No way to specify a signed character!" >&2; exit 1; }
     ;;
  yes1no)
     # We have unsigned chars, can say 'signed char', no s_char typedef.
@@ -5255,14 +5335,13 @@ EOF
 
     ;;
 esac
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" 1>&6
-echo "configure:5260: checking for uid_t in sys/types.h" 1>&5
+echo "configure:4858: checking for uid_t in sys/types.h" >&5
+echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
 if test "${ac_cv_type_uid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 5266 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 4864 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -5276,13 +5355,15 @@ fi
 rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_type_uid_t" 1>&6
+echo "configure:4876: result: $ac_cv_type_uid_t" >&5
+echo "${ECHO_T}$ac_cv_type_uid_t" >&6
 if test $ac_cv_type_uid_t = no; then
-  cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define uid_t int
 EOF
 
-  cat >>confdefs.h <<\EOF
+cat >>confdefs.h <<\EOF
 #define gid_t int
 EOF
 
@@ -5290,28 +5371,32 @@ fi
 
 case "$target" in
  *-*-linux*)
-    for ac_func in __adjtimex __ntp_gettime
+
+for ac_func in __adjtimex __ntp_gettime
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:5298: checking for $ac_func" 1>&5
+echo "configure:4891: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 5303 "configure"
+#line 4897 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -5327,7 +5412,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:5331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4925: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -5335,9 +5420,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:4934: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -5356,28 +5441,32 @@ case "$target" in
 	# this conditional will need to change.  Maybe use AC_TRY_RUN
 	# instead to try to set the time to itself and check errno.
     ;;
- *) for ac_func in clock_settime
+ *)
+for ac_func in clock_settime
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:5364: checking for $ac_func" 1>&5
+echo "configure:4956: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 5369 "configure"
+#line 4962 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -5393,7 +5482,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:5397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4990: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -5401,9 +5490,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:4999: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -5414,28 +5503,32 @@ done
 
     ;;
 esac
+
 for ac_func in daemon getbootfile getdtablesize getrusage
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:5422: checking for $ac_func" 1>&5
+echo "configure:5012: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 5427 "configure"
+#line 5018 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -5451,7 +5544,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:5455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5046: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -5459,9 +5552,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:5055: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -5473,25 +5566,28 @@ done
 for ac_func in gettimeofday
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:5478: checking for $ac_func" 1>&5
+echo "configure:5066: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 5483 "configure"
+#line 5072 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -5507,7 +5603,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:5511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5100: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -5515,9 +5611,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:5109: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -5529,28 +5625,32 @@ done
 case "$target" in
  *-pc-cygwin*)
     ;;
- *) for ac_func in getuid
+ *)
+for ac_func in getuid
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:5537: checking for $ac_func" 1>&5
+echo "configure:5124: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 5542 "configure"
+#line 5130 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -5566,7 +5666,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:5570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5158: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -5574,9 +5674,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:5167: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -5587,28 +5687,32 @@ done
 
     ;;
 esac
+
 for ac_func in hstrerror K_open kvm_open memcpy memmove memset
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:5595: checking for $ac_func" 1>&5
+echo "configure:5180: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 5600 "configure"
+#line 5186 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -5624,7 +5728,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:5628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5214: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -5632,9 +5736,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:5223: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -5647,28 +5751,32 @@ case "$target" in
  *-*-sco3.2v5.0.*)
     # Just stubs.  Idiots.
     ;;
- *) for ac_func in mkstemp
+ *)
+for ac_func in mkstemp
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:5655: checking for $ac_func" 1>&5
+echo "configure:5239: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 5660 "configure"
+#line 5245 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -5684,7 +5792,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:5688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5273: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -5692,9 +5800,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:5282: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -5705,28 +5813,32 @@ done
 
     ;;
 esac
+
 for ac_func in mktime
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:5713: checking for $ac_func" 1>&5
+echo "configure:5295: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 5718 "configure"
+#line 5301 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -5742,7 +5854,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:5746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5329: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -5750,9 +5862,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:5338: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -5776,28 +5888,32 @@ case "$target" in
  alpha*-dec-osf4*|alpha*-dec-osf5*)
     # mlockall is there, as a #define calling memlk via <sys/mman.h>
     # Not easy to test for - cheat.
-    for ac_func in memlk
+
+for ac_func in memlk
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:5784: checking for $ac_func" 1>&5
+echo "configure:5364: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 5789 "configure"
+#line 5370 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -5813,7 +5929,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:5817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5398: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -5821,9 +5937,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:5407: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -5832,28 +5948,31 @@ EOF
 fi
 done
 
-    for ac_func in mlockall
+for ac_func in mlockall
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:5840: checking for $ac_func" 1>&5
+echo "configure:5419: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 5845 "configure"
+#line 5425 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -5869,7 +5988,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:5873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5453: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -5877,9 +5996,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:5462: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -5889,28 +6008,32 @@ fi
 done
 
     ;;
- *) for ac_func in mlockall
+ *)
+for ac_func in mlockall
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:5897: checking for $ac_func" 1>&5
+echo "configure:5475: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 5902 "configure"
+#line 5481 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -5926,7 +6049,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:5930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5509: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -5934,9 +6057,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:5518: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -5947,28 +6070,32 @@ done
 
     ;;
 esac
+
 for ac_func in mrand48 srand48 nice nlist
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:5955: checking for $ac_func" 1>&5
+echo "configure:5531: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 5960 "configure"
+#line 5537 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -5984,7 +6111,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:5988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5565: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -5992,9 +6119,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:5574: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -6007,28 +6134,33 @@ case "$target" in
  *-*-solaris2.6)
     # Broken...
     ;;
- *) for ac_func in ntp_adjtime ntp_gettime
+ *)
+
+for ac_func in ntp_adjtime ntp_gettime
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:6015: checking for $ac_func" 1>&5
+echo "configure:5590: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 6020 "configure"
+#line 5596 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -6044,7 +6176,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:6048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5624: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -6052,9 +6184,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:5633: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -6065,28 +6197,32 @@ done
 
     ;;
 esac
+
 for ac_func in plock pututline pututxline rtprio
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:6073: checking for $ac_func" 1>&5
+echo "configure:5646: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 6078 "configure"
+#line 5652 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -6102,7 +6238,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:6106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5680: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -6110,9 +6246,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:5689: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -6123,28 +6259,32 @@ done
 
 case "$ac_cv_func_mrand48" in
  yes) ;;
- *) for ac_func in random
+ *)
+for ac_func in random
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:6131: checking for $ac_func" 1>&5
+echo "configure:5703: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 6136 "configure"
+#line 5709 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -6160,7 +6300,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:6164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5737: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -6168,9 +6308,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:5746: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -6190,28 +6330,32 @@ case "$target" in
  *-*-solaris2.5*)
     # Just stubs in solaris2.5.  Idiots.
     ;;
- *) for ac_func in sched_setscheduler
+ *)
+for ac_func in sched_setscheduler
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:6198: checking for $ac_func" 1>&5
+echo "configure:5769: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 6203 "configure"
+#line 5775 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -6227,7 +6371,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:6231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5803: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -6235,9 +6379,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:5812: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -6248,28 +6392,32 @@ done
 
     ;;
 esac
+
 for ac_func in setlinebuf
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:6256: checking for $ac_func" 1>&5
+echo "configure:5825: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 6261 "configure"
+#line 5831 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -6285,7 +6433,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:6289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5859: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -6293,9 +6441,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:5868: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -6307,25 +6455,28 @@ done
 for ac_func in setpgid setpriority setsid settimeofday setvbuf sigaction
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:6312: checking for $ac_func" 1>&5
+echo "configure:5879: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 6317 "configure"
+#line 5885 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -6341,7 +6492,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:6345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5913: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -6349,9 +6500,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:5922: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -6363,25 +6514,28 @@ done
 for ac_func in sigvec sigset sigsuspend stime strchr sysconf sysctl
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:6368: checking for $ac_func" 1>&5
+echo "configure:5933: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 6373 "configure"
+#line 5939 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -6397,7 +6551,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:6401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5967: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -6405,9 +6559,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:5976: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -6419,25 +6573,28 @@ done
 for ac_func in snprintf strerror
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:6424: checking for $ac_func" 1>&5
+echo "configure:5987: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 6429 "configure"
+#line 5993 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -6453,7 +6610,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:6457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6021: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -6461,9 +6618,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:6030: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -6484,28 +6641,33 @@ case "$target" in
  *-*-openbsd*)
     # Just stubs.  Idiots.
     ;;
- *) for ac_func in timer_create timer_settime
+ *)
+
+for ac_func in timer_create timer_settime
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:6492: checking for $ac_func" 1>&5
+echo "configure:6054: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 6497 "configure"
+#line 6060 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -6521,7 +6683,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:6525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6088: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -6529,9 +6691,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:6097: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -6546,28 +6708,32 @@ case "$target" in
  *-pc-cygwin*)
     # I have no idea...
     ;;
- *) for ac_func in umask
+ *)
+for ac_func in umask
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:6554: checking for $ac_func" 1>&5
+echo "configure:6115: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 6559 "configure"
+#line 6121 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -6583,7 +6749,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:6587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6149: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -6591,9 +6757,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:6158: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -6604,28 +6770,32 @@ done
 
     ;;
 esac
+
 for ac_func in uname updwtmp updwtmpx vsprintf
 do
 ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
-echo $ECHO_N "checking for $ac_func... $ECHO_C" 1>&6
-echo "configure:6612: checking for $ac_func" 1>&5
+echo "configure:6171: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$ac_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 6617 "configure"
+#line 6177 "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 $ac_func();
 char (*f)();
 
 int
-main()
+main ()
 {
 
 /* The GNU C library defines this for functions which it implements
@@ -6641,7 +6811,7 @@ f = $ac_func;
   return 0;
 }
 EOF
-if { (eval echo configure:6645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6205: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   eval "$ac_ac_var=yes"
 else
   echo "configure: failed program was:" >&5
@@ -6649,9 +6819,9 @@ else
   eval "$ac_ac_var=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ECHO_T""`eval echo '${'$ac_ac_var'}'`" 1>&6
+echo "configure:6214: result: `eval echo '${'$ac_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
 if test `eval echo '${'$ac_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
@@ -6660,13 +6830,13 @@ EOF
 fi
 done
 
-echo $ECHO_N "checking number of arguments to gettimeofday()... $ECHO_C" 1>&6
-echo "configure:6665: checking number of arguments to gettimeofday()" 1>&5
+echo "configure:6222: checking number of arguments to gettimeofday()" >&5
+echo $ECHO_N "checking number of arguments to gettimeofday()... $ECHO_C" >&6
 if test "${ac_cv_func_Xettimeofday_nargs+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 6670 "configure"
+#line 6228 "configure"
 #include "confdefs.h"
 #include <sys/time.h>
 int
@@ -6680,7 +6850,7 @@ settimeofday((struct timeval*)0,(struct timezone*)0);
   return 0;
 }
 EOF
-if { (eval echo configure:6684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6240: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_func_Xettimeofday_nargs=2
 else
   echo "configure: failed program was:" >&5
@@ -6690,7 +6860,8 @@ fi
 rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_func_Xettimeofday_nargs" 1>&6
+echo "configure:6249: result: $ac_cv_func_Xettimeofday_nargs" >&5
+echo "${ECHO_T}$ac_cv_func_Xettimeofday_nargs" >&6
 if test $ac_cv_func_Xettimeofday_nargs = 1; then
 	cat >>confdefs.h <<\EOF
 #define SYSV_TIMEOFDAY 1
@@ -6698,13 +6869,13 @@ EOF
 
 fi
 
-echo $ECHO_N "checking number of arguments taken by setpgrp()... $ECHO_C" 1>&6
-echo "configure:6703: checking number of arguments taken by setpgrp()" 1>&5
+echo "configure:6256: checking number of arguments taken by setpgrp()" >&5
+echo $ECHO_N "checking number of arguments taken by setpgrp()... $ECHO_C" >&6
 if test "${ac_cv_func_setpgrp_nargs+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 6708 "configure"
+#line 6262 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYS_TYPES_H
@@ -6722,7 +6893,7 @@ setpgrp(0,0);
   return 0;
 }
 EOF
-if { (eval echo configure:6726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6278: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_func_setpgrp_nargs=2
 else
   echo "configure: failed program was:" >&5
@@ -6732,7 +6903,8 @@ fi
 rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_func_setpgrp_nargs" 1>&6
+echo "configure:6287: result: $ac_cv_func_setpgrp_nargs" >&5
+echo "${ECHO_T}$ac_cv_func_setpgrp_nargs" >&6
 if test $ac_cv_func_setpgrp_nargs = 0; then
         cat >>confdefs.h <<\EOF
 #define HAVE_SETPGRP_0 1
@@ -6743,13 +6915,13 @@ fi
 save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS -I$srcdir/include"
 
-echo $ECHO_N "checking argument pointer type of qsort()'s compare function and base... $ECHO_C" 1>&6
-echo "configure:6748: checking argument pointer type of qsort()'s compare function and base" 1>&5
+echo "configure:6296: checking argument pointer type of qsort()'s compare function and base" >&5
+echo $ECHO_N "checking argument pointer type of qsort()'s compare function and base... $ECHO_C" >&6
 if test "${ac_cv_func_qsort_argtype+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 6753 "configure"
+#line 6302 "configure"
 #include "confdefs.h"
 
 #include "l_stdlib.h"
@@ -6776,7 +6948,7 @@ qsort(base, 2, sizeof(char *), sortfunc);
   return 0;
 }
 EOF
-if { (eval echo configure:6780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6323: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_func_qsort_argtype=void
 else
   echo "configure: failed program was:" >&5
@@ -6786,7 +6958,8 @@ fi
 rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_func_qsort_argtype" 1>&6
+echo "configure:6332: result: $ac_cv_func_qsort_argtype" >&5
+echo "${ECHO_T}$ac_cv_func_qsort_argtype" >&6
 case "$ac_cv_func_qsort_argtype" in
  void)
     cat >>confdefs.h <<\EOF
@@ -6798,13 +6971,13 @@ esac
 
 CFLAGS=$save_CFLAGS
 
-echo $ECHO_N "checking if we need to declare 'errno'... $ECHO_C" 1>&6
-echo "configure:6803: checking if we need to declare 'errno'" 1>&5
+echo "configure:6342: checking if we need to declare 'errno'" >&5
+echo $ECHO_N "checking if we need to declare 'errno'... $ECHO_C" >&6
 if test "${ac_cv_decl_errno+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 6808 "configure"
+#line 6348 "configure"
 #include "confdefs.h"
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
@@ -6817,7 +6990,7 @@ errno = 0;
   return 0;
 }
 EOF
-if { (eval echo configure:6821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6361: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_decl_errno=no
 else
   echo "configure: failed program was:" >&5
@@ -6826,7 +6999,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_decl_errno" 1>&6
+echo "configure:6370: result: $ac_cv_decl_errno" >&5
+echo "${ECHO_T}$ac_cv_decl_errno" >&6
 case "$ac_cv_decl_errno" in
  yes) cat >>confdefs.h <<\EOF
 #define DECL_ERRNO 1
@@ -6834,13 +7008,13 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking if we may declare 'h_errno'... $ECHO_C" 1>&6
-echo "configure:6839: checking if we may declare 'h_errno'" 1>&5
+echo "configure:6378: checking if we may declare 'h_errno'" >&5
+echo $ECHO_N "checking if we may declare 'h_errno'... $ECHO_C" >&6
 if test "${ac_cv_decl_h_errno+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 6844 "configure"
+#line 6384 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_NETINET_IN_H
@@ -6863,7 +7037,7 @@ extern int h_errno;
   return 0;
 }
 EOF
-if { (eval echo configure:6867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6407: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_decl_h_errno=yes
 else
   echo "configure: failed program was:" >&5
@@ -6872,7 +7046,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_decl_h_errno" 1>&6
+echo "configure:6416: result: $ac_cv_decl_h_errno" >&5
+echo "${ECHO_T}$ac_cv_decl_h_errno" >&6
 case "$ac_cv_decl_h_errno" in
  yes) cat >>confdefs.h <<\EOF
 #define DECL_H_ERRNO 1
@@ -6880,13 +7055,13 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking if declaring 'char *sys_errlist[]' is ok... $ECHO_C" 1>&6
-echo "configure:6885: checking [if declaring 'char *sys_errlist[]' is ok]" 1>&5
+echo "configure:6424: checking if declaring 'char *sys_errlist[]' is ok" >&5
+echo $ECHO_N "checking if declaring 'char *sys_errlist[]' is ok... $ECHO_C" >&6
 if test "${ac_cv_decl_sys_errlist+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 6890 "configure"
+#line 6430 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #ifdef HAVE_ERRNO_H
@@ -6901,7 +7076,7 @@ extern char *sys_errlist[];
   return 0;
 }
 EOF
-if { (eval echo configure:6905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6444: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_decl_sys_errlist=yes
 else
   echo "configure: failed program was:" >&5
@@ -6910,7 +7085,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_decl_sys_errlist" 1>&6
+echo "configure:6453: result: $ac_cv_decl_sys_errlist" >&5
+echo "${ECHO_T}$ac_cv_decl_sys_errlist" >&6
 case "$ac_cv_decl_sys_errlist" in
  yes) cat >>confdefs.h <<\EOF
 #define CHAR_SYS_ERRLIST 1
@@ -6918,13 +7094,13 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking if declaring 'syscall()' is ok... $ECHO_C" 1>&6
-echo "configure:6923: checking if declaring 'syscall()' is ok" 1>&5
+echo "configure:6461: checking if declaring 'syscall()' is ok" >&5
+echo $ECHO_N "checking if declaring 'syscall()' is ok... $ECHO_C" >&6
 if test "${ac_cv_decl_syscall+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 6928 "configure"
+#line 6467 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYS_TYPES_H
@@ -6947,7 +7123,7 @@ extern int syscall P((int, ...));
   return 0;
 }
 EOF
-if { (eval echo configure:6951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6488: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_decl_syscall=yes
 else
   echo "configure: failed program was:" >&5
@@ -6956,7 +7132,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_decl_syscall" 1>&6
+echo "configure:6497: result: $ac_cv_decl_syscall" >&5
+echo "${ECHO_T}$ac_cv_decl_syscall" >&6
 case "$ac_cv_decl_syscall" in
  yes) cat >>confdefs.h <<\EOF
 #define DECL_SYSCALL 1
@@ -7230,19 +7407,20 @@ EOF
     ;;
 esac
 
-echo $ECHO_N "checking if we should use a streams device for ifconfig... $ECHO_C" 1>&6
-echo "configure:7235: checking if we should use a streams device for ifconfig" 1>&5
+echo "configure:6709: checking if we should use a streams device for ifconfig" >&5
+echo $ECHO_N "checking if we should use a streams device for ifconfig... $ECHO_C" >&6
 if test "${ac_cv_var_use_streams_device_for_ifconfig+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_var_use_streams_device_for_ifconfig=no
 fi
-echo "$ECHO_T""$ac_cv_var_use_streams_device_for_ifconfig" 1>&6
+echo "configure:6716: result: $ac_cv_var_use_streams_device_for_ifconfig" >&5
+echo "${ECHO_T}$ac_cv_var_use_streams_device_for_ifconfig" >&6
 
-echo $ECHO_N "checking if we need extra room for SO_RCVBUF... $ECHO_C" 1>&6
-echo "configure:7244: checking if we need extra room for SO_RCVBUF" 1>&5
+echo "configure:6718: checking if we need extra room for SO_RCVBUF" >&5
+echo $ECHO_N "checking if we need extra room for SO_RCVBUF... $ECHO_C" >&6
 if test "${ac_cv_var_rcvbuf_slop+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ans=no
 case "$target" in
@@ -7252,7 +7430,8 @@ case "$target" in
 esac
 ac_cv_var_rcvbuf_slop=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_rcvbuf_slop" 1>&6
+echo "configure:6731: result: $ac_cv_var_rcvbuf_slop" >&5
+echo "${ECHO_T}$ac_cv_var_rcvbuf_slop" >&6
 case "$ac_cv_var_rcvbuf_slop" in
  yes) cat >>confdefs.h <<\EOF
 #define NEED_RCVBUF_SLOP 1
@@ -7260,10 +7439,10 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking if we will open the broadcast socket... $ECHO_C" 1>&6
-echo "configure:7265: checking if we will open the broadcast socket" 1>&5
+echo "configure:6739: checking if we will open the broadcast socket" >&5
+echo $ECHO_N "checking if we will open the broadcast socket... $ECHO_C" >&6
 if test "${ac_cv_var_open_bcast_socket+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ans=yes
 case "$target" in
@@ -7276,7 +7455,8 @@ case "$target" in
 esac
 ac_cv_var_open_bcast_socket=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_open_bcast_socket" 1>&6
+echo "configure:6755: result: $ac_cv_var_open_bcast_socket" >&5
+echo "${ECHO_T}$ac_cv_var_open_bcast_socket" >&6
 case "$ac_cv_var_open_bcast_socket" in
  yes) cat >>confdefs.h <<\EOF
 #define OPEN_BCAST_SOCKET 1
@@ -7284,10 +7464,10 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking if we want the HPUX version of FindConfig()... $ECHO_C" 1>&6
-echo "configure:7289: checking if we want the HPUX version of FindConfig()" 1>&5
+echo "configure:6763: checking if we want the HPUX version of FindConfig()" >&5
+echo $ECHO_N "checking if we want the HPUX version of FindConfig()... $ECHO_C" >&6
 if test "${ac_cv_var_hpux_findconfig+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ans=no
 case "$target" in
@@ -7297,7 +7477,8 @@ case "$target" in
 esac
 ac_cv_var_hpux_findconfig=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_hpux_findconfig" 1>&6
+echo "configure:6776: result: $ac_cv_var_hpux_findconfig" >&5
+echo "${ECHO_T}$ac_cv_var_hpux_findconfig" >&6
 case "$ac_cv_var_hpux_findconfig" in
  yes) cat >>confdefs.h <<\EOF
 #define NEED_HPUX_FINDCONFIG 1
@@ -7305,10 +7486,10 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking if process groups are set with -pid... $ECHO_C" 1>&6
-echo "configure:7310: checking if process groups are set with -pid" 1>&5
+echo "configure:6784: checking if process groups are set with -pid" >&5
+echo $ECHO_N "checking if process groups are set with -pid... $ECHO_C" >&6
 if test "${ac_cv_arg_setpgrp_negpid+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case "$target" in
  *-*-hpux[567]*)
@@ -7332,7 +7513,8 @@ else
 esac
 ac_cv_arg_setpgrp_negpid=$ans
 fi
-echo "$ECHO_T""$ac_cv_arg_setpgrp_negpid" 1>&6
+echo "configure:6811: result: $ac_cv_arg_setpgrp_negpid" >&5
+echo "${ECHO_T}$ac_cv_arg_setpgrp_negpid" >&6
 case "$ac_cv_arg_setpgrp_negpid" in
  yes) cat >>confdefs.h <<\EOF
 #define UDP_BACKWARDS_SETOWN 1
@@ -7340,10 +7522,10 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking if we need a ctty for F_SETOWN... $ECHO_C" 1>&6
-echo "configure:7345: checking if we need a ctty for F_SETOWN" 1>&5
+echo "configure:6819: checking if we need a ctty for F_SETOWN" >&5
+echo $ECHO_N "checking if we need a ctty for F_SETOWN... $ECHO_C" >&6
 if test "${ac_cv_func_ctty_for_f_setown+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case "$target" in
  *-*-bsdi2*)
@@ -7366,7 +7548,8 @@ else
 esac
 ac_cv_func_ctty_for_f_setown=$ans
 fi
-echo "$ECHO_T""$ac_cv_func_ctty_for_f_setown" 1>&6
+echo "configure:6845: result: $ac_cv_func_ctty_for_f_setown" >&5
+echo "${ECHO_T}$ac_cv_func_ctty_for_f_setown" >&6
 case "$ac_cv_func_ctty_for_f_setown" in
  yes) cat >>confdefs.h <<\EOF
 #define USE_FSETOWNCTTY 1
@@ -7375,8 +7558,8 @@ EOF
 esac
 
 ntp_warning='GRONK'
-echo $ECHO_N "checking if we'll use clock_settime or settimeofday or stime... $ECHO_C" 1>&6
-echo "configure:7380: checking if we'll use clock_settime or settimeofday or stime" 1>&5
+echo "configure:6854: checking if we'll use clock_settime or settimeofday or stime" >&5
+echo $ECHO_N "checking if we'll use clock_settime or settimeofday or stime... $ECHO_C" >&6
 case "$ac_cv_func_clock_settime$ac_cv_func_settimeofday$ac_cv_func_stime" in
  yes*)
     ntp_warning=''
@@ -7397,17 +7580,18 @@ case "$ac_cv_func_clock_settime$ac_cv_func_settimeofday$ac_cv_func_stime" in
     ;;
 esac
 esac
-echo "$ECHO_T""$ans" 1>&6
+echo "configure:6876: result: $ans" >&5
+echo "${ECHO_T}$ans" >&6
 case "$ntp_warning" in
  '') ;;
- *) echo "configure: warning: *** $ntp_warning ***" 1>&2
+ *) echo "configure: warning: *** $ntp_warning ***" >&2
     ;;
 esac
 
-echo $ECHO_N "checking if we have a losing syscall()... $ECHO_C" 1>&6
-echo "configure:7409: checking if we have a losing syscall()" 1>&5
+echo "configure:6883: checking if we have a losing syscall()" >&5
+echo $ECHO_N "checking if we have a losing syscall()... $ECHO_C" >&6
 if test "${ac_cv_var_syscall_bug+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case "$target" in
  *-*-solaris2.4*)
@@ -7418,7 +7602,8 @@ else
 esac
 ac_cv_var_syscall_bug=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_syscall_bug" 1>&6
+echo "configure:6897: result: $ac_cv_var_syscall_bug" >&5
+echo "${ECHO_T}$ac_cv_var_syscall_bug" >&6
 case "$ac_cv_var_syscall_bug" in
  yes) cat >>confdefs.h <<\EOF
 #define SYSCALL_BUG 1
@@ -7426,10 +7611,10 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking for Streams/TLI... $ECHO_C" 1>&6
-echo "configure:7431: checking for Streams/TLI" 1>&5
+echo "configure:6905: checking for Streams/TLI" >&5
+echo $ECHO_N "checking for Streams/TLI... $ECHO_C" >&6
 if test "${ac_cv_var_streams_tli+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
    case "$ac_cv_header_sys_stropts_h" in
   yes)
@@ -7444,7 +7629,8 @@ else
  esac
  ac_cv_var_streams_tli=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_streams_tli" 1>&6
+echo "configure:6923: result: $ac_cv_var_streams_tli" >&5
+echo "${ECHO_T}$ac_cv_var_streams_tli" >&6
 case "$ac_cv_var_streams_tli" in
  yes)
     cat >>confdefs.h <<\EOF
@@ -7454,14 +7640,13 @@ EOF
     ;;
 esac
 
-echo $ECHO_N "checking for SIGIO... $ECHO_C" 1>&6
-echo "configure:7459: checking for SIGIO" 1>&5
+echo "configure:6932: checking for SIGIO" >&5
+echo $ECHO_N "checking for SIGIO... $ECHO_C" >&6
 if test "${ac_cv_hdr_def_sigio+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 7465 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 6938 "configure"
 #include "confdefs.h"
 #include <signal.h>
 #ifdef SIGIO
@@ -7478,12 +7663,13 @@ fi
 rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_hdr_def_sigio" 1>&6
+echo "configure:6953: result: $ac_cv_hdr_def_sigio" >&5
+echo "${ECHO_T}$ac_cv_hdr_def_sigio" >&6
 
-echo $ECHO_N "checking if we want to use signalled IO... $ECHO_C" 1>&6
-echo "configure:7485: checking if we want to use signalled IO" 1>&5
+echo "configure:6955: checking if we want to use signalled IO" >&5
+echo $ECHO_N "checking if we want to use signalled IO... $ECHO_C" >&6
 if test "${ac_cv_var_signalled_io+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ans=no
 case "$ac_cv_hdr_def_sigio" in
@@ -7522,7 +7708,8 @@ case "$ac_cv_hdr_def_sigio" in
 esac
 ac_cv_var_signalled_io=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_signalled_io" 1>&6
+echo "configure:6997: result: $ac_cv_var_signalled_io" >&5
+echo "${ECHO_T}$ac_cv_var_signalled_io" >&6
 case "$ac_cv_var_signalled_io" in
  yes) cat >>confdefs.h <<\EOF
 #define HAVE_SIGNALED_IO 1
@@ -7530,14 +7717,13 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking for SIGPOLL... $ECHO_C" 1>&6
-echo "configure:7535: checking for SIGPOLL" 1>&5
+echo "configure:7005: checking for SIGPOLL" >&5
+echo $ECHO_N "checking for SIGPOLL... $ECHO_C" >&6
 if test "${ac_cv_hdr_def_sigpoll+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 7541 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 7011 "configure"
 #include "confdefs.h"
 #include <signal.h>
 #ifdef SIGPOLL
@@ -7554,16 +7740,16 @@ fi
 rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_hdr_def_sigpoll" 1>&6
+echo "configure:7026: result: $ac_cv_hdr_def_sigpoll" >&5
+echo "${ECHO_T}$ac_cv_hdr_def_sigpoll" >&6
 
-echo $ECHO_N "checking for SIGSYS... $ECHO_C" 1>&6
-echo "configure:7561: checking for SIGSYS" 1>&5
+echo "configure:7028: checking for SIGSYS" >&5
+echo $ECHO_N "checking for SIGSYS... $ECHO_C" >&6
 if test "${ac_cv_hdr_def_sigsys+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 7567 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 7034 "configure"
 #include "confdefs.h"
 #include <signal.h>
 #ifdef SIGSYS
@@ -7580,12 +7766,13 @@ fi
 rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_hdr_def_sigsys" 1>&6
+echo "configure:7049: result: $ac_cv_hdr_def_sigsys" >&5
+echo "${ECHO_T}$ac_cv_hdr_def_sigsys" >&6
 
-echo $ECHO_N "checking if we can use SIGPOLL for UDP I/O... $ECHO_C" 1>&6
-echo "configure:7587: checking if we can use SIGPOLL for UDP I/O" 1>&5
+echo "configure:7051: checking if we can use SIGPOLL for UDP I/O" >&5
+echo $ECHO_N "checking if we can use SIGPOLL for UDP I/O... $ECHO_C" >&6
 if test "${ac_cv_var_use_udp_sigpoll+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ans=no
 case "$ac_cv_hdr_def_sigpoll" in
@@ -7628,7 +7815,8 @@ case "$ac_cv_hdr_def_sigpoll" in
 esac
 ac_cv_var_use_udp_sigpoll=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_use_udp_sigpoll" 1>&6
+echo "configure:7097: result: $ac_cv_var_use_udp_sigpoll" >&5
+echo "${ECHO_T}$ac_cv_var_use_udp_sigpoll" >&6
 case "$ac_cv_var_use_udp_sigpoll" in
  yes) cat >>confdefs.h <<\EOF
 #define USE_UDP_SIGPOLL 1
@@ -7636,10 +7824,10 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking if we can use SIGPOLL for TTY I/O... $ECHO_C" 1>&6
-echo "configure:7641: checking if we can use SIGPOLL for TTY I/O" 1>&5
+echo "configure:7105: checking if we can use SIGPOLL for TTY I/O" >&5
+echo $ECHO_N "checking if we can use SIGPOLL for TTY I/O... $ECHO_C" >&6
 if test "${ac_cv_var_use_tty_sigpoll+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ans=no
 case "$ac_cv_hdr_def_sigpoll" in
@@ -7682,7 +7870,8 @@ case "$ac_cv_hdr_def_sigpoll" in
 esac
 ac_cv_var_use_tty_sigpoll=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_use_tty_sigpoll" 1>&6
+echo "configure:7151: result: $ac_cv_var_use_tty_sigpoll" >&5
+echo "${ECHO_T}$ac_cv_var_use_tty_sigpoll" >&6
 case "$ac_cv_var_use_tty_sigpoll" in
  yes) cat >>confdefs.h <<\EOF
 #define USE_TTY_SIGPOLL 1
@@ -7692,14 +7881,13 @@ esac
 
 case "$ac_cv_header_sys_sio_h" in
  yes)
-    echo $ECHO_N "checking sys/sio.h for TIOCDCDTIMESTAMP... $ECHO_C" 1>&6
-echo "configure:7697: checking sys/sio.h for TIOCDCDTIMESTAMP" 1>&5
+    echo "configure:7161: checking sys/sio.h for TIOCDCDTIMESTAMP" >&5
+echo $ECHO_N "checking sys/sio.h for TIOCDCDTIMESTAMP... $ECHO_C" >&6
 if test "${ac_cv_hdr_def_tiocdcdtimestamp+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 7703 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 7167 "configure"
 #include "confdefs.h"
 #include <sys/sio.h>
 #ifdef TIOCDCDTIMESTAMP
@@ -7716,7 +7904,8 @@ fi
 rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_hdr_def_tiocdcdtimestamp" 1>&6
+echo "configure:7182: result: $ac_cv_hdr_def_tiocdcdtimestamp" >&5
+echo "${ECHO_T}$ac_cv_hdr_def_tiocdcdtimestamp" >&6
     ;;
 esac
 
@@ -7726,10 +7915,10 @@ case "$ac_cv_hdr_def_tiocdcdtimestamp" in
     ;;
 esac
 
-echo $ECHO_N "checking if nlist() values might require extra indirection... $ECHO_C" 1>&6
-echo "configure:7731: checking if nlist() values might require extra indirection" 1>&5
+echo "configure:7191: checking if nlist() values might require extra indirection" >&5
+echo $ECHO_N "checking if nlist() values might require extra indirection... $ECHO_C" >&6
 if test "${ac_cv_var_nlist_extra_indirection+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ans=no
 case "$target" in
@@ -7739,7 +7928,8 @@ case "$target" in
 esac
 ac_cv_var_nlist_extra_indirection=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_nlist_extra_indirection" 1>&6
+echo "configure:7204: result: $ac_cv_var_nlist_extra_indirection" >&5
+echo "${ECHO_T}$ac_cv_var_nlist_extra_indirection" >&6
 case "$ac_cv_var_nlist_extra_indirection" in
  yes) cat >>confdefs.h <<\EOF
 #define NLIST_EXTRA_INDIRECTION 1
@@ -7747,10 +7937,10 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking for a minimum recommended value of tickadj... $ECHO_C" 1>&6
-echo "configure:7752: checking for a minimum recommended value of tickadj" 1>&5
+echo "configure:7212: checking for a minimum recommended value of tickadj" >&5
+echo $ECHO_N "checking for a minimum recommended value of tickadj... $ECHO_C" >&6
 if test "${ac_cv_var_min_rec_tickadj+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ans=no
 case "$target" in
@@ -7760,7 +7950,8 @@ case "$target" in
 esac
 ac_cv_var_min_rec_tickadj=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_min_rec_tickadj" 1>&6
+echo "configure:7225: result: $ac_cv_var_min_rec_tickadj" >&5
+echo "${ECHO_T}$ac_cv_var_min_rec_tickadj" >&6
 case "$ac_cv_var_min_rec_tickadj" in
  ''|no) ;;
  *) cat >>confdefs.h <<EOF
@@ -7769,10 +7960,10 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking if the TTY code permits PARENB and IGNPAR... $ECHO_C" 1>&6
-echo "configure:7774: checking if the TTY code permits PARENB and IGNPAR" 1>&5
+echo "configure:7234: checking if the TTY code permits PARENB and IGNPAR" >&5
+echo $ECHO_N "checking if the TTY code permits PARENB and IGNPAR... $ECHO_C" >&6
 if test "${ac_cv_var_no_parenb_ignpar+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ans=no
 case "$target" in
@@ -7785,7 +7976,8 @@ case "$target" in
 esac
 ac_cv_var_no_parenb_ignpar=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_no_parenb_ignpar" 1>&6
+echo "configure:7250: result: $ac_cv_var_no_parenb_ignpar" >&5
+echo "${ECHO_T}$ac_cv_var_no_parenb_ignpar" >&6
 case "$ac_cv_var_no_parenb_ignpar" in
  yes) cat >>confdefs.h <<\EOF
 #define NO_PARENB_IGNPAR 1
@@ -7793,8 +7985,8 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking if we're including debugging code... $ECHO_C" 1>&6
-echo "configure:7798: checking if we're including debugging code" 1>&5
+echo "configure:7258: checking if we're including debugging code" >&5
+echo $ECHO_N "checking if we're including debugging code... $ECHO_C" >&6
 # Check whether --enable-debugging or --disable-debugging was given.
 if test "${enable_debugging+set}" = set; then
   enableval="$enable_debugging"
@@ -7808,10 +8000,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:7272: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking for a the number of minutes in a DST adjustment... $ECHO_C" 1>&6
-echo "configure:7815: checking for a the number of minutes in a DST adjustment" 1>&5
+echo "configure:7274: checking for a the number of minutes in a DST adjustment" >&5
+echo $ECHO_N "checking for a the number of minutes in a DST adjustment... $ECHO_C" >&6
 # Check whether --enable-dst_minutes or --disable-dst_minutes was given.
 if test "${enable_dst_minutes+set}" = set; then
   enableval="$enable_dst_minutes"
@@ -7823,18 +8016,20 @@ cat >>confdefs.h <<EOF
 #define DSTMINUTES $ans
 EOF
 
-echo "$ECHO_T""$ans" 1>&6
+echo "configure:7286: result: $ans" >&5
+echo "${ECHO_T}$ans" >&6
 
-echo $ECHO_N "checking if we have the tty_clk line discipline/streams module... $ECHO_C" 1>&6
-echo "configure:7830: checking if we have the tty_clk line discipline/streams module" 1>&5
+echo "configure:7288: checking if we have the tty_clk line discipline/streams module" >&5
+echo $ECHO_N "checking if we have the tty_clk line discipline/streams module... $ECHO_C" >&6
 if test "${ac_cv_var_tty_clk+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case "$ac_cv_header_sys_clkdefs_h$ac_cv_hdr_def_tiocdcdtimestamp" in
   *yes*) ac_cv_var_tty_clk=yes ;;
  esac
 fi
-echo "$ECHO_T""$ac_cv_var_tty_clk" 1>&6
+echo "configure:7297: result: $ac_cv_var_tty_clk" >&5
+echo "${ECHO_T}$ac_cv_var_tty_clk" >&6
 case "$ac_cv_var_tty_clk" in
  yes) cat >>confdefs.h <<\EOF
 #define TTYCLK 1
@@ -7842,14 +8037,15 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking for the ppsclock streams module... $ECHO_C" 1>&6
-echo "configure:7847: checking for the ppsclock streams module" 1>&5
+echo "configure:7305: checking for the ppsclock streams module" >&5
+echo $ECHO_N "checking for the ppsclock streams module... $ECHO_C" >&6
 if test "${ac_cv_var_ppsclock+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_var_ppsclock=$ac_cv_struct_ppsclockev
 fi
-echo "$ECHO_T""$ac_cv_var_ppsclock" 1>&6
+echo "configure:7312: result: $ac_cv_var_ppsclock" >&5
+echo "${ECHO_T}$ac_cv_var_ppsclock" >&6
 case "$ac_cv_var_ppsclock" in
  yes) cat >>confdefs.h <<\EOF
 #define PPS 1
@@ -7857,17 +8053,16 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking for kernel multicast support... $ECHO_C" 1>&6
-echo "configure:7862: checking for kernel multicast support" 1>&5
+echo "configure:7320: checking for kernel multicast support" >&5
+echo $ECHO_N "checking for kernel multicast support... $ECHO_C" >&6
 if test "${ac_cv_var_mcast+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_var_mcast=no
   case "$target" in
    i386-sequent-sysv4) ;;
-   *)
-cat >conftest.$ac_ext <<EOF
-#line 7871 "configure"
+   *) cat >conftest.$ac_ext <<EOF
+#line 7329 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 #ifdef IP_ADD_MEMBERSHIP
@@ -7883,7 +8078,8 @@ rm -f conftest*
  ;;
   esac
 fi
-echo "$ECHO_T""$ac_cv_var_mcast" 1>&6
+echo "configure:7344: result: $ac_cv_var_mcast" >&5
+echo "${ECHO_T}$ac_cv_var_mcast" >&6
 case "$ac_cv_var_mcast" in
  yes) cat >>confdefs.h <<\EOF
 #define MCAST 1
@@ -7891,10 +8087,10 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking availability of ntp_{adj,get}time()... $ECHO_C" 1>&6
-echo "configure:7896: checking [availability of ntp_{adj,get}time()]" 1>&5
+echo "configure:7352: checking availability of ntp_{adj,get}time()" >&5
+echo $ECHO_N "checking availability of ntp_{adj,get}time()... $ECHO_C" >&6
 if test "${ac_cv_var_ntp_syscalls+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_var_ntp_syscalls=no
  case "$ac_cv_func___adjtimex" in
@@ -7905,9 +8101,8 @@ else
       yesyes)
         ac_cv_var_ntp_syscalls=libc
         ;;
-      *)
-cat >conftest.$ac_ext <<EOF
-#line 7911 "configure"
+      *) cat >conftest.$ac_ext <<EOF
+#line 7367 "configure"
 #include "confdefs.h"
 #include <sys/syscall.h>
 #if defined(SYS_ntp_gettime) && defined(SYS_ntp_adjtime)
@@ -7926,7 +8121,8 @@ rm -f conftest*
      ;;
  esac
 fi
-echo "$ECHO_T""$ac_cv_var_ntp_syscalls" 1>&6
+echo "configure:7384: result: $ac_cv_var_ntp_syscalls" >&5
+echo "${ECHO_T}$ac_cv_var_ntp_syscalls" >&6
 case "$ac_cv_var_ntp_syscalls" in
  libc)
     cat >>confdefs.h <<\EOF
@@ -7944,14 +8140,13 @@ EOF
     ;;
 esac
 
-echo $ECHO_N "checking if sys/timex.h has STA_FLL... $ECHO_C" 1>&6
-echo "configure:7949: checking if sys/timex.h has STA_FLL" 1>&5
+echo "configure:7400: checking if sys/timex.h has STA_FLL" >&5
+echo $ECHO_N "checking if sys/timex.h has STA_FLL... $ECHO_C" >&6
 if test "${ac_cv_var_sta_fll+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 7955 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 7406 "configure"
 #include "confdefs.h"
 #include <sys/timex.h>
 #ifdef STA_FLL
@@ -7968,12 +8163,13 @@ fi
 rm -f conftest*
 
 fi
-echo "$ECHO_T""$ac_cv_var_sta_fll" 1>&6
+echo "configure:7421: result: $ac_cv_var_sta_fll" >&5
+echo "${ECHO_T}$ac_cv_var_sta_fll" >&6
 
-echo $ECHO_N "checking if we have kernel PLL support... $ECHO_C" 1>&6
-echo "configure:7975: checking if we have kernel PLL support" 1>&5
+echo "configure:7423: checking if we have kernel PLL support" >&5
+echo $ECHO_N "checking if we have kernel PLL support... $ECHO_C" >&6
 if test "${ac_cv_var_kernel_pll+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case "$ac_cv_header_sys_timex_h$ac_cv_struct_ntptimeval$ac_cv_var_sta_fll$ac_cv_var_ntp_syscalls" in
  *no*)
@@ -7983,7 +8179,8 @@ else
     ;;
 esac
 fi
-echo "$ECHO_T""$ac_cv_var_kernel_pll" 1>&6
+echo "configure:7436: result: $ac_cv_var_kernel_pll" >&5
+echo "${ECHO_T}$ac_cv_var_kernel_pll" >&6
 case "$ac_cv_var_kernel_pll" in
  yes)
     cat >>confdefs.h <<\EOF
@@ -7993,10 +8190,10 @@ EOF
     ;;
 esac
 
-echo $ECHO_N "checking if SIOCGIFCONF returns buffer size in the buffer... $ECHO_C" 1>&6
-echo "configure:7998: checking if SIOCGIFCONF returns buffer size in the buffer" 1>&5
+echo "configure:7445: checking if SIOCGIFCONF returns buffer size in the buffer" >&5
+echo $ECHO_N "checking if SIOCGIFCONF returns buffer size in the buffer... $ECHO_C" >&6
 if test "${ac_cv_var_size_returned_in_buffer+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ans=no
   case "$target" in
@@ -8012,7 +8209,8 @@ else
   esac
   ac_cv_var_size_returned_in_buffer=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_size_returned_in_buffer" 1>&6
+echo "configure:7464: result: $ac_cv_var_size_returned_in_buffer" >&5
+echo "${ECHO_T}$ac_cv_var_size_returned_in_buffer" >&6
 case "$ac_cv_var_size_returned_in_buffer" in
  yes) cat >>confdefs.h <<\EOF
 #define SIZE_RETURNED_IN_BUFFER 1
@@ -8021,18 +8219,17 @@ EOF
 esac
 
 # Check for ioctls TIOCGPPSEV
-echo $ECHO_N "checking ioctl TIOCGPPSEV... $ECHO_C" 1>&6
-echo "configure:8026: checking ioctl TIOCGPPSEV" 1>&5
+echo "configure:7473: checking ioctl TIOCGPPSEV" >&5
+echo $ECHO_N "checking ioctl TIOCGPPSEV... $ECHO_C" >&6
 if test "$ac_cv_header_termios_h" = "yes"; then
-
-cat >conftest.$ac_ext <<EOF
-#line 8030 "configure"
+    cat >conftest.$ac_ext <<EOF
+#line 7477 "configure"
 #include "confdefs.h"
 #include <termios.h>
 #ifdef TIOCGPPSEV
          yes
 #endif
-
+	
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
@@ -8052,21 +8249,21 @@ EOF
 
     ac_cv_var_oncore_ok=yes
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:7501: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
 # Check for ioctls TIOCSPPS
-echo $ECHO_N "checking ioctl TIOCSPPS... $ECHO_C" 1>&6
-echo "configure:8060: checking ioctl TIOCSPPS" 1>&5
+echo "configure:7504: checking ioctl TIOCSPPS" >&5
+echo $ECHO_N "checking ioctl TIOCSPPS... $ECHO_C" >&6
 if test "$ac_cv_header_termios_h" = "yes"; then
-
-cat >conftest.$ac_ext <<EOF
-#line 8064 "configure"
+    cat >conftest.$ac_ext <<EOF
+#line 7508 "configure"
 #include "confdefs.h"
 #include <termios.h>
 #ifdef TIOCSPPS
          yes
 #endif
-
+	
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
@@ -8086,21 +8283,21 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:7531: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
 # Check for ioctls CIOGETEV
-echo $ECHO_N "checking ioctl CIOGETEV... $ECHO_C" 1>&6
-echo "configure:8094: checking ioctl CIOGETEV" 1>&5
+echo "configure:7534: checking ioctl CIOGETEV" >&5
+echo $ECHO_N "checking ioctl CIOGETEV... $ECHO_C" >&6
 if test "$ac_cv_header_sys_ppsclock_h" = "yes"; then
-
-cat >conftest.$ac_ext <<EOF
-#line 8098 "configure"
+    cat >conftest.$ac_ext <<EOF
+#line 7538 "configure"
 #include "confdefs.h"
 #include <sys/ppsclock.h>
 #ifdef CIOGETEV
          yes
 #endif
-
+	
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
@@ -8120,7 +8317,8 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:7562: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
 # Check for header timepps.h, if found then we have PPS API (Draft RFC) stuff.
 # there is NO way that I can tell to tell if a given OS is using timespec or
@@ -8141,20 +8339,19 @@ EOF
 esac
 
 # Check for ioctls TIOCGSERIAL, TIOCSSERIAL, ASYNC_PPS_CD_POS, ASYNC_PPS_CD_NEG
-echo $ECHO_N "checking for linux/serial.h... $ECHO_C" 1>&6
-echo "configure:8146: checking for linux/serial.h" 1>&5
+echo "configure:7579: checking for linux/serial.h" >&5
+echo $ECHO_N "checking for linux/serial.h... $ECHO_C" >&6
 if test "${ac_cv_header_linux_serial_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 8152 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 7585 "configure"
 #include "confdefs.h"
 #include <linux/serial.h>
 
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7590: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   ac_cv_header_linux_serial_h=yes
@@ -8166,15 +8363,15 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_header_linux_serial_h" 1>&6
+echo "configure:7602: result: $ac_cv_header_linux_serial_h" >&5
+echo "${ECHO_T}$ac_cv_header_linux_serial_h" >&6
 
-echo $ECHO_N "checking ioctl TIOCGSERIAL... $ECHO_C" 1>&6
-echo "configure:8173: checking ioctl TIOCGSERIAL" 1>&5
+echo "configure:7604: checking ioctl TIOCGSERIAL" >&5
+echo $ECHO_N "checking ioctl TIOCGSERIAL... $ECHO_C" >&6
 case "$ac_cv_header_sys_ppsclock_h$ac_cv_header_linux_serial_h" in
   yesyes)
-
-cat >conftest.$ac_ext <<EOF
-#line 8178 "configure"
+    cat >conftest.$ac_ext <<EOF
+#line 7609 "configure"
 #include "confdefs.h"
 #include <sys/time.h>
 typedef int u_int;
@@ -8193,7 +8390,7 @@ typedef int u_int;
 #endif
 #endif
 #endif
-
+	
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
@@ -8212,11 +8409,12 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:7643: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
 # Check for SHMEM_STATUS support
-echo $ECHO_N "checking SHMEM_STATUS support... $ECHO_C" 1>&6
-echo "configure:8220: checking SHMEM_STATUS support" 1>&5
+echo "configure:7646: checking SHMEM_STATUS support" >&5
+echo $ECHO_N "checking SHMEM_STATUS support... $ECHO_C" >&6
 case "$ac_cv_header_sys_mman_h" in
  yes) ntp_ok=yes ;;
  *)   ntp_ok=no  ;;
@@ -8227,13 +8425,14 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:7657: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
 ntp_refclock=no
 
 # HPUX only, and by explicit request
-echo $ECHO_N "checking Datum/Bancomm bc635/VME interface... $ECHO_C" 1>&6
-echo "configure:8237: checking Datum/Bancomm bc635/VME interface" 1>&5
+echo "configure:7661: checking Datum/Bancomm bc635/VME interface" >&5
+echo $ECHO_N "checking Datum/Bancomm bc635/VME interface... $ECHO_C" >&6
 # Check whether --enable-BANCOMM or --disable-BANCOMM was given.
 if test "${enable_BANCOMM+set}" = set; then
   enableval="$enable_BANCOMM"
@@ -8248,15 +8447,16 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:7676: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$target" in
  yes*-*-hpux*) ;;
- yes*) echo "configure: warning: *** But the expected answer is... no ***" 1>&2 ;;
+ yes*) echo "configure: warning: *** But the expected answer is... no ***" >&2 ;;
 esac
 
 #HPUX only, and only by explicit request
-echo $ECHO_N "checking TrueTime GPS receiver/VME interface... $ECHO_C" 1>&6
-echo "configure:8260: checking TrueTime GPS receiver/VME interface" 1>&5
+echo "configure:7683: checking TrueTime GPS receiver/VME interface" >&5
+echo $ECHO_N "checking TrueTime GPS receiver/VME interface... $ECHO_C" >&6
 # Check whether --enable-GPSVME or --disable-GPSVME was given.
 if test "${enable_GPSVME+set}" = set; then
   enableval="$enable_GPSVME"
@@ -8271,14 +8471,15 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:7698: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$target" in
  yes*-*-hpux*) ;;
- yes*) echo "configure: warning: *** But the expected answer is... no ***" 1>&2 ;;
+ yes*) echo "configure: warning: *** But the expected answer is... no ***" >&2 ;;
 esac
 
-echo $ECHO_N "checking for PCL720 clock support... $ECHO_C" 1>&6
-echo "configure:8282: checking for PCL720 clock support" 1>&5
+echo "configure:7704: checking for PCL720 clock support" >&5
+echo $ECHO_N "checking for PCL720 clock support... $ECHO_C" >&6
 case "$ac_cv_header_machine_inline_h$ac_cv_header_sys_pcl720_h$ac_cv_header_sys_i8253_h" in
  yesyesyes)
     cat >>confdefs.h <<\EOF
@@ -8291,10 +8492,11 @@ EOF
     ans=no
     ;;
 esac
-echo "$ECHO_T""$ans" 1>&6
+echo "configure:7717: result: $ans" >&5
+echo "${ECHO_T}$ans" >&6
 
-echo $ECHO_N "checking for SHM clock attached thru shared memory... $ECHO_C" 1>&6
-echo "configure:8298: checking for SHM clock attached thru shared memory" 1>&5
+echo "configure:7719: checking for SHM clock attached thru shared memory" >&5
+echo $ECHO_N "checking for SHM clock attached thru shared memory... $ECHO_C" >&6
 # Check whether --enable-SHM or --disable-SHM was given.
 if test "${enable_SHM+set}" = set; then
   enableval="$enable_SHM"
@@ -8309,10 +8511,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:7734: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking for default inclusion of all suitable non-PARSE clocks... $ECHO_C" 1>&6
-echo "configure:8316: checking for default inclusion of all suitable non-PARSE clocks" 1>&5
+echo "configure:7736: checking for default inclusion of all suitable non-PARSE clocks" >&5
+echo $ECHO_N "checking for default inclusion of all suitable non-PARSE clocks... $ECHO_C" >&6
 # Check whether --enable-all-clocks or --disable-all-clocks was given.
 if test "${enable_all_clocks+set}" = set; then
   enableval="$enable_all_clocks"
@@ -8320,10 +8523,11 @@ if test "${enable_all_clocks+set}" = set; then
 else
   ntp_eac=yes
 fi
-echo "$ECHO_T""$ntp_eac" 1>&6
+echo "configure:7745: result: $ntp_eac" >&5
+echo "${ECHO_T}$ntp_eac" >&6
 
-echo $ECHO_N "checking if we have support for PARSE clocks... $ECHO_C" 1>&6
-echo "configure:8327: checking if we have support for PARSE clocks" 1>&5
+echo "configure:7747: checking if we have support for PARSE clocks" >&5
+echo $ECHO_N "checking if we have support for PARSE clocks... $ECHO_C" >&6
 case "$ac_cv_header_termio_h$ac_cv_header_termios_h" in
  *yes*)
     ntp_canparse=yes
@@ -8331,23 +8535,25 @@ case "$ac_cv_header_termio_h$ac_cv_header_termios_h" in
  *) ntp_canparse=no
     ;;
 esac
-echo "$ECHO_T""$ntp_canparse" 1>&6
+echo "configure:7756: result: $ntp_canparse" >&5
+echo "${ECHO_T}$ntp_canparse" >&6
 
-echo $ECHO_N "checking if we have support for audio clocks... $ECHO_C" 1>&6
-echo "configure:8338: checking if we have support for audio clocks" 1>&5
+echo "configure:7758: checking if we have support for audio clocks" >&5
+echo $ECHO_N "checking if we have support for audio clocks... $ECHO_C" >&6
 case "$ac_cv_header_sun_audioio_h$ac_cv_header_sys_audioio_h" in
  *yes*)	ntp_canaudio=yes ;;
  *)	ntp_canaudio=no  ;;
 esac
-echo "$ECHO_T""$ntp_canaudio" 1>&6
+echo "configure:7764: result: $ntp_canaudio" >&5
+echo "${ECHO_T}$ntp_canaudio" >&6
 
-echo $ECHO_N "checking for struct audio_info.monitor_gain... $ECHO_C" 1>&6
-echo "configure:8346: checking for struct audio_info.monitor_gain" 1>&5
+echo "configure:7766: checking for struct audio_info.monitor_gain" >&5
+echo $ECHO_N "checking for struct audio_info.monitor_gain... $ECHO_C" >&6
 if test "${ac_cv_member_struct_audio_info_monitor_gain+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 8351 "configure"
+#line 7772 "configure"
 #include "confdefs.h"
 #ifdef HAVE_SUN_AUDIO_H
 #include <sun/audio.h>
@@ -8365,7 +8571,7 @@ foo.monitor_gain;
   return 0;
 }
 EOF
-if { (eval echo configure:8369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7789: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_member_struct_audio_info_monitor_gain=yes
 else
   echo "configure: failed program was:" >&5
@@ -8374,21 +8580,22 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_member_struct_audio_info_monitor_gain" 1>&6
+echo "configure:7798: result: $ac_cv_member_struct_audio_info_monitor_gain" >&5
+echo "${ECHO_T}$ac_cv_member_struct_audio_info_monitor_gain" >&6
 if test $ac_cv_member_struct_audio_info_monitor_gain = yes; then
-  cat >>confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define HAVE_STRUCT_AUDIO_INFO_MONITOR_GAIN 1
 EOF
 
 fi
-
-echo $ECHO_N "checking for struct audio_info.output_muted... $ECHO_C" 1>&6
-echo "configure:8387: checking for struct audio_info.output_muted" 1>&5
+echo "configure:7805: checking for struct audio_info.output_muted" >&5
+echo $ECHO_N "checking for struct audio_info.output_muted... $ECHO_C" >&6
 if test "${ac_cv_member_struct_audio_info_output_muted+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 8392 "configure"
+#line 7811 "configure"
 #include "confdefs.h"
 #ifdef HAVE_SUN_AUDIO_H
 #include <sun/audio.h>
@@ -8406,7 +8613,7 @@ foo.output_muted;
   return 0;
 }
 EOF
-if { (eval echo configure:8410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7828: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_member_struct_audio_info_output_muted=yes
 else
   echo "configure: failed program was:" >&5
@@ -8415,21 +8622,22 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_member_struct_audio_info_output_muted" 1>&6
+echo "configure:7837: result: $ac_cv_member_struct_audio_info_output_muted" >&5
+echo "${ECHO_T}$ac_cv_member_struct_audio_info_output_muted" >&6
 if test $ac_cv_member_struct_audio_info_output_muted = yes; then
-  cat >>confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define HAVE_STRUCT_AUDIO_INFO_OUTPUT_MUTED 1
 EOF
 
 fi
-
-echo $ECHO_N "checking for struct audio_info.blocksize... $ECHO_C" 1>&6
-echo "configure:8428: checking for struct audio_info.blocksize" 1>&5
+echo "configure:7844: checking for struct audio_info.blocksize" >&5
+echo $ECHO_N "checking for struct audio_info.blocksize... $ECHO_C" >&6
 if test "${ac_cv_member_struct_audio_info_blocksize+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 8433 "configure"
+#line 7850 "configure"
 #include "confdefs.h"
 #ifdef HAVE_SUN_AUDIO_H
 #include <sun/audio.h>
@@ -8447,7 +8655,7 @@ foo.blocksize;
   return 0;
 }
 EOF
-if { (eval echo configure:8451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7867: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_member_struct_audio_info_blocksize=yes
 else
   echo "configure: failed program was:" >&5
@@ -8456,21 +8664,22 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_member_struct_audio_info_blocksize" 1>&6
+echo "configure:7876: result: $ac_cv_member_struct_audio_info_blocksize" >&5
+echo "${ECHO_T}$ac_cv_member_struct_audio_info_blocksize" >&6
 if test $ac_cv_member_struct_audio_info_blocksize = yes; then
-  cat >>confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define HAVE_STRUCT_AUDIO_INFO_BLOCKSIZE 1
 EOF
 
 fi
-
-echo $ECHO_N "checking for struct audio_info.hiwat... $ECHO_C" 1>&6
-echo "configure:8469: checking for struct audio_info.hiwat" 1>&5
+echo "configure:7883: checking for struct audio_info.hiwat" >&5
+echo $ECHO_N "checking for struct audio_info.hiwat... $ECHO_C" >&6
 if test "${ac_cv_member_struct_audio_info_hiwat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 8474 "configure"
+#line 7889 "configure"
 #include "confdefs.h"
 #ifdef HAVE_SUN_AUDIO_H
 #include <sun/audio.h>
@@ -8488,7 +8697,7 @@ foo.hiwat;
   return 0;
 }
 EOF
-if { (eval echo configure:8492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7906: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_member_struct_audio_info_hiwat=yes
 else
   echo "configure: failed program was:" >&5
@@ -8497,21 +8706,22 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_member_struct_audio_info_hiwat" 1>&6
+echo "configure:7915: result: $ac_cv_member_struct_audio_info_hiwat" >&5
+echo "${ECHO_T}$ac_cv_member_struct_audio_info_hiwat" >&6
 if test $ac_cv_member_struct_audio_info_hiwat = yes; then
-  cat >>confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define HAVE_STRUCT_AUDIO_INFO_HIWAT 1
 EOF
 
 fi
-
-echo $ECHO_N "checking for struct audio_info.lowat... $ECHO_C" 1>&6
-echo "configure:8510: checking for struct audio_info.lowat" 1>&5
+echo "configure:7922: checking for struct audio_info.lowat" >&5
+echo $ECHO_N "checking for struct audio_info.lowat... $ECHO_C" >&6
 if test "${ac_cv_member_struct_audio_info_lowat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 8515 "configure"
+#line 7928 "configure"
 #include "confdefs.h"
 #ifdef HAVE_SUN_AUDIO_H
 #include <sun/audio.h>
@@ -8529,7 +8739,7 @@ foo.lowat;
   return 0;
 }
 EOF
-if { (eval echo configure:8533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7945: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_member_struct_audio_info_lowat=yes
 else
   echo "configure: failed program was:" >&5
@@ -8538,21 +8748,22 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_member_struct_audio_info_lowat" 1>&6
+echo "configure:7954: result: $ac_cv_member_struct_audio_info_lowat" >&5
+echo "${ECHO_T}$ac_cv_member_struct_audio_info_lowat" >&6
 if test $ac_cv_member_struct_audio_info_lowat = yes; then
-  cat >>confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define HAVE_STRUCT_AUDIO_INFO_LOWAT 1
 EOF
 
 fi
-
-echo $ECHO_N "checking for struct audio_info.mode... $ECHO_C" 1>&6
-echo "configure:8551: checking for struct audio_info.mode" 1>&5
+echo "configure:7961: checking for struct audio_info.mode" >&5
+echo $ECHO_N "checking for struct audio_info.mode... $ECHO_C" >&6
 if test "${ac_cv_member_struct_audio_info_mode+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<EOF
-#line 8556 "configure"
+#line 7967 "configure"
 #include "confdefs.h"
 #ifdef HAVE_SUN_AUDIO_H
 #include <sun/audio.h>
@@ -8570,7 +8781,7 @@ foo.mode;
   return 0;
 }
 EOF
-if { (eval echo configure:8574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7984: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
   ac_cv_member_struct_audio_info_mode=yes
 else
   echo "configure: failed program was:" >&5
@@ -8579,25 +8790,26 @@ else
 fi
 rm -f conftest*
 fi
-echo "$ECHO_T""$ac_cv_member_struct_audio_info_mode" 1>&6
+echo "configure:7993: result: $ac_cv_member_struct_audio_info_mode" >&5
+echo "${ECHO_T}$ac_cv_member_struct_audio_info_mode" >&6
 if test $ac_cv_member_struct_audio_info_mode = yes; then
-  cat >>confdefs.h <<EOF
+
+cat >>confdefs.h <<EOF
 #define HAVE_STRUCT_AUDIO_INFO_MODE 1
 EOF
 
 fi
 
 # Requires modem control
-echo $ECHO_N "checking ACTS modem service... $ECHO_C" 1>&6
-echo "configure:8593: checking ACTS modem service" 1>&5
+echo "configure:8001: checking ACTS modem service" >&5
+echo $ECHO_N "checking ACTS modem service... $ECHO_C" >&6
 # Check whether --enable-ACTS or --disable-ACTS was given.
 if test "${enable_ACTS+set}" = set; then
   enableval="$enable_ACTS"
   ntp_ok=$enableval
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 8601 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 8009 "configure"
 #include "confdefs.h"
 #include <termios.h>
 #ifdef HAVE_SYS_IOCTL_H
@@ -8624,10 +8836,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8033: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking Arbiter 1088A/B GPS receiver... $ECHO_C" 1>&6
-echo "configure:8631: checking Arbiter 1088A/B GPS receiver" 1>&5
+echo "configure:8035: checking Arbiter 1088A/B GPS receiver" >&5
+echo $ECHO_N "checking Arbiter 1088A/B GPS receiver... $ECHO_C" >&6
 # Check whether --enable-ARBITER or --disable-ARBITER was given.
 if test "${enable_ARBITER+set}" = set; then
   enableval="$enable_ARBITER"
@@ -8642,10 +8855,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8050: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking Arcron MSF receiver... $ECHO_C" 1>&6
-echo "configure:8649: checking Arcron MSF receiver" 1>&5
+echo "configure:8052: checking Arcron MSF receiver" >&5
+echo $ECHO_N "checking Arcron MSF receiver... $ECHO_C" >&6
 # Check whether --enable-ARCRON_MSF or --disable-ARCRON_MSF was given.
 if test "${enable_ARCRON_MSF+set}" = set; then
   enableval="$enable_ARCRON_MSF"
@@ -8660,10 +8874,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8067: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking Austron 2200A/2201A GPS receiver... $ECHO_C" 1>&6
-echo "configure:8667: checking Austron 2200A/2201A GPS receiver" 1>&5
+echo "configure:8069: checking Austron 2200A/2201A GPS receiver" >&5
+echo $ECHO_N "checking Austron 2200A/2201A GPS receiver... $ECHO_C" >&6
 # Check whether --enable-AS2201 or --disable-AS2201 was given.
 if test "${enable_AS2201+set}" = set; then
   enableval="$enable_AS2201"
@@ -8678,10 +8893,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8084: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking PPS interface... $ECHO_C" 1>&6
-echo "configure:8685: checking PPS interface" 1>&5
+echo "configure:8086: checking PPS interface" >&5
+echo $ECHO_N "checking PPS interface... $ECHO_C" >&6
 # Check whether --enable-ATOM or --disable-ATOM was given.
 if test "${enable_ATOM+set}" = set; then
   enableval="$enable_ATOM"
@@ -8696,10 +8912,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8101: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking CHU modem/decoder... $ECHO_C" 1>&6
-echo "configure:8703: checking CHU modem/decoder" 1>&5
+echo "configure:8103: checking CHU modem/decoder" >&5
+echo $ECHO_N "checking CHU modem/decoder... $ECHO_C" >&6
 # Check whether --enable-CHU or --disable-CHU was given.
 if test "${enable_CHU+set}" = set; then
   enableval="$enable_CHU"
@@ -8714,11 +8931,12 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8118: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 ac_refclock_chu=$ntp_ok
 
-echo $ECHO_N "checking CHU audio/decoder... $ECHO_C" 1>&6
-echo "configure:8722: checking CHU audio/decoder" 1>&5
+echo "configure:8121: checking CHU audio/decoder" >&5
+echo $ECHO_N "checking CHU audio/decoder... $ECHO_C" >&6
 # Check whether --enable-AUDIO-CHU or --disable-AUDIO-CHU was given.
 if test "${enable_AUDIO_CHU+set}" = set; then
   enableval="$enable_AUDIO_CHU"
@@ -8735,15 +8953,16 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8138: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 # We used to check for sunos/solaris target...
 case "$ntp_ok$ac_refclock_chu$ntp_canaudio" in
- yes*no*) echo "configure: warning: *** But the expected answer is...no ***" 1>&2 ;;
+ yes*no*) echo "configure: warning: *** But the expected answer is...no ***" >&2 ;;
 esac
 
 # Not under HP-UX
-echo $ECHO_N "checking Datum Programmable Time System... $ECHO_C" 1>&6
-echo "configure:8747: checking Datum Programmable Time System" 1>&5
+echo "configure:8145: checking Datum Programmable Time System" >&5
+echo $ECHO_N "checking Datum Programmable Time System... $ECHO_C" >&6
 # Check whether --enable-DATUM or --disable-DATUM was given.
 if test "${enable_DATUM+set}" = set; then
   enableval="$enable_DATUM"
@@ -8764,10 +8983,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8166: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking Forum Graphic GPS... $ECHO_C" 1>&6
-echo "configure:8771: checking Forum Graphic GPS" 1>&5
+echo "configure:8168: checking Forum Graphic GPS" >&5
+echo $ECHO_N "checking Forum Graphic GPS... $ECHO_C" >&6
 # Check whether --enable-FG or --disable-FG was given.
 if test "${enable_FG+set}" = set; then
   enableval="$enable_FG"
@@ -8782,19 +9002,19 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8183: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
 # Requires modem control
-echo $ECHO_N "checking Heath GC-1000 WWV/WWVH receiver... $ECHO_C" 1>&6
-echo "configure:8790: checking Heath GC-1000 WWV/WWVH receiver" 1>&5
+echo "configure:8186: checking Heath GC-1000 WWV/WWVH receiver" >&5
+echo $ECHO_N "checking Heath GC-1000 WWV/WWVH receiver... $ECHO_C" >&6
 # Check whether --enable-HEATH or --disable-HEATH was given.
 if test "${enable_HEATH+set}" = set; then
   enableval="$enable_HEATH"
   ntp_ok=$enableval
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 8798 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 8194 "configure"
 #include "confdefs.h"
 #include <termios.h>
 #ifdef HAVE_SYS_IOCTL_H
@@ -8821,10 +9041,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8218: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking HP 58503A GPS receiver... $ECHO_C" 1>&6
-echo "configure:8828: checking HP 58503A GPS receiver" 1>&5
+echo "configure:8220: checking HP 58503A GPS receiver" >&5
+echo $ECHO_N "checking HP 58503A GPS receiver... $ECHO_C" >&6
 # Check whether --enable-HPGPS or --disable-HPGPS was given.
 if test "${enable_HPGPS+set}" = set; then
   enableval="$enable_HPGPS"
@@ -8839,10 +9060,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8235: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking Sun IRIG audio decoder... $ECHO_C" 1>&6
-echo "configure:8846: checking Sun IRIG audio decoder" 1>&5
+echo "configure:8237: checking Sun IRIG audio decoder" >&5
+echo $ECHO_N "checking Sun IRIG audio decoder... $ECHO_C" >&6
 # Check whether --enable-IRIG or --disable-IRIG was given.
 if test "${enable_IRIG+set}" = set; then
   enableval="$enable_IRIG"
@@ -8860,13 +9082,14 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8255: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canaudio" in
- yesno) echo "configure: warning: *** But the expected answer is... no ***" 1>&2 ;;
+ yesno) echo "configure: warning: *** But the expected answer is... no ***" >&2 ;;
 esac
 
-echo $ECHO_N "checking Leitch CSD 5300 Master Clock System Driver... $ECHO_C" 1>&6
-echo "configure:8870: checking Leitch CSD 5300 Master Clock System Driver" 1>&5
+echo "configure:8260: checking Leitch CSD 5300 Master Clock System Driver" >&5
+echo $ECHO_N "checking Leitch CSD 5300 Master Clock System Driver... $ECHO_C" >&6
 # Check whether --enable-LEITCH or --disable-LEITCH was given.
 if test "${enable_LEITCH+set}" = set; then
   enableval="$enable_LEITCH"
@@ -8881,10 +9104,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8275: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking local clock reference... $ECHO_C" 1>&6
-echo "configure:8888: checking local clock reference" 1>&5
+echo "configure:8277: checking local clock reference" >&5
+echo $ECHO_N "checking local clock reference... $ECHO_C" >&6
 # Check whether --enable-LOCAL-CLOCK or --disable-LOCAL-CLOCK was given.
 if test "${enable_LOCAL_CLOCK+set}" = set; then
   enableval="$enable_LOCAL_CLOCK"
@@ -8899,10 +9123,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8292: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking EES M201 MSF receiver... $ECHO_C" 1>&6
-echo "configure:8906: checking EES M201 MSF receiver" 1>&5
+echo "configure:8294: checking EES M201 MSF receiver" >&5
+echo $ECHO_N "checking EES M201 MSF receiver... $ECHO_C" >&6
 # Check whether --enable-MSFEES or --disable-MSFEES was given.
 if test "${enable_MSFEES+set}" = set; then
   enableval="$enable_MSFEES"
@@ -8917,11 +9142,12 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8309: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
 # Not Ultrix
-echo $ECHO_N "checking Magnavox MX4200 GPS receiver... $ECHO_C" 1>&6
-echo "configure:8925: checking Magnavox MX4200 GPS receiver" 1>&5
+echo "configure:8312: checking Magnavox MX4200 GPS receiver" >&5
+echo $ECHO_N "checking Magnavox MX4200 GPS receiver... $ECHO_C" >&6
 # Check whether --enable-MX4200 or --disable-MX4200 was given.
 if test "${enable_MX4200+set}" = set; then
   enableval="$enable_MX4200"
@@ -8941,13 +9167,14 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8332: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$target" in
- yes*-*-ultrix*) echo "configure: warning: *** But the expected answer is... no ***" 1>&2 ;;
+ yes*-*-ultrix*) echo "configure: warning: *** But the expected answer is... no ***" >&2 ;;
 esac
 
-echo $ECHO_N "checking NMEA GPS receiver... $ECHO_C" 1>&6
-echo "configure:8951: checking NMEA GPS receiver" 1>&5
+echo "configure:8337: checking NMEA GPS receiver" >&5
+echo $ECHO_N "checking NMEA GPS receiver... $ECHO_C" >&6
 # Check whether --enable-NMEA or --disable-NMEA was given.
 if test "${enable_NMEA+set}" = set; then
   enableval="$enable_NMEA"
@@ -8962,10 +9189,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8352: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking for ONCORE Motorola VP/UT Oncore GPS... $ECHO_C" 1>&6
-echo "configure:8969: checking for ONCORE Motorola VP/UT Oncore GPS" 1>&5
+echo "configure:8354: checking for ONCORE Motorola VP/UT Oncore GPS" >&5
+echo $ECHO_N "checking for ONCORE Motorola VP/UT Oncore GPS... $ECHO_C" >&6
 # Check whether --enable-ONCORE or --disable-ONCORE was given.
 if test "${enable_ONCORE+set}" = set; then
   enableval="$enable_ONCORE"
@@ -8983,10 +9211,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8372: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking for Palisade clock... $ECHO_C" 1>&6
-echo "configure:8990: checking for Palisade clock" 1>&5
+echo "configure:8374: checking for Palisade clock" >&5
+echo $ECHO_N "checking for Palisade clock... $ECHO_C" >&6
 # Check whether --enable-PALISADE or --disable-PALISADE was given.
 if test "${enable_PALISADE+set}" = set; then
   enableval="$enable_PALISADE"
@@ -9008,10 +9237,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8395: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking PST/Traconex 1020 WWV/WWVH receiver... $ECHO_C" 1>&6
-echo "configure:9015: checking PST/Traconex 1020 WWV/WWVH receiver" 1>&5
+echo "configure:8397: checking PST/Traconex 1020 WWV/WWVH receiver" >&5
+echo $ECHO_N "checking PST/Traconex 1020 WWV/WWVH receiver... $ECHO_C" >&6
 # Check whether --enable-PST or --disable-PST was given.
 if test "${enable_PST+set}" = set; then
   enableval="$enable_PST"
@@ -9026,11 +9256,12 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8412: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
 # Not Ultrix
-echo $ECHO_N "checking Rockwell Jupiter GPS receiver... $ECHO_C" 1>&6
-echo "configure:9034: checking Rockwell Jupiter GPS receiver" 1>&5
+echo "configure:8415: checking Rockwell Jupiter GPS receiver" >&5
+echo $ECHO_N "checking Rockwell Jupiter GPS receiver... $ECHO_C" >&6
 # Check whether --enable-JUPITER or --disable-JUPITER was given.
 if test "${enable_JUPITER+set}" = set; then
   enableval="$enable_JUPITER"
@@ -9050,22 +9281,22 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8435: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$target" in
- yes*-*-ultrix*) echo "configure: warning: *** But the expected answer is... no ***" 1>&2 ;;
+ yes*-*-ultrix*) echo "configure: warning: *** But the expected answer is... no ***" >&2 ;;
 esac
 
 # Requires modem control
-echo $ECHO_N "checking PTB modem service... $ECHO_C" 1>&6
-echo "configure:9061: checking PTB modem service" 1>&5
+echo "configure:8441: checking PTB modem service" >&5
+echo $ECHO_N "checking PTB modem service... $ECHO_C" >&6
 # Check whether --enable-PTBACTS or --disable-PTBACTS was given.
 if test "${enable_PTBACTS+set}" = set; then
   enableval="$enable_PTBACTS"
   ntp_ok=$enableval
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 9069 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 8449 "configure"
 #include "confdefs.h"
 #include <termios.h>
 #ifdef HAVE_SYS_IOCTL_H
@@ -9092,10 +9323,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8473: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking KSI/Odetics TPRO/S GPS receiver/IRIG interface... $ECHO_C" 1>&6
-echo "configure:9099: checking KSI/Odetics TPRO/S GPS receiver/IRIG interface" 1>&5
+echo "configure:8475: checking KSI/Odetics TPRO/S GPS receiver/IRIG interface" >&5
+echo $ECHO_N "checking KSI/Odetics TPRO/S GPS receiver/IRIG interface... $ECHO_C" >&6
 # Check whether --enable-TPRO or --disable-TPRO was given.
 if test "${enable_TPRO+set}" = set; then
   enableval="$enable_TPRO"
@@ -9116,13 +9348,14 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8496: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ac_cv_header_sys_tpro" in
- yesno) echo "configure: warning: *** But the expected answer is... no ***" 1>&2 ;;
+ yesno) echo "configure: warning: *** But the expected answer is... no ***" >&2 ;;
 esac
 
-echo $ECHO_N "checking TRAK 8810 GPS receiver... $ECHO_C" 1>&6
-echo "configure:9126: checking TRAK 8810 GPS receiver" 1>&5
+echo "configure:8501: checking TRAK 8810 GPS receiver" >&5
+echo $ECHO_N "checking TRAK 8810 GPS receiver... $ECHO_C" >&6
 # Check whether --enable-TRAK or --disable-TRAK was given.
 if test "${enable_TRAK+set}" = set; then
   enableval="$enable_TRAK"
@@ -9137,10 +9370,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8516: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking Chrono-log K-series WWVB receiver... $ECHO_C" 1>&6
-echo "configure:9144: checking Chrono-log K-series WWVB receiver" 1>&5
+echo "configure:8518: checking Chrono-log K-series WWVB receiver" >&5
+echo $ECHO_N "checking Chrono-log K-series WWVB receiver... $ECHO_C" >&6
 # Check whether --enable-CHRONOLOG or --disable-CHRONOLOG was given.
 if test "${enable_CHRONOLOG+set}" = set; then
   enableval="$enable_CHRONOLOG"
@@ -9155,10 +9389,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8533: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking Dumb generic hh:mm:ss local clock... $ECHO_C" 1>&6
-echo "configure:9162: checking Dumb generic hh:mm:ss local clock" 1>&5
+echo "configure:8535: checking Dumb generic hh:mm:ss local clock" >&5
+echo $ECHO_N "checking Dumb generic hh:mm:ss local clock... $ECHO_C" >&6
 # Check whether --enable-DUMBCLOCK or --disable-DUMBCLOCK was given.
 if test "${enable_DUMBCLOCK+set}" = set; then
   enableval="$enable_DUMBCLOCK"
@@ -9173,10 +9408,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8550: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking Conrad parallel port radio clock... $ECHO_C" 1>&6
-echo "configure:9180: checking Conrad parallel port radio clock" 1>&5
+echo "configure:8552: checking Conrad parallel port radio clock" >&5
+echo $ECHO_N "checking Conrad parallel port radio clock... $ECHO_C" >&6
 # Check whether --enable-PCF or --disable-PCF was given.
 if test "${enable_PCF+set}" = set; then
   enableval="$enable_PCF"
@@ -9191,10 +9427,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8567: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking Spectracom 8170/Netclock/2 WWVB receiver... $ECHO_C" 1>&6
-echo "configure:9198: checking Spectracom 8170/Netclock/2 WWVB receiver" 1>&5
+echo "configure:8569: checking Spectracom 8170/Netclock/2 WWVB receiver" >&5
+echo $ECHO_N "checking Spectracom 8170/Netclock/2 WWVB receiver... $ECHO_C" >&6
 # Check whether --enable-SPECTRACOM or --disable-SPECTRACOM was given.
 if test "${enable_SPECTRACOM+set}" = set; then
   enableval="$enable_SPECTRACOM"
@@ -9209,11 +9446,12 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8584: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
 # Not on a vax-dec-bsd
-echo $ECHO_N "checking Kinemetrics/TrueTime receivers... $ECHO_C" 1>&6
-echo "configure:9217: checking Kinemetrics/TrueTime receivers" 1>&5
+echo "configure:8587: checking Kinemetrics/TrueTime receivers" >&5
+echo $ECHO_N "checking Kinemetrics/TrueTime receivers... $ECHO_C" >&6
 # Check whether --enable-TRUETIME or --disable-TRUETIME was given.
 if test "${enable_TRUETIME+set}" = set; then
   enableval="$enable_TRUETIME"
@@ -9235,13 +9473,14 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8609: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$target" in
- yesvax-dec-bsd) echo "configure: warning: *** But the expected answer is... no ***" 1>&2 ;;
+ yesvax-dec-bsd) echo "configure: warning: *** But the expected answer is... no ***" >&2 ;;
 esac
 
-echo $ECHO_N "checking Ultralink M320 WWVB receiver... $ECHO_C" 1>&6
-echo "configure:9245: checking Ultralink M320 WWVB receiver" 1>&5
+echo "configure:8614: checking Ultralink M320 WWVB receiver" >&5
+echo $ECHO_N "checking Ultralink M320 WWVB receiver... $ECHO_C" >&6
 # Check whether --enable-ULINK or --disable-ULINK was given.
 if test "${enable_ULINK+set}" = set; then
   enableval="$enable_ULINK"
@@ -9256,10 +9495,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8629: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking WWV receiver... $ECHO_C" 1>&6
-echo "configure:9263: checking WWV receiver" 1>&5
+echo "configure:8631: checking WWV receiver" >&5
+echo $ECHO_N "checking WWV receiver... $ECHO_C" >&6
 # Check whether --enable-WWV or --disable-WWV was given.
 if test "${enable_WWV+set}" = set; then
   enableval="$enable_WWV"
@@ -9277,22 +9517,22 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8649: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canaudio" in
- yesno) echo "configure: warning: *** But the expected answer is... no ***" 1>&2 ;;
+ yesno) echo "configure: warning: *** But the expected answer is... no ***" >&2 ;;
 esac
 
 # Requires modem control
-echo $ECHO_N "checking USNO modem service... $ECHO_C" 1>&6
-echo "configure:9288: checking USNO modem service" 1>&5
+echo "configure:8655: checking USNO modem service" >&5
+echo $ECHO_N "checking USNO modem service... $ECHO_C" >&6
 # Check whether --enable-USNO or --disable-USNO was given.
 if test "${enable_USNO+set}" = set; then
   enableval="$enable_USNO"
   ntp_ok=$enableval
 else
-
-cat >conftest.$ac_ext <<EOF
-#line 9296 "configure"
+  cat >conftest.$ac_ext <<EOF
+#line 8663 "configure"
 #include "confdefs.h"
 #include <termios.h>
 #ifdef HAVE_SYS_IOCTL_H
@@ -9319,10 +9559,11 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8687: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 
-echo $ECHO_N "checking for default inclusion of all suitable PARSE clocks... $ECHO_C" 1>&6
-echo "configure:9326: checking for default inclusion of all suitable PARSE clocks" 1>&5
+echo "configure:8689: checking for default inclusion of all suitable PARSE clocks" >&5
+echo $ECHO_N "checking for default inclusion of all suitable PARSE clocks... $ECHO_C" >&6
 # Check whether --enable-parse-clocks or --disable-parse-clocks was given.
 if test "${enable_parse_clocks+set}" = set; then
   enableval="$enable_parse_clocks"
@@ -9334,14 +9575,15 @@ else
     esac
     ntp_eapc=no
 fi
-echo "$ECHO_T""$ntp_eapc" 1>&6
+echo "configure:8702: result: $ntp_eapc" >&5
+echo "${ECHO_T}$ntp_eapc" >&6
 
 case "$ntp_eac$ntp_eapc$ntp_canparse" in
  noyes*)
-    { echo "configure: error: "--enable-parse-clocks" requires "--enable-all-clocks"." 1>&2; exit 1; }
+    { echo "configure: error: \"--enable-parse-clocks\" requires \"--enable-all-clocks\"." >&2; exit 1; }
     ;;
  yesyesno)
-    { echo "configure: error: You said "--enable-parse-clocks" but PARSE isn't supported on this platform!" 1>&2; exit 1; }
+    { echo "configure: error: You said \"--enable-parse-clocks\" but PARSE isn't supported on this platform!" >&2; exit 1; }
     ;;
  *) ;;
 esac
@@ -9350,8 +9592,8 @@ ntp_libparse=no
 ntp_parseutil=no
 ntp_rawdcf=no
 
-echo $ECHO_N "checking Diem Computime Radio Clock... $ECHO_C" 1>&6
-echo "configure:9355: checking Diem Computime Radio Clock" 1>&5
+echo "configure:8716: checking Diem Computime Radio Clock" >&5
+echo $ECHO_N "checking Diem Computime Radio Clock... $ECHO_C" >&6
 # Check whether --enable-COMPUTIME or --disable-COMPUTIME was given.
 if test "${enable_COMPUTIME+set}" = set; then
   enableval="$enable_COMPUTIME"
@@ -9367,15 +9609,16 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8732: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { echo "configure: error: That's a parse clock and this system doesn't support it!" 1>&2; exit 1; }
+    { echo "configure: error: That's a parse clock and this system doesn't support it!" >&2; exit 1; }
     ;;
 esac
 
-echo $ECHO_N "checking ELV/DCF7000 clock... $ECHO_C" 1>&6
-echo "configure:9379: checking ELV/DCF7000 clock" 1>&5
+echo "configure:8739: checking ELV/DCF7000 clock" >&5
+echo $ECHO_N "checking ELV/DCF7000 clock... $ECHO_C" >&6
 # Check whether --enable-DCF7000 or --disable-DCF7000 was given.
 if test "${enable_DCF7000+set}" = set; then
   enableval="$enable_DCF7000"
@@ -9391,15 +9634,16 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8755: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { echo "configure: error: That's a parse clock and this system doesn't support it!" 1>&2; exit 1; }
+    { echo "configure: error: That's a parse clock and this system doesn't support it!" >&2; exit 1; }
     ;;
 esac
 
-echo $ECHO_N "checking HOPF 6021 clock... $ECHO_C" 1>&6
-echo "configure:9403: checking HOPF 6021 clock" 1>&5
+echo "configure:8762: checking HOPF 6021 clock" >&5
+echo $ECHO_N "checking HOPF 6021 clock... $ECHO_C" >&6
 # Check whether --enable-HOPF6021 or --disable-HOPF6021 was given.
 if test "${enable_HOPF6021+set}" = set; then
   enableval="$enable_HOPF6021"
@@ -9415,15 +9659,16 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8778: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { echo "configure: error: That's a parse clock and this system doesn't support it!" 1>&2; exit 1; }
+    { echo "configure: error: That's a parse clock and this system doesn't support it!" >&2; exit 1; }
     ;;
 esac
 
-echo $ECHO_N "checking Meinberg clocks... $ECHO_C" 1>&6
-echo "configure:9427: checking Meinberg clocks" 1>&5
+echo "configure:8785: checking Meinberg clocks" >&5
+echo $ECHO_N "checking Meinberg clocks... $ECHO_C" >&6
 # Check whether --enable-MEINBERG or --disable-MEINBERG was given.
 if test "${enable_MEINBERG+set}" = set; then
   enableval="$enable_MEINBERG"
@@ -9439,15 +9684,16 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8801: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { echo "configure: error: That's a parse clock and this system doesn't support it!" 1>&2; exit 1; }
+    { echo "configure: error: That's a parse clock and this system doesn't support it!" >&2; exit 1; }
     ;;
 esac
 
-echo $ECHO_N "checking DCF77 raw time code... $ECHO_C" 1>&6
-echo "configure:9451: checking DCF77 raw time code" 1>&5
+echo "configure:8808: checking DCF77 raw time code" >&5
+echo $ECHO_N "checking DCF77 raw time code... $ECHO_C" >&6
 # Check whether --enable-RAWDCF or --disable-RAWDCF was given.
 if test "${enable_RAWDCF+set}" = set; then
   enableval="$enable_RAWDCF"
@@ -9465,19 +9711,20 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8826: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { echo "configure: error: That's a parse clock and this system doesn't support it!" 1>&2; exit 1; }
+    { echo "configure: error: That's a parse clock and this system doesn't support it!" >&2; exit 1; }
     ;;
 esac
 
 case "$ntp_rawdcf" in
  yes)
-    echo $ECHO_N "checking if we must enable parity for RAWDCF... $ECHO_C" 1>&6
-echo "configure:9479: checking if we must enable parity for RAWDCF" 1>&5
+    echo "configure:8835: checking if we must enable parity for RAWDCF" >&5
+echo $ECHO_N "checking if we must enable parity for RAWDCF... $ECHO_C" >&6
 if test "${ac_cv_var_rawdcf_parity+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ans=no
     case "$target" in
@@ -9487,7 +9734,8 @@ else
     esac
     ac_cv_var_rawdcf_parity=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_rawdcf_parity" 1>&6
+echo "configure:8848: result: $ac_cv_var_rawdcf_parity" >&5
+echo "${ECHO_T}$ac_cv_var_rawdcf_parity" >&6
     case "$ac_cv_var_rawdcf_parity" in
      yes) cat >>confdefs.h <<\EOF
 #define RAWDCF_NO_IGNPAR 1
@@ -9501,8 +9749,8 @@ EOF
     ;;
 esac
 
-echo $ECHO_N "checking RCC 8000 clock... $ECHO_C" 1>&6
-echo "configure:9506: checking RCC 8000 clock" 1>&5
+echo "configure:8861: checking RCC 8000 clock" >&5
+echo $ECHO_N "checking RCC 8000 clock... $ECHO_C" >&6
 # Check whether --enable-RCC8000 or --disable-RCC8000 was given.
 if test "${enable_RCC8000+set}" = set; then
   enableval="$enable_RCC8000"
@@ -9518,15 +9766,16 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8877: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { echo "configure: error: That's a parse clock and this system doesn't support it!" 1>&2; exit 1; }
+    { echo "configure: error: That's a parse clock and this system doesn't support it!" >&2; exit 1; }
     ;;
 esac
 
-echo $ECHO_N "checking Schmid DCF77 clock... $ECHO_C" 1>&6
-echo "configure:9530: checking Schmid DCF77 clock" 1>&5
+echo "configure:8884: checking Schmid DCF77 clock" >&5
+echo $ECHO_N "checking Schmid DCF77 clock... $ECHO_C" >&6
 # Check whether --enable-SCHMID or --disable-SCHMID was given.
 if test "${enable_SCHMID+set}" = set; then
   enableval="$enable_SCHMID"
@@ -9542,15 +9791,16 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8900: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { echo "configure: error: That's a parse clock and this system doesn't support it!" 1>&2; exit 1; }
+    { echo "configure: error: That's a parse clock and this system doesn't support it!" >&2; exit 1; }
     ;;
 esac
 
-echo $ECHO_N "checking Trimble GPS receiver/TAIP protocol... $ECHO_C" 1>&6
-echo "configure:9554: checking Trimble GPS receiver/TAIP protocol" 1>&5
+echo "configure:8907: checking Trimble GPS receiver/TAIP protocol" >&5
+echo $ECHO_N "checking Trimble GPS receiver/TAIP protocol... $ECHO_C" >&6
 # Check whether --enable-TRIMTAIP or --disable-TRIMTAIP was given.
 if test "${enable_TRIMTAIP+set}" = set; then
   enableval="$enable_TRIMTAIP"
@@ -9566,15 +9816,16 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8923: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { echo "configure: error: That's a parse clock and this system doesn't support it!" 1>&2; exit 1; }
+    { echo "configure: error: That's a parse clock and this system doesn't support it!" >&2; exit 1; }
     ;;
 esac
 
-echo $ECHO_N "checking Trimble GPS receiver/TSIP protocol... $ECHO_C" 1>&6
-echo "configure:9578: checking Trimble GPS receiver/TSIP protocol" 1>&5
+echo "configure:8930: checking Trimble GPS receiver/TSIP protocol" >&5
+echo $ECHO_N "checking Trimble GPS receiver/TSIP protocol... $ECHO_C" >&6
 # Check whether --enable-TRIMTSIP or --disable-TRIMTSIP was given.
 if test "${enable_TRIMTSIP+set}" = set; then
   enableval="$enable_TRIMTSIP"
@@ -9590,15 +9841,16 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8946: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { echo "configure: error: That's a parse clock and this system doesn't support it!" 1>&2; exit 1; }
+    { echo "configure: error: That's a parse clock and this system doesn't support it!" >&2; exit 1; }
     ;;
 esac
 
-echo $ECHO_N "checking WHARTON 400A Series clock... $ECHO_C" 1>&6
-echo "configure:9602: checking WHARTON 400A Series clock" 1>&5
+echo "configure:8953: checking WHARTON 400A Series clock" >&5
+echo $ECHO_N "checking WHARTON 400A Series clock... $ECHO_C" >&6
 # Check whether --enable-WHARTON or --disable-WHARTON was given.
 if test "${enable_WHARTON+set}" = set; then
   enableval="$enable_WHARTON"
@@ -9614,15 +9866,16 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8969: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { echo "configure: error: That's a parse clock and this system doesn't support it!" 1>&2; exit 1; }
+    { echo "configure: error: That's a parse clock and this system doesn't support it!" >&2; exit 1; }
     ;;
 esac
 
-echo $ECHO_N "checking VARITEXT clock... $ECHO_C" 1>&6
-echo "configure:9626: checking VARITEXT clock" 1>&5
+echo "configure:8976: checking VARITEXT clock" >&5
+echo $ECHO_N "checking VARITEXT clock... $ECHO_C" >&6
 # Check whether --enable-VARITEXT or --disable-VARITEXT was given.
 if test "${enable_VARITEXT+set}" = set; then
   enableval="$enable_VARITEXT"
@@ -9638,15 +9891,16 @@ if test "$ntp_ok" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ntp_ok" 1>&6
+echo "configure:8992: result: $ntp_ok" >&5
+echo "${ECHO_T}$ntp_ok" >&6
 case "$ntp_ok$ntp_canparse" in
  yesno)
-    { echo "configure: error: That's a parse clock and this system doesn't support it!" 1>&2; exit 1; }
+    { echo "configure: error: That's a parse clock and this system doesn't support it!" >&2; exit 1; }
     ;;
 esac
 
-echo $ECHO_N "checking if we need to make and use the parse libraries... $ECHO_C" 1>&6
-echo "configure:9650: checking if we need to make and use the parse libraries" 1>&5
+echo "configure:8999: checking if we need to make and use the parse libraries" >&5
+echo $ECHO_N "checking if we need to make and use the parse libraries... $ECHO_C" >&6
 ans=no
 case "$ntp_libparse" in
  yes)
@@ -9668,10 +9922,11 @@ EOF
 
     ;;
 esac
-echo "$ECHO_T""$ans" 1>&6
+echo "configure:9019: result: $ans" >&5
+echo "${ECHO_T}$ans" >&6
 
-echo $ECHO_N "checking for the level of crypto support... $ECHO_C" 1>&6
-echo "configure:9675: checking for the level of crypto support" 1>&5
+echo "configure:9021: checking for the level of crypto support" >&5
+echo $ECHO_N "checking for the level of crypto support... $ECHO_C" >&6
 # Check whether --with-crypto or --without-crypto was given.
 if test "${with_crypto+set}" = set; then
   withval="$with_crypto"
@@ -9693,7 +9948,8 @@ case "$ans" in
 #define DES 1
 EOF
 
-	cat >>confdefs.h <<\EOF
+	
+cat >>confdefs.h <<\EOF
 #define PUBKEY
 EOF
 
@@ -9704,17 +9960,19 @@ esac
 case "$ans" in
  md5) ;;
  *)
-    cat >>confdefs.h <<\EOF
+
+cat >>confdefs.h <<\EOF
 #define AUTOKEY
 EOF
 
     AUTOKEY=1
     ;;
 esac
-echo "$ECHO_T""$ans" 1>&6
+echo "configure:9059: result: $ans" >&5
+echo "${ECHO_T}$ans" >&6
 
-echo $ECHO_N "checking if we can make dcf parse utilities... $ECHO_C" 1>&6
-echo "configure:9718: checking if we can make dcf parse utilities" 1>&5
+echo "configure:9061: checking if we can make dcf parse utilities" >&5
+echo $ECHO_N "checking if we can make dcf parse utilities... $ECHO_C" >&6
 ans=no
 if test "$ntp_parseutil" = "yes"; then
     case "$target" in
@@ -9725,10 +9983,11 @@ if test "$ntp_parseutil" = "yes"; then
 	;;
     esac
 fi
-echo "$ECHO_T""$ans" 1>&6
+echo "configure:9073: result: $ans" >&5
+echo "${ECHO_T}$ans" >&6
 
-echo $ECHO_N "checking if we can build kernel streams modules for parse... $ECHO_C" 1>&6
-echo "configure:9732: checking if we can build kernel streams modules for parse" 1>&5
+echo "configure:9075: checking if we can build kernel streams modules for parse" >&5
+echo $ECHO_N "checking if we can build kernel streams modules for parse... $ECHO_C" >&6
 ans=no
 case "$ntp_parseutil$ac_cv_header_sys_stropts_h" in
  yesyes)
@@ -9752,20 +10011,24 @@ EOF
     esac
     ;;
 esac
-echo "$ECHO_T""$ans" 1>&6
+echo "configure:9099: result: $ans" >&5
+echo "${ECHO_T}$ans" >&6
 
-echo $ECHO_N "checking if we need basic refclock support... $ECHO_C" 1>&6
-echo "configure:9759: checking if we need basic refclock support" 1>&5
+echo "configure:9101: checking if we need basic refclock support" >&5
+echo $ECHO_N "checking if we need basic refclock support... $ECHO_C" >&6
 if test "$ntp_refclock" = "yes"; then
     cat >>confdefs.h <<\EOF
 #define REFCLOCK 1
 EOF
 
 fi
-echo "$ECHO_T""$ntp_refclock" 1>&6
+echo "configure:9108: result: $ntp_refclock" >&5
+echo "${ECHO_T}$ntp_refclock" >&6
+
+			
 
-echo $ECHO_N "checking if we want HP-UX adjtimed support... $ECHO_C" 1>&6
-echo "configure:9769: checking if we want HP-UX adjtimed support" 1>&5
+echo "configure:9111: checking if we want HP-UX adjtimed support" >&5
+echo $ECHO_N "checking if we want HP-UX adjtimed support... $ECHO_C" >&6
 case "$target" in
  *-*-hpux[56789]*)
     ans=yes
@@ -9780,12 +10043,13 @@ if test "$ans" = "yes"; then
 EOF
 
 fi
-echo "$ECHO_T""$ans" 1>&6
+echo "configure:9126: result: $ans" >&5
+echo "${ECHO_T}$ans" >&6
 
-echo $ECHO_N "checking if we can read kmem... $ECHO_C" 1>&6
-echo "configure:9787: checking if we can read kmem" 1>&5
+echo "configure:9128: checking if we can read kmem" >&5
+echo $ECHO_N "checking if we can read kmem... $ECHO_C" >&6
 if test "${ac_cv_var_can_kmem+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # Check whether --enable-kmem or --disable-kmem was given.
 if test "${enable_kmem+set}" = set; then
@@ -9823,7 +10087,8 @@ else
 fi
 ac_cv_var_can_kmem=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_can_kmem" 1>&6
+echo "configure:9168: result: $ac_cv_var_can_kmem" >&5
+echo "${ECHO_T}$ac_cv_var_can_kmem" >&6
 
 case "$ac_cv_var_can_kmem" in
  *yes*) ;;
@@ -9833,10 +10098,10 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking if adjtime is accurate... $ECHO_C" 1>&6
-echo "configure:9838: checking if adjtime is accurate" 1>&5
+echo "configure:9177: checking if adjtime is accurate" >&5
+echo $ECHO_N "checking if adjtime is accurate... $ECHO_C" >&6
 if test "${ac_cv_var_adjtime_is_accurate+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # Check whether --enable-accurate-adjtime or --disable-accurate-adjtime was given.
 if test "${enable_accurate_adjtime+set}" = set; then
@@ -9875,7 +10140,8 @@ else
 fi
 ac_cv_var_adjtime_is_accurate=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_adjtime_is_accurate" 1>&6
+echo "configure:9218: result: $ac_cv_var_adjtime_is_accurate" >&5
+echo "${ECHO_T}$ac_cv_var_adjtime_is_accurate" >&6
 case "$ac_cv_var_adjtime_is_accurate" in
  yes) cat >>confdefs.h <<\EOF
 #define ADJTIME_IS_ACCURATE 1
@@ -9883,10 +10149,10 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking the name of 'tick' in the kernel... $ECHO_C" 1>&6
-echo "configure:9888: checking the name of 'tick' in the kernel" 1>&5
+echo "configure:9226: checking the name of 'tick' in the kernel" >&5
+echo $ECHO_N "checking the name of 'tick' in the kernel... $ECHO_C" >&6
 if test "${ac_cv_var_nlist_tick+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ans=_tick
 case "$target" in
@@ -9917,7 +10183,8 @@ case "$target" in
 esac
 ac_cv_var_nlist_tick=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_nlist_tick" 1>&6
+echo "configure:9260: result: $ac_cv_var_nlist_tick" >&5
+echo "${ECHO_T}$ac_cv_var_nlist_tick" >&6
 case "$ac_cv_var_nlist_tick" in
  ''|no) ;;	# HMS: I think we can only get 'no' here...
  *) cat >>confdefs.h <<EOF
@@ -9926,10 +10193,10 @@ EOF
  ;;
 esac
 #
-echo $ECHO_N "checking for the units of 'tick'... $ECHO_C" 1>&6
-echo "configure:9931: checking for the units of 'tick'" 1>&5
+echo "configure:9270: checking for the units of 'tick'" >&5
+echo $ECHO_N "checking for the units of 'tick'... $ECHO_C" >&6
 if test "${ac_cv_var_tick_nano+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ans=usec
 case "$target" in
@@ -9939,7 +10206,8 @@ case "$target" in
 esac
 ac_cv_var_tick_nano=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_tick_nano" 1>&6
+echo "configure:9283: result: $ac_cv_var_tick_nano" >&5
+echo "${ECHO_T}$ac_cv_var_tick_nano" >&6
 case "$ac_cv_var_tick_nano" in
  nsec)
     cat >>confdefs.h <<\EOF
@@ -9949,10 +10217,10 @@ EOF
     ;;
 esac
 #
-echo $ECHO_N "checking the name of 'tickadj' in the kernel... $ECHO_C" 1>&6
-echo "configure:9954: checking the name of 'tickadj' in the kernel" 1>&5
+echo "configure:9293: checking the name of 'tickadj' in the kernel" >&5
+echo $ECHO_N "checking the name of 'tickadj' in the kernel... $ECHO_C" >&6
 if test "${ac_cv_var_nlist_tickadj+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ans=_tickadj
 case "$target" in
@@ -9992,7 +10260,8 @@ case "$target" in
 esac
 ac_cv_var_nlist_tickadj=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_nlist_tickadj" 1>&6
+echo "configure:9336: result: $ac_cv_var_nlist_tickadj" >&5
+echo "${ECHO_T}$ac_cv_var_nlist_tickadj" >&6
 case "$ac_cv_var_nlist_tickadj" in
  ''|no) ;;	# HMS: I think we can only get 'no' here...
  *) cat >>confdefs.h <<EOF
@@ -10001,10 +10270,10 @@ EOF
  ;;
 esac
 #
-echo $ECHO_N "checking for the units of 'tickadj'... $ECHO_C" 1>&6
-echo "configure:10006: checking for the units of 'tickadj'" 1>&5
+echo "configure:9346: checking for the units of 'tickadj'" >&5
+echo $ECHO_N "checking for the units of 'tickadj'... $ECHO_C" >&6
 if test "${ac_cv_var_tickadj_nano+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ans=usec
 case "$target" in
@@ -10014,7 +10283,8 @@ case "$target" in
 esac
 ac_cv_var_tickadj_nano=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_tickadj_nano" 1>&6
+echo "configure:9359: result: $ac_cv_var_tickadj_nano" >&5
+echo "${ECHO_T}$ac_cv_var_tickadj_nano" >&6
 case "$ac_cv_var_tickadj_nano" in
  nsec)
     cat >>confdefs.h <<\EOF
@@ -10024,10 +10294,10 @@ EOF
     ;;
 esac
 #
-echo $ECHO_N "checking half-heartedly for 'dosynctodr' in the kernel... $ECHO_C" 1>&6
-echo "configure:10029: checking half-heartedly for 'dosynctodr' in the kernel" 1>&5
+echo "configure:9369: checking half-heartedly for 'dosynctodr' in the kernel" >&5
+echo $ECHO_N "checking half-heartedly for 'dosynctodr' in the kernel... $ECHO_C" >&6
 if test "${ac_cv_var_nlist_dosynctodr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case "$target" in
  *-apple-aux[23]*)
@@ -10066,7 +10336,8 @@ else
 esac
 ac_cv_var_nlist_dosynctodr=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_nlist_dosynctodr" 1>&6
+echo "configure:9411: result: $ac_cv_var_nlist_dosynctodr" >&5
+echo "${ECHO_T}$ac_cv_var_nlist_dosynctodr" >&6
 case "$ac_cv_var_nlist_dosynctodr" in
  no) ;;
  *)  cat >>confdefs.h <<EOF
@@ -10076,10 +10347,10 @@ EOF
      ;;
 esac
 #
-echo $ECHO_N "checking half-heartedly for 'noprintf' in the kernel... $ECHO_C" 1>&6
-echo "configure:10081: checking half-heartedly for 'noprintf' in the kernel" 1>&5
+echo "configure:9421: checking half-heartedly for 'noprintf' in the kernel" >&5
+echo $ECHO_N "checking half-heartedly for 'noprintf' in the kernel... $ECHO_C" >&6
 if test "${ac_cv_var_nlist_noprintf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case "$target" in
  *-apple-aux[23]*)
@@ -10112,7 +10383,8 @@ else
 esac
 ac_cv_var_nlist_noprintf=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_nlist_noprintf" 1>&6
+echo "configure:9457: result: $ac_cv_var_nlist_noprintf" >&5
+echo "${ECHO_T}$ac_cv_var_nlist_noprintf" >&6
 case "$ac_cv_var_nlist_noprintf" in
  no) ;;
  *)  cat >>confdefs.h <<EOF
@@ -10122,10 +10394,10 @@ EOF
      ;;
 esac
 
-echo $ECHO_N "checking for a default value for 'tick'... $ECHO_C" 1>&6
-echo "configure:10127: checking for a default value for 'tick'" 1>&5
+echo "configure:9466: checking for a default value for 'tick'" >&5
+echo $ECHO_N "checking for a default value for 'tick'... $ECHO_C" >&6
 if test "${ac_cv_var_tick+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # Check whether --enable-tick or --disable-tick was given.
 if test "${enable_tick+set}" = set; then
@@ -10155,7 +10427,8 @@ else
 fi
 ac_cv_var_tick=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_tick" 1>&6
+echo "configure:9499: result: $ac_cv_var_tick" >&5
+echo "${ECHO_T}$ac_cv_var_tick" >&6
 case "$ac_cv_var_tick" in
  ''|no) ;;	# HMS: I think we can only get 'no' here...
  *) cat >>confdefs.h <<EOF
@@ -10164,10 +10437,10 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking for a default value for 'tickadj'... $ECHO_C" 1>&6
-echo "configure:10169: checking for a default value for 'tickadj'" 1>&5
+echo "configure:9508: checking for a default value for 'tickadj'" >&5
+echo $ECHO_N "checking for a default value for 'tickadj'... $ECHO_C" >&6
 if test "${ac_cv_var_tickadj+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # Check whether --enable-tickadj or --disable-tickadj was given.
 if test "${enable_tickadj+set}" = set; then
@@ -10222,7 +10495,8 @@ else
 fi
 ac_cv_var_tickadj=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_tickadj" 1>&6
+echo "configure:9566: result: $ac_cv_var_tickadj" >&5
+echo "${ECHO_T}$ac_cv_var_tickadj" >&6
 case "$ac_cv_var_tickadj" in
  ''|no) ;;	# HMS: I think we can only get 'no' here...
  *) cat >>confdefs.h <<EOF
@@ -10252,15 +10526,15 @@ esac
 ac_cv_make_tickadj=yes
 case "$ac_cv_var_can_kmem$ac_cv_var_tick$ac_cv_var_tickadj" in
  nonono)	# Don't read KMEM, no presets.  Bogus.
-    echo "configure: warning: Can't read kmem" 1>&2
+    echo "configure: warning: Can't read kmem" >&2
     ac_cv_make_tickadj=no
     ;;
  nono*)		# Don't read KMEM, no PRESET_TICK but PRESET_TICKADJ.  Bogus.
-    echo "configure: warning: Can't read kmem but no PRESET_TICK.  No tickadj." 1>&2
+    echo "configure: warning: Can't read kmem but no PRESET_TICK.  No tickadj." >&2
     ac_cv_make_tickadj=no
     ;;
  no*no)		# Don't read KMEM, PRESET_TICK but no PRESET_TICKADJ.  Bogus.
-    echo "configure: warning: Can't read kmem but no PRESET_TICKADJ.  No tickadj." 1>&2
+    echo "configure: warning: Can't read kmem but no PRESET_TICKADJ.  No tickadj." >&2
     ac_cv_make_tickadj=no
     ;;
  no*)		# Don't read KMEM, PRESET_TICK and PRESET_TICKADJ.  Cool.
@@ -10268,14 +10542,14 @@ case "$ac_cv_var_can_kmem$ac_cv_var_tick$ac_cv_var_tickadj" in
  yesnono)	# Read KMEM, no presets.  Cool.
     ;;
  yesno*)	# Read KMEM, no PRESET_TICK but PRESET_TICKADJ.  Bogus.
-    echo "configure: warning: PRESET_TICKADJ is defined but not PRESET_TICK.  Please report this." 1>&2
+    echo "configure: warning: PRESET_TICKADJ is defined but not PRESET_TICK.  Please report this." >&2
     ;;
  yes*no)	# Read KMEM, PRESET_TICK but no PRESET_TICKADJ.  Cool.
     ;;
  yes*)		# READ KMEM, PRESET_TICK and PRESET_TICKADJ.
     ;;
  *)		# Generally bogus.
-    { echo "configure: error: This shouldn't happen." 1>&2; exit 1; }
+    { echo "configure: error: This shouldn't happen." >&2; exit 1; }
     ;;
 esac
 
@@ -10294,24 +10568,25 @@ case "$target" in
  ;;
 esac
 
-echo $ECHO_N "checking if we want and can make the tickadj utility... $ECHO_C" 1>&6
-echo "configure:10299: checking if we want and can make the tickadj utility" 1>&5
+echo "configure:9634: checking if we want and can make the tickadj utility" >&5
+echo $ECHO_N "checking if we want and can make the tickadj utility... $ECHO_C" >&6
 if test "${ac_cv_make_tickadj+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_cv_make_tickadj=yes
 fi
-echo "$ECHO_T""$ac_cv_make_tickadj" 1>&6
+echo "configure:9641: result: $ac_cv_make_tickadj" >&5
+echo "${ECHO_T}$ac_cv_make_tickadj" >&6
 case "$ac_cv_make_tickadj" in
  yes)
     MAKE_TICKADJ=tickadj
     ;;
 esac
 
-echo $ECHO_N "checking if we want and can make the ntptime utility... $ECHO_C" 1>&6
-echo "configure:10313: checking if we want and can make the ntptime utility" 1>&5
+echo "configure:9648: checking if we want and can make the ntptime utility" >&5
+echo $ECHO_N "checking if we want and can make the ntptime utility... $ECHO_C" >&6
 if test "${ac_cv_make_ntptime+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   case "$target" in
  *) case "$ac_cv_struct_ntptimeval$ac_cv_var_kernel_pll" in
@@ -10326,17 +10601,18 @@ else
 esac
 ac_cv_make_ntptime=$ans
 fi
-echo "$ECHO_T""$ac_cv_make_ntptime" 1>&6
+echo "configure:9666: result: $ac_cv_make_ntptime" >&5
+echo "${ECHO_T}$ac_cv_make_ntptime" >&6
 case "$ac_cv_make_ntptime" in
  yes)
     MAKE_NTPTIME=ntptime
     ;;
 esac
 
-echo $ECHO_N "checking if we want UDP wildcard delivery... $ECHO_C" 1>&6
-echo "configure:10338: checking if we want UDP wildcard delivery" 1>&5
+echo "configure:9673: checking if we want UDP wildcard delivery" >&5
+echo $ECHO_N "checking if we want UDP wildcard delivery... $ECHO_C" >&6
 if test "${ac_cv_var_udp_wildcard_delivery+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # Check whether --enable-udp-wildcard or --disable-udp-wildcard was given.
 if test "${enable_udp_wildcard+set}" = set; then
@@ -10391,7 +10667,8 @@ else
 fi
 ac_cv_var_udp_wildcard_delivery=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_udp_wildcard_delivery" 1>&6
+echo "configure:9731: result: $ac_cv_var_udp_wildcard_delivery" >&5
+echo "${ECHO_T}$ac_cv_var_udp_wildcard_delivery" >&6
 case "$ac_cv_var_udp_wildcard_delivery" in
  yes) cat >>confdefs.h <<\EOF
 #define UDP_WILDCARD_DELIVERY 1
@@ -10410,10 +10687,10 @@ case "$host" in
     ;;
 esac
 
-echo $ECHO_N "checking if we should always slew the time... $ECHO_C" 1>&6
-echo "configure:10415: checking if we should always slew the time" 1>&5
+echo "configure:9749: checking if we should always slew the time" >&5
+echo $ECHO_N "checking if we should always slew the time... $ECHO_C" >&6
 if test "${ac_cv_var_slew_always+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # Check whether --enable-slew-always or --disable-slew-always was given.
 if test "${enable_slew_always+set}" = set; then
@@ -10440,7 +10717,8 @@ else
 fi
 ac_cv_var_slew_always=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_slew_always" 1>&6
+echo "configure:9778: result: $ac_cv_var_slew_always" >&5
+echo "${ECHO_T}$ac_cv_var_slew_always" >&6
 case "$ac_cv_var_slew_always" in
  yes) cat >>confdefs.h <<\EOF
 #define SLEWALWAYS 1
@@ -10448,10 +10726,10 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking if we should step and slew the time... $ECHO_C" 1>&6
-echo "configure:10453: checking if we should step and slew the time" 1>&5
+echo "configure:9786: checking if we should step and slew the time" >&5
+echo $ECHO_N "checking if we should step and slew the time... $ECHO_C" >&6
 if test "${ac_cv_var_step_slew+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # Check whether --enable-step-slew or --disable-step-slew was given.
 if test "${enable_step_slew+set}" = set; then
@@ -10481,7 +10759,8 @@ else
 fi
 ac_cv_var_step_slew=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_step_slew" 1>&6
+echo "configure:9818: result: $ac_cv_var_step_slew" >&5
+echo "${ECHO_T}$ac_cv_var_step_slew" >&6
 case "$ac_cv_var_step_slew" in
  yes) cat >>confdefs.h <<\EOF
 #define STEP_SLEW 1
@@ -10489,10 +10768,10 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking if ntpdate should step the time... $ECHO_C" 1>&6
-echo "configure:10494: checking if ntpdate should step the time" 1>&5
+echo "configure:9826: checking if ntpdate should step the time" >&5
+echo $ECHO_N "checking if ntpdate should step the time... $ECHO_C" >&6
 if test "${ac_cv_var_ntpdate_step+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # Check whether --enable-ntpdate-step or --disable-ntpdate-step was given.
 if test "${enable_ntpdate_step+set}" = set; then
@@ -10510,7 +10789,8 @@ else
 fi
 ac_cv_var_ntpdate_step=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_ntpdate_step" 1>&6
+echo "configure:9846: result: $ac_cv_var_ntpdate_step" >&5
+echo "${ECHO_T}$ac_cv_var_ntpdate_step" >&6
 case "$ac_cv_var_ntpdate_step" in
  yes) cat >>confdefs.h <<\EOF
 #define FORCE_NTPDATE_STEP 1
@@ -10518,10 +10798,10 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking if we should sync TODR clock every hour... $ECHO_C" 1>&6
-echo "configure:10523: checking if we should sync TODR clock every hour" 1>&5
+echo "configure:9854: checking if we should sync TODR clock every hour" >&5
+echo $ECHO_N "checking if we should sync TODR clock every hour... $ECHO_C" >&6
 if test "${ac_cv_var_sync_todr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # Check whether --enable-hourly-todr-sync or --disable-hourly-todr-sync was given.
 if test "${enable_hourly_todr_sync+set}" = set; then
@@ -10541,7 +10821,8 @@ else
 fi
 ac_cv_var_sync_todr=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_sync_todr" 1>&6
+echo "configure:9877: result: $ac_cv_var_sync_todr" >&5
+echo "${ECHO_T}$ac_cv_var_sync_todr" >&6
 case "$ac_cv_var_sync_todr" in
  yes) cat >>confdefs.h <<\EOF
 #define DOSYNCTODR 1
@@ -10549,10 +10830,10 @@ EOF
  ;;
 esac
 
-echo $ECHO_N "checking if we should avoid kernel FLL bug... $ECHO_C" 1>&6
-echo "configure:10554: checking if we should avoid kernel FLL bug" 1>&5
+echo "configure:9885: checking if we should avoid kernel FLL bug" >&5
+echo $ECHO_N "checking if we should avoid kernel FLL bug... $ECHO_C" >&6
 if test "${ac_cv_var_kernel_fll_bug+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" 1>&6
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # Check whether --enable-kernel-fll-bug or --disable-kernel-fll-bug was given.
 if test "${enable_kernel_fll_bug+set}" = set; then
@@ -10588,7 +10869,8 @@ else
 fi
 ac_cv_var_kernel_fll_bug=$ans
 fi
-echo "$ECHO_T""$ac_cv_var_kernel_fll_bug" 1>&6
+echo "configure:9923: result: $ac_cv_var_kernel_fll_bug" >&5
+echo "${ECHO_T}$ac_cv_var_kernel_fll_bug" >&6
 case "$ac_cv_var_kernel_fll_bug" in
  yes) cat >>confdefs.h <<\EOF
 #define KERNEL_FLL_BUG 1
@@ -10633,30 +10915,32 @@ EOF
 # So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >>confcache
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote substitution
+      # turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+    	-e "s/'/'\\\\''/g" \
+    	-e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1='\\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=\2/p'
+      ;;
+    esac;
+} |
+  sed -e 's/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/' >>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
   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
@@ -10672,6 +10956,34 @@ fi
 
 DEFS=-DHAVE_CONFIG_H
 
+# Save into config.log some information that might help in debugging.
+echo >&5
+echo "Cache variables:" >&5
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+{
+  (set) 2>&1 |
+    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+    *ac_space=\ *)
+      # `set' does not quote correctly, so add quotes (double-quote substitution
+      # turns \\\\ into \\, and sed turns \\ into \).
+      sed -n \
+    	-e "s/'/'\\\\''/g" \
+    	-e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1='\\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=\2/p'
+      ;;
+    esac;
+} | sed -e 's/^/| /' >&5
+echo >&5
+echo "confdefs.h:" >&5
+cat confdefs.h | sed -e 's/^/| /' >&5
+
 : ${CONFIG_STATUS=./config.status}
 trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
 echo creating $CONFIG_STATUS
@@ -10679,16 +10991,20 @@ cat >$CONFIG_STATUS <<EOF
 #! /bin/sh
 # Generated automatically by configure.
 # Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
 # Compiler output produced by configure, useful for debugging
 # configure, is in ./config.log if it exists.
 
+configure=$0
+configure_args=$ac_configure_args
+debug=false
+EOF
+
+cat >>$CONFIG_STATUS <<\EOF
+me=`echo "$0" | sed -e 's,.*/,,'`
+SHELL=${CONFIG_SHELL-/bin/sh}
+
 # Files that config.status was made for.
-config_files="\\
+config_files="\
   Makefile adjtimed/Makefile clockstuff/Makefile include/Makefile
   kernel/Makefile kernel/sys/Makefile libntp/Makefile libparse/Makefile
   librsaref/Makefile ntpd/Makefile ntpdc/Makefile ntpdate/Makefile
@@ -10696,57 +11012,60 @@ config_files="\\
   scripts/calc_tickadj scripts/checktime scripts/freq_adj scripts/mkver
   scripts/ntp-wait scripts/ntpsweep scripts/ntpver scripts/plot_summary
   scripts/summary util/Makefile"
-config_headers="\\
+config_headers="\
   config.h"
-config_commands="\\
+config_commands="\
   default-1 default-2 default"
 
-ac_cs_usage="\\
-\\\`$CONFIG_STATUS' instantiates files from templates according to the
+ac_cs_usage="\
+\`$me' instantiates files from templates according to the
 current configuration.
 
-Usage: $CONFIG_STATUS [OPTIONS] FILE...
+Usage: $0 [OPTIONS] FILE...
 
-  --recheck    Update $CONFIG_STATUS by reconfiguring in the same conditions
-  --version    Print the version of Autoconf and exit
-  --help       Display this help and exit
+  -h, --help       print this help, then exit
+  -V, --version    print version number, then exit
+  -d, --debug      don't remove temporary files
+      --recheck    update $me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
-               Instantiate the configuration file FILE
+                   instantiate the configuration file FILE
   --header=FILE[:TEMPLATE]
-               Instantiate the configuration header FILE
+                   instantiate the configuration header FILE
 
 Configuration files:
-\$config_files
+$config_files
 
 Configuration headers:
-\$config_headers
+$config_headers
 
 Configuration commands:
-\$config_commands
+$config_commands
 
 Report bugs to <bug-autoconf@gnu.org>."
+EOF
 
+cat >>$CONFIG_STATUS <<EOF
 ac_cs_version="\\
 $CONFIG_STATUS generated by autoconf version 2.14a.
 Configured on host `(hostname || uname -n) 2>/dev/null | sed 1q` by
-  `echo "$0 $ac_configure_args" | sed 's/[\\"\`\$]/\\\\&/g'`"
+  $configure $configure_arg"
 
-# Root of the tmp file names.  Use pid to allow concurrent executions.
-ac_cs_root=cs\$\$
 ac_given_srcdir=$srcdir
 ac_given_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
+while test $# != 0
 do
-  case "\$1" in
+  case "$1" in
   --*=*)
-    ac_option=\`echo "\$1" | sed -e 's/=.*//'\`
-    ac_optarg=\`echo "\$1" | sed -e 's/[^=]*=//'\`
+    ac_option=`echo "$1" | sed -e 's/=.*//'`
+    ac_optarg=`echo "$1" | sed -e 's/[^=]*=//'`
     shift
-    set dummy "\$ac_option" "\$ac_optarg" \${1+"\$@"}
+    set dummy "\$ac_option" "$ac_optarg" ${1+"$@"}
     shift
     ;;
   -*);;
@@ -10755,65 +11074,67 @@ do
      ac_need_defaults=false;;
   esac
 
-  case "\$1" in
+  case "$1" in
 
   # Handling of the options.
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 `echo "$ac_configure_args" | sed 's/[\\"\`\$]/\\\\&/g'` --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "\$ac_cs_version"; exit 0 ;;
+    echo "running $SHELL $configure $configure_args --no-create --no-recursion"
+    exec $SHELL $configure $configure_args --no-create --no-recursion ;;
+  --version | --vers* | -V )
+    echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    echo "$CONFIG_STATUS: ambiguous option: \$ac_option
-Try \\\`$CONFIG_STATUS --help' for more information."; exit 1 ;;
-  -help | --help | --hel )
-    echo "\$ac_cs_usage"; exit 0 ;;
+    echo "$me: ambiguous option: $ac_option
+Try \`$me --help' for more information."; exit 1 ;;
+  --help | --hel | -h )
+    echo "$ac_cs_usage"; exit 0 ;;
+  --debug | --d* | -d )
+    debug=:; shift ;;
   --file | --fil | --fi | --f )
     shift
-    CONFIG_FILES="\$CONFIG_FILES \$1"
+    CONFIG_FILES="$CONFIG_FILES $1"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     shift
-    CONFIG_HEADERS="\$CONFIG_FILES \$1"
+    CONFIG_HEADERS="$CONFIG_HEADERS $1"
     ac_need_defaults=false;;
 
   # Handling of arguments.
-  'Makefile' ) CONFIG_FILES="\$CONFIG_FILES Makefile" ;;
-  'adjtimed/Makefile' ) CONFIG_FILES="\$CONFIG_FILES adjtimed/Makefile" ;;
-  'clockstuff/Makefile' ) CONFIG_FILES="\$CONFIG_FILES clockstuff/Makefile" ;;
-  'include/Makefile' ) CONFIG_FILES="\$CONFIG_FILES include/Makefile" ;;
-  'kernel/Makefile' ) CONFIG_FILES="\$CONFIG_FILES kernel/Makefile" ;;
-  'kernel/sys/Makefile' ) CONFIG_FILES="\$CONFIG_FILES kernel/sys/Makefile" ;;
-  'libntp/Makefile' ) CONFIG_FILES="\$CONFIG_FILES libntp/Makefile" ;;
-  'libparse/Makefile' ) CONFIG_FILES="\$CONFIG_FILES libparse/Makefile" ;;
-  'librsaref/Makefile' ) CONFIG_FILES="\$CONFIG_FILES librsaref/Makefile" ;;
-  'ntpd/Makefile' ) CONFIG_FILES="\$CONFIG_FILES ntpd/Makefile" ;;
-  'ntpdc/Makefile' ) CONFIG_FILES="\$CONFIG_FILES ntpdc/Makefile" ;;
-  'ntpdate/Makefile' ) CONFIG_FILES="\$CONFIG_FILES ntpdate/Makefile" ;;
-  'ntpq/Makefile' ) CONFIG_FILES="\$CONFIG_FILES ntpq/Makefile" ;;
-  'ntptrace/Makefile' ) CONFIG_FILES="\$CONFIG_FILES ntptrace/Makefile" ;;
-  'parseutil/Makefile' ) CONFIG_FILES="\$CONFIG_FILES parseutil/Makefile" ;;
-  'scripts/Makefile' ) CONFIG_FILES="\$CONFIG_FILES scripts/Makefile" ;;
-  'scripts/calc_tickadj' ) CONFIG_FILES="\$CONFIG_FILES scripts/calc_tickadj" ;;
-  'scripts/checktime' ) CONFIG_FILES="\$CONFIG_FILES scripts/checktime" ;;
-  'scripts/freq_adj' ) CONFIG_FILES="\$CONFIG_FILES scripts/freq_adj" ;;
-  'scripts/mkver' ) CONFIG_FILES="\$CONFIG_FILES scripts/mkver" ;;
-  'scripts/ntp-wait' ) CONFIG_FILES="\$CONFIG_FILES scripts/ntp-wait" ;;
-  'scripts/ntpsweep' ) CONFIG_FILES="\$CONFIG_FILES scripts/ntpsweep" ;;
-  'scripts/ntpver' ) CONFIG_FILES="\$CONFIG_FILES scripts/ntpver" ;;
-  'scripts/plot_summary' ) CONFIG_FILES="\$CONFIG_FILES scripts/plot_summary" ;;
-  'scripts/summary' ) CONFIG_FILES="\$CONFIG_FILES scripts/summary" ;;
-  'util/Makefile' ) CONFIG_FILES="\$CONFIG_FILES util/Makefile" ;;
-  'default-1' ) CONFIG_COMMANDS="\$CONFIG_COMMANDS default-1" ;;
-  'default-2' ) CONFIG_COMMANDS="\$CONFIG_COMMANDS default-2" ;;
-  'default' ) CONFIG_COMMANDS="\$CONFIG_COMMANDS default" ;;
-  'config.h' ) CONFIG_HEADERS="\$CONFIG_HEADERS config.h" ;;
+  'Makefile' ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  'adjtimed/Makefile' ) CONFIG_FILES="$CONFIG_FILES adjtimed/Makefile" ;;
+  'clockstuff/Makefile' ) CONFIG_FILES="$CONFIG_FILES clockstuff/Makefile" ;;
+  'include/Makefile' ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
+  'kernel/Makefile' ) CONFIG_FILES="$CONFIG_FILES kernel/Makefile" ;;
+  'kernel/sys/Makefile' ) CONFIG_FILES="$CONFIG_FILES kernel/sys/Makefile" ;;
+  'libntp/Makefile' ) CONFIG_FILES="$CONFIG_FILES libntp/Makefile" ;;
+  'libparse/Makefile' ) CONFIG_FILES="$CONFIG_FILES libparse/Makefile" ;;
+  'librsaref/Makefile' ) CONFIG_FILES="$CONFIG_FILES librsaref/Makefile" ;;
+  'ntpd/Makefile' ) CONFIG_FILES="$CONFIG_FILES ntpd/Makefile" ;;
+  'ntpdc/Makefile' ) CONFIG_FILES="$CONFIG_FILES ntpdc/Makefile" ;;
+  'ntpdate/Makefile' ) CONFIG_FILES="$CONFIG_FILES ntpdate/Makefile" ;;
+  'ntpq/Makefile' ) CONFIG_FILES="$CONFIG_FILES ntpq/Makefile" ;;
+  'ntptrace/Makefile' ) CONFIG_FILES="$CONFIG_FILES ntptrace/Makefile" ;;
+  'parseutil/Makefile' ) CONFIG_FILES="$CONFIG_FILES parseutil/Makefile" ;;
+  'scripts/Makefile' ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
+  'scripts/calc_tickadj' ) CONFIG_FILES="$CONFIG_FILES scripts/calc_tickadj" ;;
+  'scripts/checktime' ) CONFIG_FILES="$CONFIG_FILES scripts/checktime" ;;
+  'scripts/freq_adj' ) CONFIG_FILES="$CONFIG_FILES scripts/freq_adj" ;;
+  'scripts/mkver' ) CONFIG_FILES="$CONFIG_FILES scripts/mkver" ;;
+  'scripts/ntp-wait' ) CONFIG_FILES="$CONFIG_FILES scripts/ntp-wait" ;;
+  'scripts/ntpsweep' ) CONFIG_FILES="$CONFIG_FILES scripts/ntpsweep" ;;
+  'scripts/ntpver' ) CONFIG_FILES="$CONFIG_FILES scripts/ntpver" ;;
+  'scripts/plot_summary' ) CONFIG_FILES="$CONFIG_FILES scripts/plot_summary" ;;
+  'scripts/summary' ) CONFIG_FILES="$CONFIG_FILES scripts/summary" ;;
+  'util/Makefile' ) CONFIG_FILES="$CONFIG_FILES util/Makefile" ;;
+  'default-1' ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+  'default-2' ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
+  'default' ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+  'config.h' ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
 
   # This is an error.
-  -*) echo "$CONFIG_STATUS: unrecognized option: \$1
-Try \\\`$CONFIG_STATUS --help' for more information."; exit 1 ;;
-  *) echo "$CONFIG_STATUS: invalid argument: \$1"; exit 1 ;;
+  -*) echo "$me: unrecognized option: $1
+Try \`$me --help' for more information."; exit 1 ;;
+  *) echo "$me: invalid argument: $1"; exit 1 ;;
   esac
   shift
 done
@@ -10829,8 +11150,26 @@ if $ac_need_defaults; then
   : ${CONFIG_COMMANDS=$config_commands}
 fi
 
-# Trap to remove the temp files.
-trap 'rm -fr $ac_cs_root*; exit 1' 1 2 15
+# 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 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"
+}  ||
+{
+  tmp=$TMPDIR/cs$$-$RANDOM && (umask 077 && mkdir $tmp)
+} ||
+{
+   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+   exit 1;
+}
 
 EOF
 
@@ -10855,7 +11194,8 @@ cat >>$CONFIG_STATUS <<EOF
 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/' >\$ac_cs_root.subs <<\\CEOF
+   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
@@ -10871,7 +11211,6 @@ s%@includedir@%$includedir%;t t
 s%@oldincludedir@%$oldincludedir%;t t
 s%@infodir@%$infodir%;t t
 s%@mandir@%$mandir%;t t
-s%@SHELL@%$SHELL%;t t
 s%@ECHO_C@%$ECHO_C%;t t
 s%@ECHO_N@%$ECHO_N%;t t
 s%@ECHO_T@%$ECHO_T%;t t
@@ -10882,6 +11221,11 @@ s%@FFLAGS@%$FFLAGS%;t t
 s%@DEFS@%$DEFS%;t t
 s%@LDFLAGS@%$LDFLAGS%;t t
 s%@LIBS@%$LIBS%;t t
+s%@build@%$build%;t t
+s%@build_alias@%$build_alias%;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_alias@%$host_alias%;t t
 s%@host_cpu@%$host_cpu%;t t
@@ -10892,11 +11236,6 @@ s%@target_alias@%$target_alias%;t t
 s%@target_cpu@%$target_cpu%;t t
 s%@target_vendor@%$target_vendor%;t t
 s%@target_os@%$target_os%;t t
-s%@build@%$build%;t t
-s%@build_alias@%$build_alias%;t t
-s%@build_cpu@%$build_cpu%;t t
-s%@build_vendor@%$build_vendor%;t t
-s%@build_os@%$build_os%;t t
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%;t t
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%;t t
 s%@INSTALL_DATA@%$INSTALL_DATA%;t t
@@ -10954,27 +11293,26 @@ EOF
   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=""
+  ac_sed_cmds=
   while $ac_more_lines; do
     if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $ac_cs_root.subs >$ac_cs_root.sfrag
+      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
     else
-      sed "${ac_end}q" $ac_cs_root.subs >$ac_cs_root.sfrag
+      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
     fi
-    if test ! -s $ac_cs_root.sfrag; then
+    if test ! -s $tmp/subs.frag; then
       ac_more_lines=false
-      rm -f $ac_cs_root.sfrag
     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 $ac_cs_root.sfrag) >$ac_cs_root.s$ac_sed_frag
+  /@[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 $ac_cs_root.s$ac_sed_frag"
+  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
       else
-  	ac_sed_cmds="$ac_sed_cmds | sed -f $ac_cs_root.s$ac_sed_frag"
+  	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
@@ -10988,12 +11326,12 @@ fi # test -n "$CONFIG_FILES"
 
 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
   *:*) ac_file_in=`echo "$ac_file" | sed 's%[^:]*:%%'`
        ac_file=`echo "$ac_file" | sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
+  *) ac_file_in=$ac_file.in ;;
   esac
 
   # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
@@ -11002,7 +11340,7 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
   ac_dir=`echo "$ac_file" | sed 's%/[^/][^/]*$%%'`
   if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
     # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
+    test -d "$ac_dir" || mkdir "$ac_dir"
     ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
     # A "../" for each directory in $ac_dir_suffix.
     ac_dots=`echo "$ac_dir_suffix" | sed 's%/[^/]*%../%g'`
@@ -11014,42 +11352,36 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
   .)  srcdir=.
       if test -z "$ac_dots"; then top_srcdir=.
       else top_srcdir=`echo $ac_dots | sed 's%/$%%'`; fi ;;
-  [/\\]* | ?:[/\\]* )
-      srcdir="$ac_given_srcdir$ac_dir_suffix";
+  [\\/]* | ?:[\\/]* )
+      srcdir=$ac_given_srcdir$ac_dir_suffix;
       top_srcdir=$ac_given_srcdir ;;
   *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
+    srcdir=$ac_dots$ac_given_srcdir$ac_dir_suffix
+    top_srcdir=$ac_dots$ac_given_srcdir ;;
   esac
 
   case "$ac_given_INSTALL" in
-  [/\\$]* | ?:[/\\]* ) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+  [\\/$]* | ?:[\\/]* ) INSTALL=$ac_given_INSTALL ;;
+  *) INSTALL=$ac_dots$ac_given_INSTALL ;;
   esac
 
   echo creating "$ac_file"
   rm -f "$ac_file"
   configure_input="Generated automatically from `echo $ac_file_in |
                                                  sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *[Mm]akefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
 
-  # Don't redirect the output to AC_FILE directly: use `mv' so that updating
-  # is atomic, and doesn't need trapping.
+  # Don't redirect the output to AC_FILE directly: use `mv' so that
+  # updating is atomic, and doesn't need trapping.
   ac_file_inputs=`echo "$ac_file_in" |
                   sed -e "s%^%$ac_given_srcdir/%;s%:% $ac_given_srcdir/%g"`
   for ac_file_input in $ac_file_inputs;
   do
     test -f "$ac_file_input" ||
-        { echo "configure: error: cannot find input file \`$ac_file_input'" 1>&2; exit 1; }
+        { echo "configure: error: cannot find input file \`$ac_file_input'" >&2; exit 1; }
   done
 EOF
 cat >>$CONFIG_STATUS <<EOF
-  sed -e "$ac_comsub
-$ac_vpsub
+  sed -e "$ac_vpsub
 $extrasub
 EOF
 cat >>$CONFIG_STATUS <<\EOF
@@ -11059,11 +11391,10 @@ s%@configure_input@%$configure_input%;t t
 s%@srcdir@%$srcdir%;t t
 s%@top_srcdir@%$top_srcdir%;t t
 s%@INSTALL@%$INSTALL%;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$ac_cs_root.out
-  mv $ac_cs_root.out $ac_file
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+  mv $tmp/out $ac_file
 
-fi; done
-rm -f $ac_cs_root.s*
+done
 EOF
 cat >>$CONFIG_STATUS <<\EOF
 
@@ -11085,26 +11416,25 @@ ac_uB='$%\1#\2define\3'
 ac_uC=' '
 ac_uD='%;t'
 
-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
+for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case "$ac_file" in
   *:*) ac_file_in=`echo "$ac_file" | sed 's%[^:]*:%%'`
        ac_file=`echo "$ac_file" | sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
+  *) ac_file_in=$ac_file.in ;;
   esac
 
   echo creating $ac_file
 
-  rm -f $ac_cs_root.frag $ac_cs_root.in $ac_cs_root.out
   ac_file_inputs=`echo "$ac_file_in" |
                   sed -e "s%^%$ac_given_srcdir/%;s%:% $ac_given_srcdir/%g"`
-    for ac_file_input in $ac_file_inputs;
+  for ac_file_input in $ac_file_inputs;
   do
     test -f "$ac_file_input" ||
-        { echo "configure: error: cannot find input file \`$ac_file_input'" 1>&2; exit 1; }
+        { echo "configure: error: cannot find input file \`$ac_file_input'" >&2; exit 1; }
   done
   # Remove the trailing spaces.
-  sed -e 's/[ 	]*$//' $ac_file_inputs >$ac_cs_root.in
+  sed -e 's/[ 	]*$//' $ac_file_inputs >$tmp/in
 
 EOF
 
@@ -11116,7 +11446,7 @@ EOF
 # config.status.  Protect against being in an unquoted here document
 # in config.status.
 rm -f conftest.defines conftest.undefs
-cat >$ac_cs_root.hdr <<\EOF
+cat >confdef2sed.sed <<\EOF
 s/[\\&%]/\\&/g
 s%[\\$`]%\\&%g
 t clear
@@ -11129,9 +11459,9 @@ 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 $ac_cs_root.hdr >conftest.defines
+uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
 sed -e 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f $ac_cs_root.hdr
+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
@@ -11143,20 +11473,20 @@ EOF
 # Break up conftest.defines because some shells have a limit on the size
 # of here documents, and old seds have small limits too (100 cmds).
 echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if egrep "^[ 	]*#[ 	]*define" $ac_cs_root.in >/dev/null; then' >>$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 $ac_cs_root.frag.
-  echo '  cat >$ac_cs_root.frag <<CEOF' >>$CONFIG_STATUS
+  # Write a limited-size here document to $tmp/frag.
+  echo '  cat >$tmp/frag <<CEOF' >>$CONFIG_STATUS
   echo '/^[ 	]*#[ 	]*define/!b' >>$CONFIG_STATUS
   sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
   echo 'CEOF
-  sed -f $ac_cs_root.frag $ac_cs_root.in >$ac_cs_root.out
-  rm -f $ac_cs_root.in
-  mv $ac_cs_root.out $ac_cs_root.in
+  sed -f $tmp/frag $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
@@ -11172,14 +11502,14 @@ echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
 rm -f conftest.tail
 while grep . conftest.undefs >/dev/null
 do
-  # Write a limited-size here document to $ac_cs_root.frag.
-  echo '  cat >$ac_cs_root.frag <<CEOF' >>$CONFIG_STATUS
+  # Write a limited-size here document to $tmp/frag.
+  echo '  cat >$tmp/frag <<CEOF' >>$CONFIG_STATUS
   echo '/^[ 	]*#[ 	]*undef/!b' >>$CONFIG_STATUS
   sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
   echo 'CEOF
-  sed -f $ac_cs_root.frag $ac_cs_root.in >$ac_cs_root.out
-  rm -f $ac_cs_root.in
-  mv $ac_cs_root.out $ac_cs_root.in
+  sed -f $tmp/frag $tmp/in >$tmp/out
+  rm -f $tmp/in
+  mv $tmp/out $tmp/in
 ' >>$CONFIG_STATUS
   sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
   rm -f conftest.undefs
@@ -11188,31 +11518,29 @@ done
 rm -f conftest.undefs
 
 cat >>$CONFIG_STATUS <<\EOF
-  rm -f $ac_cs_root.frag $ac_cs_root.h
-  echo "/* $ac_file.  Generated automatically by configure.  */" >$ac_cs_root.h
-  cat $ac_cs_root.in >>$ac_cs_root.h
-  rm -f $ac_cs_root.in
-  if cmp -s $ac_file $ac_cs_root.h 2>/dev/null; then
+  echo "/* $ac_file.  Generated automatically by configure.  */" >$tmp/config.h
+  cat $tmp/in >>$tmp/config.h
+  rm -f $tmp/in
+  if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
     echo "$ac_file is unchanged"
-    rm -f $ac_cs_root.h
   else
     # Remove last slash and all that follows it.  Not all systems have dirname.
     ac_dir=`echo "$ac_file" | sed 's%/[^/][^/]*$%%'`
     if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
       # The file is in a subdirectory.
-      test ! -d "$ac_dir" && mkdir "$ac_dir"
+      test -d "$ac_dir" || mkdir "$ac_dir"
     fi
     rm -f $ac_file
-    mv $ac_cs_root.h $ac_file
+    mv $tmp/config.h $ac_file
   fi
-fi; done
+done
 EOF
 cat >>$CONFIG_STATUS <<\EOF
 
 #
 # CONFIG_COMMANDS section.
 #
-for ac_file in .. $CONFIG_COMMANDS; do if test "x$ac_file" != x..; then
+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%[^:]*:%%'`
 
@@ -11259,7 +11587,7 @@ done
  ;;
     default ) chmod +x scripts/calc_tickadj scripts/checktime scripts/freq_adj scripts/mkver scripts/ntp-wait scripts/ntpsweep scripts/ntpver scripts/plot_summary scripts/summary ;;
   esac
-fi;done
+done
 EOF
 
 cat >>$CONFIG_STATUS <<\EOF
diff --git a/configure.in b/configure.in
index 6235946bd..809aaddf5 100644
--- a/configure.in
+++ b/configure.in
@@ -160,7 +160,6 @@ AC_PROG_RANLIB
 AC_PATH_PROG(PATH_SH, sh)
 AC_PATH_PROG(PATH_PERL, perl)
 
-echo hs_ULONG_CONST
 hs_ULONG_CONST
 
 case "$target" in
@@ -515,7 +514,7 @@ case "$host" in
     ;;
 esac
 
-AC_CHECK_TYPES((s_char))
+AC_CHECK_TYPES(s_char)
 case "$ac_cv_c_char_unsigned$ac_cv_sizeof_signed_char$ac_cv_type_s_char" in
  *yes)
     # We have a typedef for s_char.  Might as well believe it...
@@ -1569,12 +1568,12 @@ dnl AC_MSG_RESULT($ans)
 dnl  AC_CHECK_MEMBERS ((AGGREGATE.MEMBER, ...), [ACTION-IF-FOUND],
 dnl           [ACTION-IF-NOT-FOUND], [INCLUDES])
 
-AC_CHECK_MEMBERS((struct audio_info.monitor_gain,
+AC_CHECK_MEMBERS([struct audio_info.monitor_gain,
     struct audio_info.output_muted,
     struct audio_info.blocksize,
     struct audio_info.hiwat,
     struct audio_info.lowat,
-    struct audio_info.mode), , ,
+    struct audio_info.mode], , ,
 [#ifdef HAVE_SUN_AUDIO_H
 #include <sun/audio.h>
 #endif