Index: ChangeLog
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/ChangeLog,v
retrieving revision 1.1.1.14
retrieving revision 1.1.3.2.4.10
diff -c -r1.1.1.14 -r1.1.3.2.4.10
*** ChangeLog	3 Oct 2005 03:33:40 -0000	1.1.1.14
--- ChangeLog	19 Jul 2006 17:44:55 -0000	1.1.3.2.4.10
***************
*** 3053,3058 ****
--- 3053,3066 ----
  
  	* NEWS (Changes since 1.11.5): Mention UserAdminOptions.
  
+ 2003-02-09  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* configure.in, cvsnt.dsw, acinclude.m4, aclocal.m4, config.h.in, configure, INSTALL, NEWS, FAQ:
+ 	Converged with CVS-current-20030209
+ 
+ 	* depcomp, mdate-sh, noautomake.sh, stamp-h1.in, cvs.spec, cvs.spec.in, cvsnt.dsp, cvsnt.mak, configure.in, config.h.in, configure, build.com, compile, aclocal.m4, README, TESTS, TODO, acconfig.h, acinclude.m4, INSTALL, Makefile.am, Makefile.in, NEWS, DEVEL-CVS, FAQ, HACKING, .cvsignore:
+ 	Interim release 1.11.5 (QC passed)
+ 
  2003-02-06  Derek Price  <derek@ximbiot.com>
  
  	* NEWS (Changes since 1.11.5): Note error message corrections and
***************
*** 3195,3200 ****
--- 3203,3241 ----
  	* .cvsignore: Update autom4te ignore pattern for version number
  	included in path name by new versions of autom4te.
  
+ 2002-11-04  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* depcomp, install-sh, missing, stamp-h.in, stamp-h1.in, configure.in, cvs.spec, cvs.spec.in, cvsnt.dsp, cvsnt.mak, acinclude.m4, aclocal.m4, config.h.in, configure, Makefile.am, Makefile.in, NEWS, TODO, acconfig.h, AUTHORS, INSTALL, .cvsignore:
+ 	Integration build (merged 1.11.1 in 1.11 postfixes). Many things broken.
+ 
+ 	* TODO, stamp-h1.in: Imported the Apr 2001 postfix
+ 
+ 	* stamp-h1.in: New file.
+ 
+ 	* NEWS, missing, mkinstalldirs: Imported the Apr 2001 postfix
+ 
+ 	* missing: New file.
+ 
+ 	* INSTALL, Makefile.am, Makefile.in, install-sh:
+ 	Imported the Apr 2001 postfix
+ 
+ 	* Makefile.am: New file.
+ 
+ 	* cvsnt.dsp, cvsnt.mak, depcomp: Imported the Apr 2001 postfix
+ 
+ 	* depcomp: New file.
+ 
+ 	* configure.in, cvs.spec, cvs.spec.in: Imported the Apr 2001 postfix
+ 
+ 	* cvs.spec.in: New file.
+ 
+ 	* configure, config.h.in, AUTHORS, acconfig.h, acinclude.m4, aclocal.m4:
+ 	Imported the Apr 2001 postfix
+ 
+ 	* AUTHORS, acinclude.m4, aclocal.m4: New file.
+ 
+ 	* .cvsignore: Imported the Apr 2001 postfix
+ 
  2002-10-28  Derek Price  <derek@ximbiot.com>
  
  	* configure.in: Flesh out some comments in regards to Sun Interactive
Index: Makefile.in
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/Makefile.in,v
retrieving revision 1.1.1.11
retrieving revision 1.1.3.1.4.8
diff -c -r1.1.1.11 -r1.1.3.1.4.8
*** Makefile.in	3 Oct 2005 03:37:48 -0000	1.1.1.11
--- Makefile.in	19 Jul 2006 17:44:56 -0000	1.1.3.1.4.8
***************
*** 53,58 ****
--- 53,59 ----
  DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
  	$(srcdir)/cvs.spec.in $(top_srcdir)/configure \
+ 	$(top_srcdir)/emx-new/common.h.in \
  	$(top_srcdir)/emx/Makefile.in $(top_srcdir)/os2/Makefile.in \
  	$(top_srcdir)/zlib/Makefile.in ABOUT-NLS AUTHORS COPYING \
  	COPYING.LIB ChangeLog INSTALL NEWS TODO build-aux/compile \
***************
*** 133,139 ****
  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
   configure.lineno configure.status.lineno
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = config.h
  CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile
  SOURCES =
  DIST_SOURCES =
--- 134,140 ----
  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
   configure.lineno configure.status.lineno
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = config.h $(top_builddir)/emx-new/common.h
  CONFIG_CLEAN_FILES = cvs.spec emx/Makefile os2/Makefile zlib/Makefile
  SOURCES =
  DIST_SOURCES =
***************
*** 187,192 ****
--- 188,194 ----
  GETOPT_H = @GETOPT_H@
  GLOB_H = @GLOB_H@
  GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
  HAVE_LONG_64BIT = @HAVE_LONG_64BIT@
  HAVE_LONG_LONG_64BIT = @HAVE_LONG_LONG_64BIT@
  HAVE__BOOL = @HAVE__BOOL@
***************
*** 249,256 ****
  ZLIB_LIBS = @ZLIB_LIBS@
  ZLIB_SUBDIRS = @ZLIB_SUBDIRS@
  ac_ct_CC = @ac_ct_CC@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
  ac_prefix_program = @ac_prefix_program@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--- 251,256 ----
***************
*** 267,289 ****
--- 267,296 ----
  build_vendor = @build_vendor@
  cvs_client_objects = @cvs_client_objects@
  datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
+ htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
+ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
***************
*** 372,379 ****
  	rm -f stamp-h1
  	touch $@
  
  distclean-hdr:
! 	-rm -f config.h stamp-h1
  cvs.spec: $(top_builddir)/config.status $(srcdir)/cvs.spec.in
  	cd $(top_builddir) && $(SHELL) ./config.status $@
  emx/Makefile: $(top_builddir)/config.status $(top_srcdir)/emx/Makefile.in
--- 379,396 ----
  	rm -f stamp-h1
  	touch $@
  
+ emx-new/common.h: emx-new/stamp-h2
+ 	@if test ! -f $@; then \
+ 	  rm -f emx-new/stamp-h2; \
+ 	  $(MAKE) emx-new/stamp-h2; \
+ 	else :; fi
+ 
+ emx-new/stamp-h2: $(top_srcdir)/emx-new/common.h.in $(top_builddir)/config.status
+ 	@rm -f emx-new/stamp-h2
+ 	cd $(top_builddir) && $(SHELL) ./config.status emx-new/common.h
+ 
  distclean-hdr:
! 	-rm -f config.h stamp-h1 emx-new/common.h emx-new/stamp-h2
  cvs.spec: $(top_builddir)/config.status $(srcdir)/cvs.spec.in
  	cd $(top_builddir) && $(SHELL) ./config.status $@
  emx/Makefile: $(top_builddir)/config.status $(top_srcdir)/emx/Makefile.in
***************
*** 519,525 ****
  distdir: $(DISTFILES)
  	$(am__remove_distdir)
  	mkdir $(distdir)
! 	$(mkdir_p) $(distdir)/. $(distdir)/build-aux $(distdir)/contrib $(distdir)/doc $(distdir)/emx $(distdir)/m4 $(distdir)/os2 $(distdir)/src $(distdir)/zlib
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
  	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  	list='$(DISTFILES)'; for file in $$list; do \
--- 536,542 ----
  distdir: $(DISTFILES)
  	$(am__remove_distdir)
  	mkdir $(distdir)
! 	$(mkdir_p) $(distdir)/. $(distdir)/build-aux $(distdir)/contrib $(distdir)/doc $(distdir)/emx $(distdir)/emx-new $(distdir)/m4 $(distdir)/os2 $(distdir)/src $(distdir)/zlib
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
  	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  	list='$(DISTFILES)'; for file in $$list; do \
Index: aclocal.m4
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/aclocal.m4,v
retrieving revision 1.1.1.7
retrieving revision 1.1.2.7
diff -c -r1.1.1.7 -r1.1.2.7
*** aclocal.m4	3 Oct 2005 03:36:10 -0000	1.1.1.7
--- aclocal.m4	19 Jul 2006 17:44:56 -0000	1.1.2.7
***************
*** 11,27 ****
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
! # Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
! #
! # This file is free software; the Free Software Foundation
! # gives unlimited permission to copy and/or distribute it,
! # with or without modifications, as long as this notice is preserved.
  
  # AM_AUTOMAKE_VERSION(VERSION)
  # ----------------------------
  # Automake X.Y traces this macro to ensure aclocal.m4 has been
  # generated from the m4 files accompanying Automake X.Y.
! AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
  
  # AM_SET_CURRENT_AUTOMAKE_VERSION
  # -------------------------------
--- 11,37 ----
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
! # Copyright 2002  Free Software Foundation, Inc.
! 
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2, or (at your option)
! # any later version.
! 
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
! # GNU General Public License for more details.
! 
! # You should have received a copy of the GNU General Public License
! # along with this program; if not, write to the Free Software
! # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  
  # AM_AUTOMAKE_VERSION(VERSION)
  # ----------------------------
  # Automake X.Y traces this macro to ensure aclocal.m4 has been
  # generated from the m4 files accompanying Automake X.Y.
! AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.9"])
  
  # AM_SET_CURRENT_AUTOMAKE_VERSION
  # -------------------------------
Index: configure
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/configure,v
retrieving revision 1.1.1.13
retrieving revision 1.1.3.1.4.10
diff -c -r1.1.1.13 -r1.1.3.1.4.10
*** configure	3 Oct 2005 03:36:20 -0000	1.1.1.13
--- configure	19 Jul 2006 17:44:56 -0000	1.1.3.1.4.10
***************
*** 1,6 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.59 for Concurrent Versions System (CVS) 1.12.13.
  #
  # Report bugs to <bug-cvs@nongnu.org>.
  #
--- 1,6 ----
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.59cvs-20051231 for Concurrent Versions System (CVS) 1.12.13.
  #
  # Report bugs to <bug-cvs@nongnu.org>.
  #
***************
*** 18,24 ****
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  # GNU General Public License for more details.
  #
! # Copyright (C) 2003 Free Software Foundation, Inc.
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
  ## --------------------- ##
--- 18,25 ----
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  # GNU General Public License for more details.
  #
! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
! # 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
  ## --------------------- ##
***************
*** 32,42 ****
    # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
! elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
    set -o posix
  fi
  DUALCASE=1; export DUALCASE # for MKS sh
  
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
    as_unset=unset
--- 33,67 ----
    # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
!   setopt NO_GLOB_SUBST
! elif (set -o posix) >/dev/null 2>&1; then
    set -o posix
  fi
+ BIN_SH=xpg4; export BIN_SH # for Tru64
  DUALCASE=1; export DUALCASE # for MKS sh
  
+ 
+ # PATH needs CR
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+   echo "#! /bin/sh" >conf$$.sh
+   echo  "exit 0"   >>conf$$.sh
+   chmod +x conf$$.sh
+   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+     PATH_SEPARATOR=';'
+   else
+     PATH_SEPARATOR=:
+   fi
+   rm -f conf$$.sh
+ fi
+ 
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
    as_unset=unset
***************
*** 45,52 ****
  fi
  
  
  # Work around bugs in pre-3.0 UWIN ksh.
! $as_unset ENV MAIL MAILPATH
  PS1='$ '
  PS2='> '
  PS4='+ '
--- 70,103 ----
  fi
  
  
+ # Find who we are.  Look in the path if we contain no path at all
+ # relative or not.
+ case $0 in
+   *[\\/]* ) as_myself=$0 ;;
+   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+ 
+      ;;
+ esac
+ # We did not find ourselves, most probably we were run as `sh COMMAND'
+ # in which case we are not to be found in the path.
+ if test "x$as_myself" = x; then
+   as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+   { echo "$as_me: error: cannot find myself; rerun with an absolute file name" >&2
+    { (exit 1); exit 1; }; }
+ fi
+ 
  # Work around bugs in pre-3.0 UWIN ksh.
! for as_var in ENV MAIL MAILPATH
! do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
! done
  PS1='$ '
  PS2='> '
  PS4='+ '
***************
*** 60,66 ****
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
!     $as_unset $as_var
    fi
  done
  
--- 111,117 ----
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
!     ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
    fi
  done
  
***************
*** 91,191 ****
    	  s/.*/./; q'`
  
  
- # PATH needs CR, and LINENO needs CR and PATH.
- # Avoid depending upon Character Ranges.
- as_cr_letters='abcdefghijklmnopqrstuvwxyz'
- as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
- as_cr_Letters=$as_cr_letters$as_cr_LETTERS
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
  
! # The user is always right.
! if test "${PATH_SEPARATOR+set}" != set; then
!   echo "#! /bin/sh" >conf$$.sh
!   echo  "exit 0"   >>conf$$.sh
!   chmod +x conf$$.sh
!   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
!     PATH_SEPARATOR=';'
!   else
!     PATH_SEPARATOR=:
!   fi
!   rm -f conf$$.sh
  fi
  
  
!   as_lineno_1=$LINENO
!   as_lineno_2=$LINENO
!   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
!   test "x$as_lineno_1" != "x$as_lineno_2" &&
!   test "x$as_lineno_3"  = "x$as_lineno_2"  || {
!   # Find who we are.  Look in the path if we contain no path at all
!   # relative or not.
!   case $0 in
!     *[\\/]* ) as_myself=$0 ;;
!     *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
! for as_dir in $PATH
! do
!   IFS=$as_save_IFS
!   test -z "$as_dir" && as_dir=.
!   test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
! done
  
!        ;;
!   esac
!   # We did not find ourselves, most probably we were run as `sh COMMAND'
!   # in which case we are not to be found in the path.
!   if test "x$as_myself" = x; then
!     as_myself=$0
!   fi
!   if test ! -f "$as_myself"; then
!     { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
!    { (exit 1); exit 1; }; }
!   fi
!   case $CONFIG_SHELL in
!   '')
      as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
!   for as_base in sh bash ksh sh5; do
! 	 case $as_dir in
  	 /*)
! 	   if ("$as_dir/$as_base" -c '
    as_lineno_1=$LINENO
    as_lineno_2=$LINENO
-   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
    test "x$as_lineno_1" != "x$as_lineno_2" &&
!   test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
! 	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
! 	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
! 	     CONFIG_SHELL=$as_dir/$as_base
! 	     export CONFIG_SHELL
! 	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
! 	   fi;;
! 	 esac
!        done
! done
! ;;
!   esac
  
    # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
    # uniformly replaced by the line number.  The first 'sed' inserts a
!   # line-number line before each line; the second 'sed' does the real
!   # work.  The second script uses 'N' to pair each line-number line
!   # with the numbered line, and appends trailing '-' during
!   # substitution so that $LINENO is not a special case at line end.
    # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
!   # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
!   sed '=' <$as_myself |
      sed '
        N
!       s,$,-,
!       : loop
!       s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
        t loop
!       s,-$,,
!       s,^['$as_cr_digits']*\n,,
      ' >$as_me.lineno &&
    chmod +x $as_me.lineno ||
      { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
--- 142,441 ----
    	  s/.*/./; q'`
  
  
  
! if test "x$CONFIG_SHELL" = x; then
!   if (eval ":") 2>/dev/null; then
!   as_have_required=yes
! else
!   as_have_required=no
  fi
  
+   if test $as_have_required = yes && 	 (eval ":
+ (as_func_return () {
+   (exit \$1)
+ }
+ as_func_success () {
+   as_func_return 0
+ }
+ as_func_failure () {
+   as_func_return 1
+ }
+ as_func_ret_success () {
+   return 0
+ }
+ as_func_ret_failure () {
+   return 1
+ }
  
! exitcode=0
! if as_func_success; then
!   :
! else
!   exitcode=1
!   echo as_func_success failed.
! fi
  
! if as_func_failure; then
!   exitcode=1
!   echo as_func_failure succeeded.
! fi
! 
! if as_func_ret_success; then
!   :
! else
!   exitcode=1
!   echo as_func_ret_success failed.
! fi
! 
! if as_func_ret_failure; then
!   exitcode=1
!   echo as_func_ret_failure succeeded.
! fi
! 
! if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
!   :
! else
!   exitcode=1
!   echo positional parameters were not saved.
! fi
! 
! test \$exitcode = 0) || { (exit 1); exit 1; }
! 
! (
!   as_lineno_1=\$LINENO
!   as_lineno_2=\$LINENO
!   test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
!   test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
! ") 2> /dev/null; then
!   :
! else
!   as_candidate_shells=
      as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
!   case $as_dir in
  	 /*)
! 	   for as_base in sh bash ksh sh5; do
! 	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
! 	   done
!        esac
! done
! 
! 
!       for as_shell in $as_candidate_shells $SHELL; do
! 	 if { ($as_shell) 2> /dev/null <<\_ASEOF
! # Be Bourne compatible
! if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
!   emulate sh
!   NULLCMD=:
!   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
!   # is contrary to our usage.  Disable this feature.
!   alias -g '${1+"$@"}'='"$@"'
!   setopt NO_GLOB_SUBST
! elif (set -o posix) >/dev/null 2>&1; then
!   set -o posix
! fi
! BIN_SH=xpg4; export BIN_SH # for Tru64
! DUALCASE=1; export DUALCASE # for MKS sh
! 
! :
! _ASEOF
! }; then
!   CONFIG_SHELL=$as_shell
! 	       as_have_required=yes
! 	       if { $as_shell 2> /dev/null <<\_ASEOF
! # Be Bourne compatible
! if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
!   emulate sh
!   NULLCMD=:
!   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
!   # is contrary to our usage.  Disable this feature.
!   alias -g '${1+"$@"}'='"$@"'
!   setopt NO_GLOB_SUBST
! elif (set -o posix) >/dev/null 2>&1; then
!   set -o posix
! fi
! BIN_SH=xpg4; export BIN_SH # for Tru64
! DUALCASE=1; export DUALCASE # for MKS sh
! 
! :
! (as_func_return () {
!   (exit $1)
! }
! as_func_success () {
!   as_func_return 0
! }
! as_func_failure () {
!   as_func_return 1
! }
! as_func_ret_success () {
!   return 0
! }
! as_func_ret_failure () {
!   return 1
! }
! 
! exitcode=0
! if as_func_success; then
!   :
! else
!   exitcode=1
!   echo as_func_success failed.
! fi
! 
! if as_func_failure; then
!   exitcode=1
!   echo as_func_failure succeeded.
! fi
! 
! if as_func_ret_success; then
!   :
! else
!   exitcode=1
!   echo as_func_ret_success failed.
! fi
! 
! if as_func_ret_failure; then
!   exitcode=1
!   echo as_func_ret_failure succeeded.
! fi
! 
! if ( set x; as_func_ret_success y && test x = "$1" ); then
!   :
! else
!   exitcode=1
!   echo positional parameters were not saved.
! fi
! 
! test $exitcode = 0) || { (exit 1); exit 1; }
! 
! (
    as_lineno_1=$LINENO
    as_lineno_2=$LINENO
    test "x$as_lineno_1" != "x$as_lineno_2" &&
!   test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
! 
! _ASEOF
! }; then
!   break
! fi
! 
! fi
! 
!       done
! 
!       if test "x$CONFIG_SHELL" != x; then
!   for as_var in BASH_ENV ENV
!         do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
!         done
!         export CONFIG_SHELL
!         exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
! fi
! 
! 
!     if test $as_have_required = no; then
!   echo This script requires a shell more modern than all the
!       echo shells that I found on your system.  Please install a
!       echo modern shell, or manually run the script under such a
!       echo shell if you do have one.
!       { (exit 1); exit 1; }
! fi
! 
! 
! fi
! 
! fi
! 
! 
! 
! (eval "as_func_return () {
!   (exit \$1)
! }
! as_func_success () {
!   as_func_return 0
! }
! as_func_failure () {
!   as_func_return 1
! }
! as_func_ret_success () {
!   return 0
! }
! as_func_ret_failure () {
!   return 1
! }
! 
! exitcode=0
! if as_func_success; then
!   :
! else
!   exitcode=1
!   echo as_func_success failed.
! fi
! 
! if as_func_failure; then
!   exitcode=1
!   echo as_func_failure succeeded.
! fi
! 
! if as_func_ret_success; then
!   :
! else
!   exitcode=1
!   echo as_func_ret_success failed.
! fi
! 
! if as_func_ret_failure; then
!   exitcode=1
!   echo as_func_ret_failure succeeded.
! fi
! 
! if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
!   :
! else
!   exitcode=1
!   echo positional parameters were not saved.
! fi
! 
! test \$exitcode = 0") || {
!   echo No shell found that supports shell functions.
!   echo Please tell autoconf@gnu.org about your system,
!   echo including any error possibly output before this
!   echo message
! }
! 
! 
! 
!   as_lineno_1=$LINENO
!   as_lineno_2=$LINENO
!   test "x$as_lineno_1" != "x$as_lineno_2" &&
!   test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
  
    # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
    # uniformly replaced by the line number.  The first 'sed' inserts a
!   # line-number line after each line using $LINENO; the second 'sed'
!   # does the real work.  The second script uses 'N' to pair each
!   # line-number line with the line containing $LINENO, and appends
!   # trailing '-' during substitution so that $LINENO is not a special
!   # case at line end.
    # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
!   # scripts with optimization help from Paolo Bonzini.  Blame Lee
!   # E. McMahon (1931-1989) for sed's syntax.  :-)
!   sed -n '
!     p
!     /[$]LINENO/=
!   ' <$as_myself |
      sed '
+       s,[$]LINENO.*,&-,
+       t lineno
+       b
+       :lineno
        N
!       :loop
!       s,[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\),\2\1\2,
        t loop
!       s,-\n.*,,
      ' >$as_me.lineno &&
    chmod +x $as_me.lineno ||
      { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
***************
*** 200,210 ****
  }
  
  
! case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
!   *c*,-n*) ECHO_N= ECHO_C='
! ' ECHO_T='	' ;;
!   *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
!   *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
  esac
  
  if expr a : '\(a\)' >/dev/null 2>&1; then
--- 450,464 ----
  }
  
  
! ECHO_C= ECHO_N= ECHO_T=
! case `echo -n x` in
! -n*)
!   case `echo 'x\c'` in
!   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
!   *)   ECHO_C='\c';;
!   esac;;
! *)
!   ECHO_N='-n';;
  esac
  
  if expr a : '\(a\)' >/dev/null 2>&1; then
***************
*** 238,244 ****
    as_mkdir_p=false
  fi
  
! as_executable_p="test -f"
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
--- 492,510 ----
    as_mkdir_p=false
  fi
  
! # Find out whether ``test -x'' works.  Don't use a zero-byte file, as
! # systems may use methods other than mode bits to determine executability.
! cat >conf$$.file <<_ASEOF
! #! /bin/sh
! exit 0
! _ASEOF
! chmod +x conf$$.file
! if test -x conf$$.file >/dev/null 2>&1; then
!   as_executable_p="test -x"
! else
!   as_executable_p=:
! fi
! rm -f conf$$.file
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
***************
*** 257,285 ****
  $as_unset CDPATH
  
  
  # Name of the host.
  # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
  # so uname gets run too.
  ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
  
- exec 6>&1
- 
  #
  # Initializations.
  #
  ac_default_prefix=/usr/local
  ac_config_libobj_dir=.
  cross_compiling=no
  subdirs=
  MFLAGS=
  MAKEFLAGS=
  SHELL=${CONFIG_SHELL-/bin/sh}
  
- # Maximum number of lines to put in a shell here document.
- # This variable seems obsolete.  It should probably be removed, and
- # only ac_max_sed_lines should be used.
- : ${ac_max_here_lines=38}
- 
  # Identity of this package.
  PACKAGE_NAME='Concurrent Versions System (CVS)'
  PACKAGE_TARNAME='cvs'
--- 523,548 ----
  $as_unset CDPATH
  
  
+ exec 7<&0 </dev/null 6>&1
+ 
  # Name of the host.
  # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
  # so uname gets run too.
  ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
  
  #
  # Initializations.
  #
  ac_default_prefix=/usr/local
+ ac_clean_files=
  ac_config_libobj_dir=.
+ LIBOBJS=
  cross_compiling=no
  subdirs=
  MFLAGS=
  MAKEFLAGS=
  SHELL=${CONFIG_SHELL-/bin/sh}
  
  # Identity of this package.
  PACKAGE_NAME='Concurrent Versions System (CVS)'
  PACKAGE_TARNAME='cvs'
***************
*** 316,325 ****
  #endif
  #if HAVE_INTTYPES_H
  # include <inttypes.h>
! #else
! # if HAVE_STDINT_H
! #  include <stdint.h>
! # endif
  #endif
  #if HAVE_UNISTD_H
  # include <unistd.h>
--- 579,587 ----
  #endif
  #if HAVE_INTTYPES_H
  # include <inttypes.h>
! #endif
! #if HAVE_STDINT_H
! # include <stdint.h>
  #endif
  #if HAVE_UNISTD_H
  # include <unistd.h>
***************
*** 327,334 ****
  
  gl_func_list=
  gl_header_list=
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ac_prefix_program MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP RANLIB ac_ct_RANLIB LN_S PERL CSH MKTEMP SENDMAIL PR ROFF PS2PDF TEXI2DVI MAKE_TARGETS_IN_VPATH_TRUE MAKE_TARGETS_IN_VPATH_FALSE LIBOBJS ALLOCA ALLOCA_H STDBOOL_H HAVE__BOOL FNMATCH_H YACC YFLAGS LIB_CLOCK_GETTIME GETOPT_H GLOB_H LIB_NANOSLEEP HAVE_LONG_64BIT HAVE_LONG_LONG_64BIT STDINT_H EOVERFLOW MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB cvs_client_objects KRB4 ZLIB_SUBDIRS ZLIB_CPPFLAGS ZLIB_LIBS with_default_rsh RSH_DFLT EDITOR LTLIBOBJS'
  ac_subst_files='MKTEMP_SH_FUNCTION'
  
  # Initialize some variables set by options.
  ac_init_help=
--- 589,746 ----
  
  gl_func_list=
  gl_header_list=
! ac_subst_vars='SHELL
! PATH_SEPARATOR
! PACKAGE_NAME
! PACKAGE_TARNAME
! PACKAGE_VERSION
! PACKAGE_STRING
! PACKAGE_BUGREPORT
! exec_prefix
! prefix
! program_transform_name
! bindir
! sbindir
! libexecdir
! datarootdir
! datadir
! sysconfdir
! sharedstatedir
! localstatedir
! includedir
! oldincludedir
! docdir
! infodir
! htmldir
! dvidir
! pdfdir
! psdir
! libdir
! localedir
! mandir
! DEFS
! ECHO_C
! ECHO_N
! ECHO_T
! LIBS
! build_alias
! host_alias
! target_alias
! INSTALL_PROGRAM
! INSTALL_SCRIPT
! INSTALL_DATA
! CYGPATH_W
! PACKAGE
! VERSION
! ACLOCAL
! AUTOCONF
! AUTOMAKE
! AUTOHEADER
! MAKEINFO
! install_sh
! STRIP
! INSTALL_STRIP_PROGRAM
! mkdir_p
! AWK
! SET_MAKE
! am__leading_dot
! AMTAR
! am__tar
! am__untar
! ac_prefix_program
! MAINTAINER_MODE_TRUE
! MAINTAINER_MODE_FALSE
! MAINT
! CC
! CFLAGS
! LDFLAGS
! CPPFLAGS
! ac_ct_CC
! EXEEXT
! OBJEXT
! DEPDIR
! am__include
! am__quote
! AMDEP_TRUE
! AMDEP_FALSE
! AMDEPBACKSLASH
! CCDEPMODE
! am__fastdepCC_TRUE
! am__fastdepCC_FALSE
! CPP
! GREP
! EGREP
! RANLIB
! LN_S
! PERL
! CSH
! MKTEMP
! SENDMAIL
! PR
! ROFF
! PS2PDF
! TEXI2DVI
! MAKE_TARGETS_IN_VPATH_TRUE
! MAKE_TARGETS_IN_VPATH_FALSE
! LIBOBJS
! ALLOCA
! ALLOCA_H
! STDBOOL_H
! HAVE__BOOL
! FNMATCH_H
! YACC
! YFLAGS
! LIB_CLOCK_GETTIME
! GETOPT_H
! GLOB_H
! LIB_NANOSLEEP
! HAVE_LONG_64BIT
! HAVE_LONG_LONG_64BIT
! STDINT_H
! EOVERFLOW
! MKINSTALLDIRS
! USE_NLS
! MSGFMT
! GMSGFMT
! XGETTEXT
! MSGMERGE
! build
! build_cpu
! build_vendor
! build_os
! host
! host_cpu
! host_vendor
! host_os
! INTL_MACOSX_LIBS
! LIBICONV
! LTLIBICONV
! INTLLIBS
! LIBINTL
! LTLIBINTL
! POSUB
! cvs_client_objects
! KRB4
! ZLIB_SUBDIRS
! ZLIB_CPPFLAGS
! ZLIB_LIBS
! with_default_rsh
! RSH_DFLT
! EDITOR
! LTLIBOBJS'
  ac_subst_files='MKTEMP_SH_FUNCTION'
+       ac_precious_vars='build_alias
+ host_alias
+ target_alias
+ CC
+ CFLAGS
+ LDFLAGS
+ CPPFLAGS
+ CPP
+ YACC
+ YFLAGS
+ EDITOR'
+ 
  
  # Initialize some variables set by options.
  ac_init_help=
***************
*** 355,388 ****
  # and all the variables that are supposed to be based on exec_prefix
  # by default will actually change.
  # Use braces instead of parens because sh, perl, etc. also accept them.
  bindir='${exec_prefix}/bin'
  sbindir='${exec_prefix}/sbin'
  libexecdir='${exec_prefix}/libexec'
! datadir='${prefix}/share'
  sysconfdir='${prefix}/etc'
  sharedstatedir='${prefix}/com'
  localstatedir='${prefix}/var'
- libdir='${exec_prefix}/lib'
  includedir='${prefix}/include'
  oldincludedir='/usr/include'
! infodir='${prefix}/info'
! mandir='${prefix}/man'
  
  ac_prev=
  for ac_option
  do
    # If the previous option needs an argument, assign it.
    if test -n "$ac_prev"; then
!     eval "$ac_prev=\$ac_option"
      ac_prev=
      continue
    fi
  
!   ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
  
    # Accept the important Cygnus configure options, so we can diagnose typos.
  
!   case $ac_option in
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
--- 767,814 ----
  # and all the variables that are supposed to be based on exec_prefix
  # by default will actually change.
  # Use braces instead of parens because sh, perl, etc. also accept them.
+ # (The list follows the same order as the GNU Coding Standards.)
  bindir='${exec_prefix}/bin'
  sbindir='${exec_prefix}/sbin'
  libexecdir='${exec_prefix}/libexec'
! datarootdir='${prefix}/share'
! datadir='${datarootdir}'
  sysconfdir='${prefix}/etc'
  sharedstatedir='${prefix}/com'
  localstatedir='${prefix}/var'
  includedir='${prefix}/include'
  oldincludedir='/usr/include'
! docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
! infodir='${datarootdir}/info'
! htmldir='${docdir}'
! dvidir='${docdir}'
! pdfdir='${docdir}'
! psdir='${docdir}'
! libdir='${exec_prefix}/lib'
! localedir='${datarootdir}/locale'
! mandir='${datarootdir}/man'
  
  ac_prev=
+ ac_dashdash=
  for ac_option
  do
    # If the previous option needs an argument, assign it.
    if test -n "$ac_prev"; then
!     eval $ac_prev=\$ac_option
      ac_prev=
      continue
    fi
  
!   case $ac_option in
!   *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
!   *)	ac_optarg=yes ;;
!   esac
  
    # Accept the important Cygnus configure options, so we can diagnose typos.
  
!   case $ac_dashdash$ac_option in
!   --)
!     ac_dashdash=yes ;;
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
***************
*** 404,415 ****
    --config-cache | -C)
      cache_file=config.cache ;;
  
!   -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
      ac_prev=datadir ;;
!   -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
!   | --da=*)
      datadir=$ac_optarg ;;
  
    -disable-* | --disable-*)
      ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
--- 830,847 ----
    --config-cache | -C)
      cache_file=config.cache ;;
  
!   -datadir | --datadir | --datadi | --datad)
      ac_prev=datadir ;;
!   -datadir=* | --datadir=* | --datadi=* | --datad=*)
      datadir=$ac_optarg ;;
  
+   -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+   | --dataroo | --dataro | --datar)
+     ac_prev=datarootdir ;;
+   -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+   | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+     datarootdir=$ac_optarg ;;
+ 
    -disable-* | --disable-*)
      ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
***************
*** 417,423 ****
        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
     { (exit 1); exit 1; }; }
      ac_feature=`echo $ac_feature | sed 's/-/_/g'`
!     eval "enable_$ac_feature=no" ;;
  
    -enable-* | --enable-*)
      ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
--- 849,865 ----
        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
     { (exit 1); exit 1; }; }
      ac_feature=`echo $ac_feature | sed 's/-/_/g'`
!     eval enable_$ac_feature=no ;;
! 
!   -docdir | --docdir | --docdi | --doc | --do)
!     ac_prev=docdir ;;
!   -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
!     docdir=$ac_optarg ;;
! 
!   -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
!     ac_prev=dvidir ;;
!   -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
!     dvidir=$ac_optarg ;;
  
    -enable-* | --enable-*)
      ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
***************
*** 426,436 ****
        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
     { (exit 1); exit 1; }; }
      ac_feature=`echo $ac_feature | sed 's/-/_/g'`
!     case $ac_option in
!       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
!       *) ac_optarg=yes ;;
!     esac
!     eval "enable_$ac_feature='$ac_optarg'" ;;
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
--- 868,874 ----
        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
     { (exit 1); exit 1; }; }
      ac_feature=`echo $ac_feature | sed 's/-/_/g'`
!     eval enable_$ac_feature=\$ac_optarg ;;
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
***************
*** 457,462 ****
--- 895,906 ----
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
+   -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+     ac_prev=htmldir ;;
+   -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+   | --ht=*)
+     htmldir=$ac_optarg ;;
+ 
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
***************
*** 481,493 ****
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
    -localstatedir | --localstatedir | --localstatedi | --localstated \
!   | --localstate | --localstat | --localsta | --localst \
!   | --locals | --local | --loca | --loc | --lo)
      ac_prev=localstatedir ;;
    -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
!   | --localstate=* | --localstat=* | --localsta=* | --localst=* \
!   | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
--- 925,940 ----
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
+   -localedir | --localedir | --localedi | --localed | --locale)
+     ac_prev=localedir ;;
+   -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+     localedir=$ac_optarg ;;
+ 
    -localstatedir | --localstatedir | --localstatedi | --localstated \
!   | --localstate | --localstat | --localsta | --localst | --locals)
      ac_prev=localstatedir ;;
    -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
!   | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
***************
*** 552,557 ****
--- 999,1014 ----
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
+   -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+     ac_prev=pdfdir ;;
+   -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+     pdfdir=$ac_optarg ;;
+ 
+   -psdir | --psdir | --psdi | --psd | --ps)
+     ac_prev=psdir ;;
+   -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+     psdir=$ac_optarg ;;
+ 
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
***************
*** 608,618 ****
        { echo "$as_me: error: invalid package name: $ac_package" >&2
     { (exit 1); exit 1; }; }
      ac_package=`echo $ac_package| sed 's/-/_/g'`
!     case $ac_option in
!       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
!       *) ac_optarg=yes ;;
!     esac
!     eval "with_$ac_package='$ac_optarg'" ;;
  
    -without-* | --without-*)
      ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
--- 1065,1071 ----
        { echo "$as_me: error: invalid package name: $ac_package" >&2
     { (exit 1); exit 1; }; }
      ac_package=`echo $ac_package| sed 's/-/_/g'`
!     eval with_$ac_package=\$ac_optarg ;;
  
    -without-* | --without-*)
      ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
***************
*** 621,627 ****
        { echo "$as_me: error: invalid package name: $ac_package" >&2
     { (exit 1); exit 1; }; }
      ac_package=`echo $ac_package | sed 's/-/_/g'`
!     eval "with_$ac_package=no" ;;
  
    --x)
      # Obsolete; use --with-x.
--- 1074,1080 ----
        { echo "$as_me: error: invalid package name: $ac_package" >&2
     { (exit 1); exit 1; }; }
      ac_package=`echo $ac_package | sed 's/-/_/g'`
!     eval with_$ac_package=no ;;
  
    --x)
      # Obsolete; use --with-x.
***************
*** 652,659 ****
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
!     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
!     eval "$ac_envvar='$ac_optarg'"
      export $ac_envvar ;;
  
    *)
--- 1105,1111 ----
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
!     eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
  
    *)
***************
*** 673,699 ****
     { (exit 1); exit 1; }; }
  fi
  
! # Be sure to have absolute paths.
! for ac_var in exec_prefix prefix
! do
!   eval ac_val=$`echo $ac_var`
!   case $ac_val in
!     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
!     *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
!    { (exit 1); exit 1; }; };;
!   esac
! done
! 
! # Be sure to have absolute paths.
! for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
! 	      localstatedir libdir includedir oldincludedir infodir mandir
  do
!   eval ac_val=$`echo $ac_var`
    case $ac_val in
!     [\\/$]* | ?:[\\/]* ) ;;
!     *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
!    { (exit 1); exit 1; }; };;
    esac
  done
  
  # There might be people who depend on the old broken behavior: `$host'
--- 1125,1143 ----
     { (exit 1); exit 1; }; }
  fi
  
! # Be sure to have absolute directory names.
! for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
! 		datadir sysconfdir sharedstatedir localstatedir includedir \
! 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
! 		libdir localedir mandir
  do
!   eval ac_val=\$$ac_var
    case $ac_val in
!     [\\/$]* | ?:[\\/]* )  continue;;
!     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
+   { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+    { (exit 1); exit 1; }; }
  done
  
  # There might be people who depend on the old broken behavior: `$host'
***************
*** 720,729 ****
  test "$silent" = yes && exec 6>/dev/null
  
  
  # 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_confdir=`(dirname "$0") 2>/dev/null ||
  $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  	 X"$0" : 'X\(//\)[^/]' \| \
--- 1164,1183 ----
  test "$silent" = yes && exec 6>/dev/null
  
  
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+   { echo "$as_me: error: Working directory cannot be determined" >&2
+    { (exit 1); exit 1; }; }
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+   { echo "$as_me: error: pwd does not report name of working directory" >&2
+    { (exit 1); exit 1; }; }
+ 
+ 
  # 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 the parent directory.
    ac_confdir=`(dirname "$0") 2>/dev/null ||
  $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  	 X"$0" : 'X\(//\)[^/]' \| \
***************
*** 737,805 ****
    	  /^X\(\/\).*/{ s//\1/; q; }
    	  s/.*/./; q'`
    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 "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
!    { (exit 1); exit 1; }; }
!   else
!     { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
     { (exit 1); exit 1; }; }
-   fi
  fi
! (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
!   { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
     { (exit 1); exit 1; }; }
! srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
! ac_env_build_alias_set=${build_alias+set}
! ac_env_build_alias_value=$build_alias
! ac_cv_env_build_alias_set=${build_alias+set}
! ac_cv_env_build_alias_value=$build_alias
! ac_env_host_alias_set=${host_alias+set}
! ac_env_host_alias_value=$host_alias
! ac_cv_env_host_alias_set=${host_alias+set}
! ac_cv_env_host_alias_value=$host_alias
! ac_env_target_alias_set=${target_alias+set}
! ac_env_target_alias_value=$target_alias
! ac_cv_env_target_alias_set=${target_alias+set}
! ac_cv_env_target_alias_value=$target_alias
! ac_env_CC_set=${CC+set}
! ac_env_CC_value=$CC
! ac_cv_env_CC_set=${CC+set}
! ac_cv_env_CC_value=$CC
! ac_env_CFLAGS_set=${CFLAGS+set}
! ac_env_CFLAGS_value=$CFLAGS
! ac_cv_env_CFLAGS_set=${CFLAGS+set}
! ac_cv_env_CFLAGS_value=$CFLAGS
! ac_env_LDFLAGS_set=${LDFLAGS+set}
! ac_env_LDFLAGS_value=$LDFLAGS
! ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
! ac_cv_env_LDFLAGS_value=$LDFLAGS
! ac_env_CPPFLAGS_set=${CPPFLAGS+set}
! ac_env_CPPFLAGS_value=$CPPFLAGS
! ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
! ac_cv_env_CPPFLAGS_value=$CPPFLAGS
! ac_env_CPP_set=${CPP+set}
! ac_env_CPP_value=$CPP
! ac_cv_env_CPP_set=${CPP+set}
! ac_cv_env_CPP_value=$CPP
! ac_env_YACC_set=${YACC+set}
! ac_env_YACC_value=$YACC
! ac_cv_env_YACC_set=${YACC+set}
! ac_cv_env_YACC_value=$YACC
! ac_env_YFLAGS_set=${YFLAGS+set}
! ac_env_YFLAGS_value=$YFLAGS
! ac_cv_env_YFLAGS_set=${YFLAGS+set}
! ac_cv_env_YFLAGS_value=$YFLAGS
! ac_env_EDITOR_set=${EDITOR+set}
! ac_env_EDITOR_value=$EDITOR
! ac_cv_env_EDITOR_set=${EDITOR+set}
! ac_cv_env_EDITOR_value=$EDITOR
  
  #
  # Report the --help message.
--- 1191,1228 ----
    	  /^X\(\/\).*/{ s//\1/; q; }
    	  s/.*/./; q'`
    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
!   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
!   { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
     { (exit 1); exit 1; }; }
  fi
! ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
! ac_abs_confdir=`(
! 	cd $srcdir && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
     { (exit 1); exit 1; }; }
! 	pwd)`
! # When building in place, set srcdir=.
! if test "$ac_abs_confdir" = "$ac_pwd"; then
!   srcdir=.
! fi
! # Remove unnecessary trailing slashes from srcdir.
! # Double slashes in file names in object file debugging info
! # mess up M-x gdb in Emacs.
! case $srcdir in
! */) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
! esac
! for ac_var in $ac_precious_vars; do
!   eval ac_env_${ac_var}_set=\${${ac_var}+set}
!   eval ac_env_${ac_var}_value=\$${ac_var}
!   eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
!   eval ac_cv_env_${ac_var}_value=\$${ac_var}
! done
  
  #
  # Report the --help message.
***************
*** 828,836 ****
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  
- _ACEOF
- 
-   cat <<_ACEOF
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
  			  [$ac_default_prefix]
--- 1251,1256 ----
***************
*** 848,862 ****
    --bindir=DIR           user executables [EPREFIX/bin]
    --sbindir=DIR          system admin executables [EPREFIX/sbin]
    --libexecdir=DIR       program executables [EPREFIX/libexec]
-   --datadir=DIR          read-only architecture-independent data [PREFIX/share]
    --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
    --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
    --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
    --libdir=DIR           object code libraries [EPREFIX/lib]
    --includedir=DIR       C header files [PREFIX/include]
    --oldincludedir=DIR    C header files for non-gcc [/usr/include]
!   --infodir=DIR          info documentation [PREFIX/info]
!   --mandir=DIR           man documentation [PREFIX/man]
  _ACEOF
  
    cat <<\_ACEOF
--- 1268,1289 ----
    --bindir=DIR           user executables [EPREFIX/bin]
    --sbindir=DIR          system admin executables [EPREFIX/sbin]
    --libexecdir=DIR       program executables [EPREFIX/libexec]
    --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]
!   --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
!   --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
!   --infodir=DIR          info documentation [DATAROOTDIR/info]
!   --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
!   --mandir=DIR           man documentation [DATAROOTDIR/man]
!   --docdir=DIR           documentation root [DATAROOTDIR/doc/cvs]
!   --htmldir=DIR          html documentation [DOCDIR]
!   --dvidir=DIR           dvi documentation [DOCDIR]
!   --pdfdir=DIR           pdf documentation [DOCDIR]
!   --psdir=DIR            ps documentation [DOCDIR]
  _ACEOF
  
    cat <<\_ACEOF
***************
*** 1034,1137 ****
  
  Report bugs to <bug-cvs@nongnu.org>.
  _ACEOF
  fi
  
  if test "$ac_init_help" = "recursive"; then
    # If there are subdirs, report their specific --help.
-   ac_popdir=`pwd`
    for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
      test -d $ac_dir || continue
      ac_builddir=.
  
! if test "$ac_dir" != .; then
    ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
!   # A "../" for each directory in $ac_dir_suffix.
!   ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
! else
!   ac_dir_suffix= ac_top_builddir=
! fi
  
  case $srcdir in
!   .)  # No --srcdir option.  We are building in place.
      ac_srcdir=.
!     if test -z "$ac_top_builddir"; then
!        ac_top_srcdir=.
!     else
!        ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
!     fi ;;
!   [\\/]* | ?:[\\/]* )  # Absolute path.
      ac_srcdir=$srcdir$ac_dir_suffix;
!     ac_top_srcdir=$srcdir ;;
!   *) # Relative path.
!     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
!     ac_top_srcdir=$ac_top_builddir$srcdir ;;
! esac
! 
! # Do not use `cd foo && pwd` to compute absolute paths, because
! # the directories may not exist.
! case `pwd` in
! .) ac_abs_builddir="$ac_dir";;
! *)
!   case "$ac_dir" in
!   .) ac_abs_builddir=`pwd`;;
!   [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
!   *) ac_abs_builddir=`pwd`/"$ac_dir";;
!   esac;;
! esac
! case $ac_abs_builddir in
! .) ac_abs_top_builddir=${ac_top_builddir}.;;
! *)
!   case ${ac_top_builddir}. in
!   .) ac_abs_top_builddir=$ac_abs_builddir;;
!   [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
!   *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
!   esac;;
! esac
! case $ac_abs_builddir in
! .) ac_abs_srcdir=$ac_srcdir;;
! *)
!   case $ac_srcdir in
!   .) ac_abs_srcdir=$ac_abs_builddir;;
!   [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
!   *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
!   esac;;
! esac
! case $ac_abs_builddir in
! .) ac_abs_top_srcdir=$ac_top_srcdir;;
! *)
!   case $ac_top_srcdir in
!   .) ac_abs_top_srcdir=$ac_abs_builddir;;
!   [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
!   *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
!   esac;;
  esac
  
!     cd $ac_dir
      # Check for guested configure; otherwise get Cygnus style configure.
      if test -f $ac_srcdir/configure.gnu; then
!       echo
        $SHELL $ac_srcdir/configure.gnu  --help=recursive
      elif test -f $ac_srcdir/configure; then
!       echo
        $SHELL $ac_srcdir/configure  --help=recursive
      elif test -f $ac_srcdir/configure.ac ||
  	   test -f $ac_srcdir/configure.in; then
!       echo
        $ac_configure --help
      else
        echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
!     fi
!     cd $ac_popdir
    done
  fi
  
! test -n "$ac_init_help" && exit 0
  if $ac_init_version; then
    cat <<\_ACEOF
  Concurrent Versions System (CVS) configure 1.12.13
! generated by GNU Autoconf 2.59
  
! Copyright (C) 2003 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  
--- 1461,1534 ----
  
  Report bugs to <bug-cvs@nongnu.org>.
  _ACEOF
+ ac_status=$?
  fi
  
  if test "$ac_init_help" = "recursive"; then
    # If there are subdirs, report their specific --help.
    for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
      test -d $ac_dir || continue
      ac_builddir=.
  
! case "$ac_dir" in
! .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
! *)
    ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
!   # A ".." for each directory in $ac_dir_suffix.
!   ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
!   case $ac_top_builddir_sub in
!   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
!   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
!   esac ;;
! esac
! ac_abs_top_builddir=$ac_pwd
! ac_abs_builddir=$ac_pwd$ac_dir_suffix
! # for backward compatibility:
! ac_top_builddir=$ac_top_build_prefix
  
  case $srcdir in
!   .)  # We are building in place.
      ac_srcdir=.
!     ac_top_srcdir=$ac_top_builddir_sub
!     ac_abs_top_srcdir=$ac_pwd ;;
!   [\\/]* | ?:[\\/]* )  # Absolute name.
      ac_srcdir=$srcdir$ac_dir_suffix;
!     ac_top_srcdir=$srcdir
!     ac_abs_top_srcdir=$srcdir ;;
!   *) # Relative name.
!     ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
!     ac_top_srcdir=$ac_top_build_prefix$srcdir
!     ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
  esac
+ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
  
!     cd $ac_dir || { ac_status=$?; continue; }
      # Check for guested configure; otherwise get Cygnus style configure.
      if test -f $ac_srcdir/configure.gnu; then
!       echo &&
        $SHELL $ac_srcdir/configure.gnu  --help=recursive
      elif test -f $ac_srcdir/configure; then
!       echo &&
        $SHELL $ac_srcdir/configure  --help=recursive
      elif test -f $ac_srcdir/configure.ac ||
  	   test -f $ac_srcdir/configure.in; then
!       echo &&
        $ac_configure --help
      else
        echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
!     fi || ac_status=$?
!     cd "$ac_pwd" || { ac_status=$?; break; }
    done
  fi
  
! test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
  Concurrent Versions System (CVS) configure 1.12.13
! generated by GNU Autoconf 2.59cvs-20051231
  
! Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
! 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  
***************
*** 1149,1155 ****
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
  _ACEOF
!   exit 0
  fi
  exec 5>config.log
  cat >&5 <<_ACEOF
--- 1546,1552 ----
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
  _ACEOF
!   exit
  fi
  exec 5>config.log
  cat >&5 <<_ACEOF
***************
*** 1157,1163 ****
  running configure, to aid debugging if configure makes a mistake.
  
  It was created by Concurrent Versions System (CVS) $as_me 1.12.13, which was
! generated by GNU Autoconf 2.59.  Invocation command line was
  
    $ $0 $@
  
--- 1554,1560 ----
  running configure, to aid debugging if configure makes a mistake.
  
  It was created by Concurrent Versions System (CVS) $as_me 1.12.13, which was
! generated by GNU Autoconf 2.59cvs-20051231.  Invocation command line was
  
    $ $0 $@
  
***************
*** 1180,1186 ****
  /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
  /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
  /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
! hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
  /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
  /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
  /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
--- 1577,1583 ----
  /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
  /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
  /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
! /usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
  /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
  /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
  /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
***************
*** 1226,1232 ****
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
!     *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
        ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
--- 1623,1629 ----
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
!     *" "*|*"	"*|*[\\\[\~\#\$\^\&\*\(\)\{\}\|\;\<\>\?\"\']*|*\]*)
        ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
***************
*** 1299,1319 ****
      echo
      for ac_var in $ac_subst_vars
      do
!       eval ac_val=$`echo $ac_var`
        echo "$ac_var='"'"'$ac_val'"'"'"
      done | sort
      echo
  
      if test -n "$ac_subst_files"; then
        cat <<\_ASBOX
! ## ------------- ##
! ## Output files. ##
! ## ------------- ##
  _ASBOX
        echo
        for ac_var in $ac_subst_files
        do
! 	eval ac_val=$`echo $ac_var`
  	echo "$ac_var='"'"'$ac_val'"'"'"
        done | sort
        echo
--- 1696,1716 ----
      echo
      for ac_var in $ac_subst_vars
      do
!       eval ac_val=\$$ac_var
        echo "$ac_var='"'"'$ac_val'"'"'"
      done | sort
      echo
  
      if test -n "$ac_subst_files"; then
        cat <<\_ASBOX
! ## ------------------- ##
! ## File substitutions. ##
! ## ------------------- ##
  _ASBOX
        echo
        for ac_var in $ac_subst_files
        do
! 	eval ac_val=\$$ac_var
  	echo "$ac_var='"'"'$ac_val'"'"'"
        done | sort
        echo
***************
*** 1333,1340 ****
        echo "$as_me: caught signal $ac_signal"
      echo "$as_me: exit $exit_status"
    } >&5
!   rm -f core *.core &&
!   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
      exit $exit_status
       ' 0
  for ac_signal in 1 2 13 15; do
--- 1730,1737 ----
        echo "$as_me: caught signal $ac_signal"
      echo "$as_me: exit $exit_status"
    } >&5
!   rm -f core *.core core.conftest.* &&
!   rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
      exit $exit_status
       ' 0
  for ac_signal in 1 2 13 15; do
***************
*** 1343,1351 ****
  ac_signal=0
  
  # confdefs.h avoids OS command line length limits that DEFS can exceed.
! rm -rf conftest* confdefs.h
! # AIX cpp loses on an empty file, so make sure it contains at least a newline.
! echo >confdefs.h
  
  # Predefined preprocessor variables.
  
--- 1740,1746 ----
  ac_signal=0
  
  # confdefs.h avoids OS command line length limits that DEFS can exceed.
! rm -f -r conftest* confdefs.h
  
  # Predefined preprocessor variables.
  
***************
*** 1376,1389 ****
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
! if test -z "$CONFIG_SITE"; then
!   if test "x$prefix" != xNONE; then
!     CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
!   else
!     CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
!   fi
  fi
! for ac_site_file in $CONFIG_SITE; do
    if test -r "$ac_site_file"; then
      { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
  echo "$as_me: loading site script $ac_site_file" >&6;}
--- 1771,1787 ----
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
! if test -n "$CONFIG_SITE"; then
!   set x "$CONFIG_SITE"
! elif test "x$prefix" != xNONE; then
!   set x "$prefix/share/config.site" "$prefix/etc/config.site"
! else
!   set x "$ac_default_prefix/share/config.site" \
! 	"$ac_default_prefix/etc/config.site"
  fi
! shift
! for ac_site_file
! do
    if test -r "$ac_site_file"; then
      { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
  echo "$as_me: loading site script $ac_site_file" >&6;}
***************
*** 1392,1397 ****
--- 1790,1826 ----
    fi
  done
  
+ # Backslashes into forward slashes:
+ # The following OS/2 specific code is performed AFTER config.site
+ # has been loaded to allow users to change their environment there.
+ # This strange code is necessary to deal with handling of backslashes by ksh.
+ 
+ if test "$ac_emxsupport" != "no" -a "$ac_emxsupport" != "NO"; then
+   ac_save_IFS="$IFS"
+   IFS="\\"
+   ac_TEMP_PATH=
+   for ac_dir in $PATH; do
+     IFS=$ac_save_IFS
+     if test -z "$ac_TEMP_PATH"; then
+       ac_TEMP_PATH="$ac_dir"
+     else
+       ac_TEMP_PATH="$ac_TEMP_PATH/$ac_dir"
+     fi
+   done
+   export PATH="$ac_TEMP_PATH"
+   unset ac_TEMP_PATH
+ fi
+ 
+ # set ac_executable_extensions!
+ if ls.exe --version >/dev/null 2>/dev/null; then
+   if test "$ac_executable_extensions" = ""; then
+     { echo "$as_me:$LINENO: WARNING: ac_executable_extensions not set, assuming .exe" >&5
+ echo "$as_me: WARNING: ac_executable_extensions not set, assuming .exe" >&2;}
+     ac_executable_extensions=".exe"
+     export ac_executable_extensions
+   fi
+ fi
+ 
  if test -r "$cache_file"; then
    # Some versions of bash will fail to source /dev/null (special
    # files actually), so we avoid doing that.
***************
*** 1409,1423 ****
    >$cache_file
  fi
  
  # Check that the precious variables saved in the cache have kept the same
  # value.
  ac_cache_corrupted=false
! for ac_var in `(set) 2>&1 |
! 	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
    eval ac_old_set=\$ac_cv_env_${ac_var}_set
    eval ac_new_set=\$ac_env_${ac_var}_set
!   eval ac_old_val="\$ac_cv_env_${ac_var}_value"
!   eval ac_new_val="\$ac_env_${ac_var}_value"
    case $ac_old_set,$ac_new_set in
      set,)
        { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
--- 1838,1882 ----
    >$cache_file
  fi
  
+ gl_func_list="$gl_func_list fchdir"
+ gl_header_list="$gl_header_list unistd.h"
+ gl_func_list="$gl_func_list mempcpy"
+ gl_header_list="$gl_header_list sys/time.h"
+ gl_func_list="$gl_func_list isascii"
+ gl_header_list="$gl_header_list sys/param.h"
+ gl_header_list="$gl_header_list stdio_ext.h"
+ gl_header_list="$gl_header_list termios.h"
+ gl_func_list="$gl_func_list __fsetlocking"
+ gl_func_list="$gl_func_list tcgetattr"
+ gl_func_list="$gl_func_list tcsetattr"
+ gl_func_list="$gl_func_list gettimeofday"
+ gl_func_list="$gl_func_list nanotime"
+ gl_header_list="$gl_header_list sys/cdefs.h"
+ gl_func_list="$gl_func_list getlogin_r"
+ gl_func_list="$gl_func_list getpwnam_r"
+ gl_header_list="$gl_header_list wchar.h"
+ gl_header_list="$gl_header_list wctype.h"
+ gl_header_list="$gl_header_list stdint.h"
+ gl_func_list="$gl_func_list siginterrupt"
+ gl_func_list="$gl_func_list posix_memalign"
+ gl_func_list="$gl_func_list iswprint"
+ gl_func_list="$gl_func_list mbsinit"
+ gl_header_list="$gl_header_list locale.h"
+ gl_func_list="$gl_func_list isblank"
+ gl_func_list="$gl_func_list mbrtowc"
+ gl_func_list="$gl_func_list wcrtomb"
+ gl_func_list="$gl_func_list wcscoll"
+ gl_func_list="$gl_func_list mblen"
+ gl_func_list="$gl_func_list mbrlen"
+ gl_func_list="$gl_func_list tzset"
  # Check that the precious variables saved in the cache have kept the same
  # value.
  ac_cache_corrupted=false
! for ac_var in $ac_precious_vars; do
    eval ac_old_set=\$ac_cv_env_${ac_var}_set
    eval ac_new_set=\$ac_env_${ac_var}_set
!   eval ac_old_val=\$ac_cv_env_${ac_var}_value
!   eval ac_new_val=\$ac_env_${ac_var}_value
    case $ac_old_set,$ac_new_set in
      set,)
        { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
***************
*** 1442,1448 ****
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
!     *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
        ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
--- 1901,1907 ----
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
!     *" "*|*"	"*|*[\\\[\~\#\$\^\&\*\(\)\{\}\|\;\<\>\?\"\']*|*\]*)
        ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
***************
*** 1460,1503 ****
     { (exit 1); exit 1; }; }
  fi
  
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
  
- gl_func_list="$gl_func_list fchdir"
- gl_header_list="$gl_header_list unistd.h"
- gl_func_list="$gl_func_list mempcpy"
- gl_header_list="$gl_header_list sys/time.h"
- gl_func_list="$gl_func_list isascii"
- gl_header_list="$gl_header_list sys/param.h"
- gl_header_list="$gl_header_list stdio_ext.h"
- gl_header_list="$gl_header_list termios.h"
- gl_func_list="$gl_func_list __fsetlocking"
- gl_func_list="$gl_func_list tcgetattr"
- gl_func_list="$gl_func_list tcsetattr"
- gl_func_list="$gl_func_list gettimeofday"
- gl_func_list="$gl_func_list nanotime"
- gl_header_list="$gl_header_list sys/cdefs.h"
- gl_func_list="$gl_func_list getlogin_r"
- gl_func_list="$gl_func_list getpwnam_r"
- gl_header_list="$gl_header_list wchar.h"
- gl_header_list="$gl_header_list wctype.h"
- gl_header_list="$gl_header_list stdint.h"
- gl_func_list="$gl_func_list siginterrupt"
- gl_func_list="$gl_func_list posix_memalign"
- gl_func_list="$gl_func_list iswprint"
- gl_func_list="$gl_func_list mbsinit"
- gl_header_list="$gl_header_list locale.h"
- gl_func_list="$gl_func_list isblank"
- gl_func_list="$gl_func_list mbrtowc"
- gl_func_list="$gl_func_list wcrtomb"
- gl_func_list="$gl_func_list wcscoll"
- gl_func_list="$gl_func_list mblen"
- gl_func_list="$gl_func_list mbrlen"
- gl_func_list="$gl_func_list tzset"
  
  
  
--- 1919,1925 ----
***************
*** 1521,1526 ****
--- 1943,1953 ----
  
  
  
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
***************
*** 1563,1570 ****
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
! echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
! echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
--- 1990,1997 ----
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
! { echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
! echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
***************
*** 1586,1592 ****
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
! 	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
--- 2013,2019 ----
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
! 	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
***************
*** 1611,1625 ****
    if test "${ac_cv_path_install+set}" = set; then
      INSTALL=$ac_cv_path_install
    else
!     # As a last resort, use the slow shell script.  We don't cache a
!     # path for INSTALL within a source directory, because that will
      # break other packages using the cache if that directory is
!     # removed, or if the path is relative.
      INSTALL=$ac_install_sh
    fi
  fi
! echo "$as_me:$LINENO: result: $INSTALL" >&5
! echo "${ECHO_T}$INSTALL" >&6
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
--- 2038,2052 ----
    if test "${ac_cv_path_install+set}" = set; then
      INSTALL=$ac_cv_path_install
    else
!     # As a last resort, use the slow shell script.  Don't cache a
!     # value for INSTALL within a source directory, because that will
      # break other packages using the cache if that directory is
!     # removed, or if the value is a relative name.
      INSTALL=$ac_install_sh
    fi
  fi
! { echo "$as_me:$LINENO: result: $INSTALL" >&5
! echo "${ECHO_T}$INSTALL" >&6; }
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
***************
*** 1629,1636 ****
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
! echo "$as_me:$LINENO: 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 > conftest.file
--- 2056,2063 ----
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
! { echo "$as_me:$LINENO: 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 > conftest.file
***************
*** 1672,1691 ****
  Check your system clock" >&2;}
     { (exit 1); exit 1; }; }
  fi
! echo "$as_me:$LINENO: result: yes" >&5
! echo "${ECHO_T}yes" >&6
  test "$program_prefix" != NONE &&
!   program_transform_name="s,^,$program_prefix,;$program_transform_name"
  # Use a double $ so make ignores it.
  test "$program_suffix" != NONE &&
!   program_transform_name="s,\$,$program_suffix,;$program_transform_name"
  # Double any \ or $.  echo might interpret backslashes.
  # By default was `s,x,x', remove it if useless.
  cat <<\_ACEOF >conftest.sed
  s/[\\$]/&&/g;s/;s,x,x,$//
  _ACEOF
  program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
! rm conftest.sed
  
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
--- 2099,2118 ----
  Check your system clock" >&2;}
     { (exit 1); exit 1; }; }
  fi
! { echo "$as_me:$LINENO: result: yes" >&5
! echo "${ECHO_T}yes" >&6; }
  test "$program_prefix" != NONE &&
!   program_transform_name="s&^&$program_prefix&;$program_transform_name"
  # Use a double $ so make ignores it.
  test "$program_suffix" != NONE &&
!   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
  # Double any \ or $.  echo might interpret backslashes.
  # By default was `s,x,x', remove it if useless.
  cat <<\_ACEOF >conftest.sed
  s/[\\$]/&&/g;s/;s,x,x,$//
  _ACEOF
  program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
! rm -f conftest.sed
  
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
***************
*** 1737,1744 ****
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_AWK+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 2164,2171 ----
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_AWK+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 1751,1757 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_AWK="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 2178,2184 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_AWK="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 1763,1791 ****
  fi
  AWK=$ac_cv_prog_AWK
  if test -n "$AWK"; then
!   echo "$as_me:$LINENO: result: $AWK" >&5
! echo "${ECHO_T}$AWK" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
    test -n "$AWK" && break
  done
  
! echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
! echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
! if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.make <<\_ACEOF
  all:
! 	@echo 'ac_maketemp="$(MAKE)"'
  _ACEOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
! if test -n "$ac_maketemp"; then
    eval ac_cv_prog_make_${ac_make}_set=yes
  else
    eval ac_cv_prog_make_${ac_make}_set=no
--- 2190,2220 ----
  fi
  AWK=$ac_cv_prog_AWK
  if test -n "$AWK"; then
!   { echo "$as_me:$LINENO: result: $AWK" >&5
! echo "${ECHO_T}$AWK" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ 
    test -n "$AWK" && break
  done
  
! { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
! echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
! if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.make <<\_ACEOF
+ SHELL = /bin/sh
  all:
! 	@echo 'ac_maketemp=X"$(MAKE)"'
  _ACEOF
  # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
  eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
! if test "$ac_maketemp" != X ; then
    eval ac_cv_prog_make_${ac_make}_set=yes
  else
    eval ac_cv_prog_make_${ac_make}_set=no
***************
*** 1793,1804 ****
  rm -f conftest.make
  fi
  if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
!   echo "$as_me:$LINENO: result: yes" >&5
! echo "${ECHO_T}yes" >&6
    SET_MAKE=
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
--- 2222,2233 ----
  rm -f conftest.make
  fi
  if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
!   { echo "$as_me:$LINENO: result: yes" >&5
! echo "${ECHO_T}yes" >&6; }
    SET_MAKE=
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
***************
*** 1860,1867 ****
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 2289,2296 ----
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 1874,1880 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 2303,2309 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 1886,1905 ****
  fi
  STRIP=$ac_cv_prog_STRIP
  if test -n "$STRIP"; then
!   echo "$as_me:$LINENO: result: $STRIP" >&5
! echo "${ECHO_T}$STRIP" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
  fi
  if test -z "$ac_cv_prog_STRIP"; then
    ac_ct_STRIP=$STRIP
    # Extract the first word of "strip", so it can be a program name with args.
  set dummy strip; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 2315,2335 ----
  fi
  STRIP=$ac_cv_prog_STRIP
  if test -n "$STRIP"; then
!   { echo "$as_me:$LINENO: result: $STRIP" >&5
! echo "${ECHO_T}$STRIP" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ 
  fi
  if test -z "$ac_cv_prog_STRIP"; then
    ac_ct_STRIP=$STRIP
    # Extract the first word of "strip", so it can be a program name with args.
  set dummy strip; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 1912,1918 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_ac_ct_STRIP="strip"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 2342,2348 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_STRIP="strip"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 1920,1938 ****
  done
  done
  
-   test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
  fi
  fi
  ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
  if test -n "$ac_ct_STRIP"; then
!   echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
! echo "${ECHO_T}$ac_ct_STRIP" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
!   STRIP=$ac_ct_STRIP
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
--- 2350,2379 ----
  done
  done
  
  fi
  fi
  ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
  if test -n "$ac_ct_STRIP"; then
!   { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
! echo "${ECHO_T}$ac_ct_STRIP" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
!   if test "x$ac_ct_STRIP" = x; then
!     STRIP=":"
!   else
!     if test "$build" != "$host"; then
!       { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf@gnu.org." >&5
! echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf@gnu.org." >&2;}
!     fi
!     STRIP=$ac_ct_STRIP
!   fi
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
***************
*** 1958,1965 ****
    echo $ECHO_N "checking for prefix by $ECHO_C" >&6
    # Extract the first word of "cvs", so it can be a program name with args.
  set dummy cvs; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_ac_prefix_program+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 2399,2406 ----
    echo $ECHO_N "checking for prefix by $ECHO_C" >&6
    # Extract the first word of "cvs", so it can be a program name with args.
  set dummy cvs; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_ac_prefix_program+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 1974,1980 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_ac_prefix_program="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 2415,2421 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_ac_prefix_program="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 1985,2000 ****
    ;;
  esac
  fi
- ac_prefix_program=$ac_cv_path_ac_prefix_program
- 
  if test -n "$ac_prefix_program"; then
!   echo "$as_me:$LINENO: result: $ac_prefix_program" >&5
! echo "${ECHO_T}$ac_prefix_program" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
    if test -n "$ac_prefix_program"; then
      prefix=`(dirname "$ac_prefix_program") 2>/dev/null ||
  $as_expr X"$ac_prefix_program" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--- 2426,2441 ----
    ;;
  esac
  fi
  if test -n "$ac_prefix_program"; then
!   { echo "$as_me:$LINENO: result: $ac_prefix_program" >&5
! echo "${ECHO_T}$ac_prefix_program" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ ac_prefix_program=$ac_cv_path_ac_prefix_program
+ 
    if test -n "$ac_prefix_program"; then
      prefix=`(dirname "$ac_prefix_program") 2>/dev/null ||
  $as_expr X"$ac_prefix_program" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
***************
*** 2023,2041 ****
    fi
  fi
  
!           ac_config_headers="$ac_config_headers config.h"
  
! echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
! echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
!     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
  if test "${enable_maintainer_mode+set}" = set; then
!   enableval="$enable_maintainer_mode"
!   USE_MAINTAINER_MODE=$enableval
  else
    USE_MAINTAINER_MODE=no
! fi;
!   echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
! echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
  
  
  if test $USE_MAINTAINER_MODE = yes; then
--- 2464,2484 ----
    fi
  fi
  
! ac_config_headers="$ac_config_headers config.h"
  
! ac_config_headers="$ac_config_headers emx-new/common.h"
! 
! { echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
! echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
!     # Check whether --enable-maintainer-mode was given.
  if test "${enable_maintainer_mode+set}" = set; then
!   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
  else
    USE_MAINTAINER_MODE=no
! fi
! 
!   { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
! echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
  
  
  if test $USE_MAINTAINER_MODE = yes; then
***************
*** 2058,2064 ****
  
  DEPDIR="${am__leading_dot}deps"
  
!           ac_config_commands="$ac_config_commands depfiles"
  
  
  am_make=${MAKE-make}
--- 2501,2507 ----
  
  DEPDIR="${am__leading_dot}deps"
  
! ac_config_commands="$ac_config_commands depfiles"
  
  
  am_make=${MAKE-make}
***************
*** 2068,2075 ****
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
! echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
! echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
  am__include="#"
  am__quote=
  _am_result=none
--- 2511,2518 ----
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
! { echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
! echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
  am__include="#"
  am__quote=
  _am_result=none
***************
*** 2096,2110 ****
  fi
  
  
! echo "$as_me:$LINENO: result: $_am_result" >&5
! echo "${ECHO_T}$_am_result" >&6
  rm -f confinc confmf
  
! # Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
  if test "${enable_dependency_tracking+set}" = set; then
!   enableval="$enable_dependency_tracking"
  
- fi;
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
--- 2539,2553 ----
  fi
  
  
! { echo "$as_me:$LINENO: result: $_am_result" >&5
! echo "${ECHO_T}$_am_result" >&6; }
  rm -f confinc confmf
  
! # Check whether --enable-dependency-tracking was given.
  if test "${enable_dependency_tracking+set}" = set; then
!   enableval=$enable_dependency_tracking;
! fi
  
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
***************
*** 2129,2136 ****
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 2572,2579 ----
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 2143,2149 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 2586,2592 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 2155,2174 ****
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
!   echo "$as_me:$LINENO: result: $CC" >&5
! echo "${ECHO_T}$CC" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
  fi
  if test -z "$ac_cv_prog_CC"; then
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 2598,2618 ----
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
!   { echo "$as_me:$LINENO: result: $CC" >&5
! echo "${ECHO_T}$CC" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ 
  fi
  if test -z "$ac_cv_prog_CC"; then
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 2181,2187 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_ac_ct_CC="gcc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 2625,2631 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="gcc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 2193,2216 ****
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
!   echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
! echo "${ECHO_T}$ac_ct_CC" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
!   CC=$ac_ct_CC
  else
    CC="$ac_cv_prog_CC"
  fi
  
  if test -z "$CC"; then
!   if test -n "$ac_tool_prefix"; then
!   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 2637,2672 ----
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
!   { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
! echo "${ECHO_T}$ac_ct_CC" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
!   if test "x$ac_ct_CC" = x; then
!     CC=""
!   else
!     if test "$build" != "$host"; then
!       { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf@gnu.org." >&5
! echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf@gnu.org." >&2;}
!     fi
!     CC=$ac_ct_CC
!   fi
  else
    CC="$ac_cv_prog_CC"
  fi
  
  if test -z "$CC"; then
!           if test -n "$ac_tool_prefix"; then
!     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 2223,2229 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_CC="${ac_tool_prefix}cc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 2679,2685 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}cc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 2235,2296 ****
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
!   echo "$as_me:$LINENO: result: $CC" >&5
! echo "${ECHO_T}$CC" >&6
! else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
! fi
! 
! fi
! if test -z "$ac_cv_prog_CC"; then
!   ac_ct_CC=$CC
!   # Extract the first word of "cc", so it can be a program name with args.
! set dummy cc; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
! if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   if test -n "$ac_ct_CC"; then
!   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
! else
! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
! for as_dir in $PATH
! do
!   IFS=$as_save_IFS
!   test -z "$as_dir" && as_dir=.
!   for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
!     ac_cv_prog_ac_ct_CC="cc"
!     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
!     break 2
!   fi
! done
! done
! 
! fi
! fi
! ac_ct_CC=$ac_cv_prog_ac_ct_CC
! if test -n "$ac_ct_CC"; then
!   echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
! echo "${ECHO_T}$ac_ct_CC" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
-   CC=$ac_ct_CC
- else
-   CC="$ac_cv_prog_CC"
- fi
  
  fi
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 2691,2711 ----
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
!   { echo "$as_me:$LINENO: result: $CC" >&5
! echo "${ECHO_T}$CC" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
  
+   fi
  fi
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 2304,2310 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
--- 2719,2725 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
***************
*** 2332,2353 ****
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
!   echo "$as_me:$LINENO: result: $CC" >&5
! echo "${ECHO_T}$CC" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
  fi
  if test -z "$CC"; then
    if test -n "$ac_tool_prefix"; then
!   for ac_prog in cl
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 2747,2769 ----
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
!   { echo "$as_me:$LINENO: result: $CC" >&5
! echo "${ECHO_T}$CC" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ 
  fi
  if test -z "$CC"; then
    if test -n "$ac_tool_prefix"; then
!   for ac_prog in cl.exe
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 2360,2366 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 2776,2782 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 2372,2395 ****
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
!   echo "$as_me:$LINENO: result: $CC" >&5
! echo "${ECHO_T}$CC" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
      test -n "$CC" && break
    done
  fi
  if test -z "$CC"; then
    ac_ct_CC=$CC
!   for ac_prog in cl
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 2788,2812 ----
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
!   { echo "$as_me:$LINENO: result: $CC" >&5
! echo "${ECHO_T}$CC" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ 
      test -n "$CC" && break
    done
  fi
  if test -z "$CC"; then
    ac_ct_CC=$CC
!   for ac_prog in cl.exe
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 2402,2408 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_ac_ct_CC="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 2819,2825 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 2414,2430 ****
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
!   echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
! echo "${ECHO_T}$ac_ct_CC" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
    test -n "$ac_ct_CC" && break
  done
  
!   CC=$ac_ct_CC
  fi
  
  fi
--- 2831,2860 ----
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
!   { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
! echo "${ECHO_T}$ac_ct_CC" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ 
    test -n "$ac_ct_CC" && break
  done
  
!   if test "x$ac_ct_CC" = x; then
!     CC=""
!   else
!     if test "$build" != "$host"; then
!       { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf@gnu.org." >&5
! echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf@gnu.org." >&2;}
!     fi
!     CC=$ac_ct_CC
!   fi
  fi
  
  fi
***************
*** 2437,2457 ****
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
! echo "$as_me:$LINENO:" \
!      "checking for C compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
! { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
!   (eval $ac_compiler --version </dev/null >&5) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
! { (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
!   (eval $ac_compiler -v </dev/null >&5) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
! { (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
!   (eval $ac_compiler -V </dev/null >&5) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
--- 2867,2886 ----
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
! echo "$as_me:$LINENO: checking for C compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
! { (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
!   (eval $ac_compiler --version >&5) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
! { (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
!   (eval $ac_compiler -v >&5) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
! { (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
!   (eval $ac_compiler -V >&5) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
***************
*** 2476,2506 ****
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
! echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
! echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
  ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
  if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
    (eval $ac_link_default) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
!   # Find the output, starting from the most likely.  This scheme is
! # not robust to junk in `.', hence go to wildcards (a.*) only as a last
! # resort.
! 
! # Be careful to initialize this variable, since it used to be cached.
  # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
  ac_cv_exeext=
! # b.out is created by i960 compilers.
! for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
  do
    test -f "$ac_file" || continue
    case $ac_file in
      *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
  	;;
-     conftest.$ac_ext )
- 	# This is the source file.
- 	;;
      [ab].out )
  	# We found the default executable, but exeext='' is most
  	# certainly right.
--- 2905,2946 ----
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
! { echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
! echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
  ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ #
+ # List of possible output files, starting from the most likely.
+ # The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+ # only as a last resort.  b.out is created by i960 compilers.
+ ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+ #
+ # The IRIX 6 linker writes into existing files which may not be
+ # executable, retaining their permissions.  Remove them first so a
+ # subsequent execution test works.
+ ac_rmfiles=
+ for ac_file in $ac_files
+ do
+   case $ac_file in
+     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+   esac
+ done
+ rm -f $ac_rmfiles
+ 
  if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
    (eval $ac_link_default) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
!   # Be careful to initialize this variable, since it used to be cached.
  # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
  ac_cv_exeext=
! for ac_file in $ac_files
  do
    test -f "$ac_file" || continue
    case $ac_file in
      *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
  	;;
      [ab].out )
  	# We found the default executable, but exeext='' is most
  	# certainly right.
***************
*** 2528,2540 ****
  fi
  
  ac_exeext=$ac_cv_exeext
! echo "$as_me:$LINENO: result: $ac_file" >&5
! echo "${ECHO_T}$ac_file" >&6
  
  # Check the compiler produces executables we can run.  If not, either
  # the compiler is broken, or we cross compile.
! echo "$as_me:$LINENO: checking whether the C compiler works" >&5
! echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
  # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
  # If not cross compiling, check that we can run a simple program.
  if test "$cross_compiling" != yes; then
--- 2968,2980 ----
  fi
  
  ac_exeext=$ac_cv_exeext
! { echo "$as_me:$LINENO: result: $ac_file" >&5
! echo "${ECHO_T}$ac_file" >&6; }
  
  # Check the compiler produces executables we can run.  If not, either
  # the compiler is broken, or we cross compile.
! { echo "$as_me:$LINENO: checking whether the C compiler works" >&5
! echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
  # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
  # If not cross compiling, check that we can run a simple program.
  if test "$cross_compiling" != yes; then
***************
*** 2559,2578 ****
      fi
    fi
  fi
! echo "$as_me:$LINENO: result: yes" >&5
! echo "${ECHO_T}yes" >&6
  
  rm -f a.out a.exe conftest$ac_cv_exeext b.out
  ac_clean_files=$ac_clean_files_save
  # Check the compiler produces executables we can run.  If not, either
  # the compiler is broken, or we cross compile.
! echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
! echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
! echo "$as_me:$LINENO: result: $cross_compiling" >&5
! echo "${ECHO_T}$cross_compiling" >&6
  
! echo "$as_me:$LINENO: checking for suffix of executables" >&5
! echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--- 2999,3018 ----
      fi
    fi
  fi
! { echo "$as_me:$LINENO: result: yes" >&5
! echo "${ECHO_T}yes" >&6; }
  
  rm -f a.out a.exe conftest$ac_cv_exeext b.out
  ac_clean_files=$ac_clean_files_save
  # Check the compiler produces executables we can run.  If not, either
  # the compiler is broken, or we cross compile.
! { echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
! echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
! { echo "$as_me:$LINENO: result: $cross_compiling" >&5
! echo "${ECHO_T}$cross_compiling" >&6; }
  
! { echo "$as_me:$LINENO: checking for suffix of executables" >&5
! echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>&5
    ac_status=$?
***************
*** 2601,2614 ****
  fi
  
  rm -f conftest$ac_cv_exeext
! echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
! echo "${ECHO_T}$ac_cv_exeext" >&6
  
  rm -f conftest.$ac_ext
  EXEEXT=$ac_cv_exeext
  ac_exeext=$EXEEXT
! echo "$as_me:$LINENO: checking for suffix of object files" >&5
! echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 3041,3054 ----
  fi
  
  rm -f conftest$ac_cv_exeext
! { echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
! echo "${ECHO_T}$ac_cv_exeext" >&6; }
  
  rm -f conftest.$ac_ext
  EXEEXT=$ac_cv_exeext
  ac_exeext=$EXEEXT
! { echo "$as_me:$LINENO: checking for suffix of object files" >&5
! echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 2633,2639 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
!   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
    case $ac_file in
      *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
--- 3073,3080 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
!   for ac_file in conftest.o conftest.obj conftest.*; do
!   test -f "$ac_file" || continue;
    case $ac_file in
      *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
***************
*** 2653,2664 ****
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
! echo "${ECHO_T}$ac_cv_objext" >&6
  OBJEXT=$ac_cv_objext
  ac_objext=$OBJEXT
! echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
! echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 3094,3105 ----
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
! echo "${ECHO_T}$ac_cv_objext" >&6; }
  OBJEXT=$ac_cv_objext
  ac_objext=$OBJEXT
! { echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
! echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 2707,2730 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_compiler_gnu=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
! echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
! echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
  GCC=`test $ac_compiler_gnu = yes && echo yes`
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
! CFLAGS="-g"
! echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
! echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
  if test "${ac_cv_prog_cc_g+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!   cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 3148,3175 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_compiler_gnu=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
! echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
  GCC=`test $ac_compiler_gnu = yes && echo yes`
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
! { echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
! echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
  if test "${ac_cv_prog_cc_g+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!   ac_save_c_werror_flag=$ac_c_werror_flag
!    ac_c_werror_flag=yes
!    ac_cv_prog_cc_g=no
!    CFLAGS="-g"
!    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 2766,2862 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_prog_cc_g=no
! fi
! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! fi
! echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
! echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
! if test "$ac_test_CFLAGS" = set; then
!   CFLAGS=$ac_save_CFLAGS
! elif test $ac_cv_prog_cc_g = yes; then
!   if test "$GCC" = yes; then
!     CFLAGS="-g -O2"
!   else
!     CFLAGS="-g"
!   fi
! else
!   if test "$GCC" = yes; then
!     CFLAGS="-O2"
!   else
!     CFLAGS=
!   fi
! fi
! echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
! echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
! if test "${ac_cv_prog_cc_stdc+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   ac_cv_prog_cc_stdc=no
! ac_save_CC=$CC
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
- #include <stdarg.h>
- #include <stdio.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
- struct buf { int x; };
- FILE * (*rcsopen) (struct buf *, struct stat *, int);
- static char *e (p, i)
-      char **p;
-      int i;
- {
-   return p[i];
- }
- static char *f (char * (*g) (char **, int), char **p, ...)
- {
-   char *s;
-   va_list v;
-   va_start (v,p);
-   s = g (p, va_arg (v,int));
-   va_end (v);
-   return s;
- }
- 
- /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-    function prototypes and stuff, but not '\xHH' hex character constants.
-    These don't provoke an error unfortunately, instead are silently treated
-    as 'x'.  The following induces an error, until -std1 is added to get
-    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-    array size at least.  It's necessary to write '\x00'==0 to get something
-    that's true only with -std1.  */
- int osf4_cc_array ['\x00' == 0 ? 1 : -1];
  
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
- int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
- int argc;
- char **argv;
  int
  main ()
  {
! return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
    ;
    return 0;
  }
  _ACEOF
! # Don't try gcc -ansi; that turns off useful extensions and
! # breaks some systems' header files.
! # AIX			-qlanglvl=ansi
! # Ultrix and OSF/1	-std1
! # HP-UX 10.20 and later	-Ae
! # HP-UX older versions	-Aa -D_HPUX_SOURCE
! # SVR4			-Xc -D__EXTENSIONS__
! for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
! do
!   CC="$ac_save_CC $ac_arg"
!   rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>conftest.er1
    ac_status=$?
--- 3211,3233 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	CFLAGS=""
!       cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
  int
  main ()
  {
! 
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>conftest.er1
    ac_status=$?
***************
*** 2878,2911 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_prog_cc_stdc=$ac_arg
! break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! fi
! rm -f conftest.err conftest.$ac_objext
! done
! rm -f conftest.$ac_ext conftest.$ac_objext
! CC=$ac_save_CC
! 
! fi
  
! case "x$ac_cv_prog_cc_stdc" in
!   x|xno)
!     echo "$as_me:$LINENO: result: none needed" >&5
! echo "${ECHO_T}none needed" >&6 ;;
!   *)
!     echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
! echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
!     CC="$CC $ac_cv_prog_cc_stdc" ;;
! esac
  
! # Some people use a C++ compiler to compile C.  Since we use `exit',
! # in C++ we need to declare it.  In case someone uses the same compiler
! # for both compiling C and C++ we need to have the C++ compiler decide
! # the declaration of exit, since it's the most demanding environment.
  cat >conftest.$ac_ext <<_ACEOF
  #ifndef __cplusplus
    choke me
--- 3249,3451 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   :
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_c_werror_flag=$ac_save_c_werror_flag
! 	 CFLAGS="-g"
! 	 cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
  
! int
! main ()
! {
  
!   ;
!   return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext
! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
!   (eval $ac_compile) 2>conftest.er1
!   ac_status=$?
!   grep -v '^ *+' conftest.er1 >conftest.err
!   rm -f conftest.er1
!   cat conftest.err >&5
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"
! 			 || test ! -s conftest.err'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; } &&
! 	 { ac_try='test -s conftest.$ac_objext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
!   ac_cv_prog_cc_g=yes
! else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! 
! fi
! 
! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! fi
! 
! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! fi
! 
! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
!    ac_c_werror_flag=$ac_save_c_werror_flag
! fi
! { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
! echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
! if test "$ac_test_CFLAGS" = set; then
!   CFLAGS=$ac_save_CFLAGS
! elif test $ac_cv_prog_cc_g = yes; then
!   if test "$GCC" = yes; then
!     CFLAGS="-g -O2"
!   else
!     CFLAGS="-g"
!   fi
! else
!   if test "$GCC" = yes; then
!     CFLAGS="-O2"
!   else
!     CFLAGS=
!   fi
! fi
! { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
! echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
! if test "${ac_cv_prog_cc_c89+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   ac_cv_prog_cc_c89=no
! ac_save_CC=$CC
! cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! #include <stdarg.h>
! #include <stdio.h>
! #include <sys/types.h>
! #include <sys/stat.h>
! /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
! struct buf { int x; };
! FILE * (*rcsopen) (struct buf *, struct stat *, int);
! static char *e (p, i)
!      char **p;
!      int i;
! {
!   return p[i];
! }
! static char *f (char * (*g) (char **, int), char **p, ...)
! {
!   char *s;
!   va_list v;
!   va_start (v,p);
!   s = g (p, va_arg (v,int));
!   va_end (v);
!   return s;
! }
! 
! /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
!    function prototypes and stuff, but not '\xHH' hex character constants.
!    These don't provoke an error unfortunately, instead are silently treated
!    as 'x'.  The following induces an error, until -std is added to get
!    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
!    array size at least.  It's necessary to write '\x00'==0 to get something
!    that's true only with -std.  */
! int osf4_cc_array ['\x00' == 0 ? 1 : -1];
! 
! int test (int i, double x);
! struct s1 {int (*f) (int a);};
! struct s2 {int (*f) (double a);};
! int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
! int argc;
! char **argv;
! int
! main ()
! {
! return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
!   ;
!   return 0;
! }
! _ACEOF
! for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
! 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
! do
!   CC="$ac_save_CC $ac_arg"
!   rm -f conftest.$ac_objext
! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
!   (eval $ac_compile) 2>conftest.er1
!   ac_status=$?
!   grep -v '^ *+' conftest.er1 >conftest.err
!   rm -f conftest.er1
!   cat conftest.err >&5
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"
! 			 || test ! -s conftest.err'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; } &&
! 	 { ac_try='test -s conftest.$ac_objext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
!   ac_cv_prog_cc_c89=$ac_arg
! else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! 
! fi
! 
! rm -f conftest.err conftest.$ac_objext
!   test "x$ac_cv_prog_cc_c89" != "xno" && break
! done
! rm -f conftest.$ac_ext
! CC=$ac_save_CC
! 
! fi
! # AC_CACHE_VAL
! case "x$ac_cv_prog_cc_c89" in
!   x)
!     { echo "$as_me:$LINENO: result: none needed" >&5
! echo "${ECHO_T}none needed" >&6; } ;;
!   xno)
!     { echo "$as_me:$LINENO: result: unsupported" >&5
! echo "${ECHO_T}unsupported" >&6; } ;;
!   *)
!     CC="$CC $ac_cv_prog_cc_c89"
!     { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
! echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
! esac
! 
! 
! # Some people use a C++ compiler to compile C.  Since we use `exit',
! # in C++ we need to declare it.  In case someone uses the same compiler
! # for both compiling C and C++ we need to have the C++ compiler decide
! # the declaration of exit, since it's the most demanding environment.
  cat >conftest.$ac_ext <<_ACEOF
  #ifndef __cplusplus
    choke me
***************
*** 2984,2991 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! continue
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
--- 3524,3532 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	continue
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
***************
*** 3029,3035 ****
--- 3570,3578 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  rm -f conftest*
***************
*** 3043,3049 ****
--- 3586,3594 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
***************
*** 3053,3060 ****
  
  depcc="$CC"   am_compiler_list=
  
! echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
! echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 3598,3605 ----
  
  depcc="$CC"   am_compiler_list=
  
! { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
! echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 3143,3150 ****
  fi
  
  fi
! echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
! echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
--- 3688,3695 ----
  fi
  
  fi
! { echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
! echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
***************
*** 3166,3173 ****
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
! echo "$as_me:$LINENO: checking 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=
--- 3711,3718 ----
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
! { echo "$as_me:$LINENO: checking 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=
***************
*** 3227,3232 ****
--- 3772,3778 ----
    # Broken: fails on valid input.
  continue
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
  
    # OK, works on sane cases.  Now check whether non-existent headers
***************
*** 3267,3272 ****
--- 3813,3819 ----
  ac_preproc_ok=:
  break
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
  
  done
***************
*** 3284,3291 ****
  else
    ac_cv_prog_CPP=$CPP
  fi
! echo "$as_me:$LINENO: result: $CPP" >&5
! echo "${ECHO_T}$CPP" >&6
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
--- 3831,3838 ----
  else
    ac_cv_prog_CPP=$CPP
  fi
! { echo "$as_me:$LINENO: result: $CPP" >&5
! echo "${ECHO_T}$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
***************
*** 3334,3339 ****
--- 3881,3887 ----
    # Broken: fails on valid input.
  continue
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
  
    # OK, works on sane cases.  Now check whether non-existent headers
***************
*** 3374,3379 ****
--- 3922,3928 ----
  ac_preproc_ok=:
  break
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
  
  done
***************
*** 3396,3419 ****
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
! echo "$as_me:$LINENO: checking for egrep" >&5
! echo $ECHO_N "checking for egrep... $ECHO_C" >&6
! if test "${ac_cv_prog_egrep+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!   if echo a | (grep -E '(a|b)') >/dev/null 2>&1
!     then ac_cv_prog_egrep='grep -E'
!     else ac_cv_prog_egrep='egrep'
      fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
! echo "${ECHO_T}$ac_cv_prog_egrep" >&6
!  EGREP=$ac_cv_prog_egrep
  
  
  
! echo "$as_me:$LINENO: checking for AIX" >&5
! echo $ECHO_N "checking for AIX... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 3945,4113 ----
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
! { echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
! echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
! if test "${ac_cv_path_GREP+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   # Extract the first word of "grep ggrep" to use in msg output
! if test -z "$GREP"; then
! set dummy grep ggrep; ac_prog_name=$2
! if test "${ac_cv_path_GREP+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   ac_path_GREP_found=false
! # Loop through the user's path and test for each of PROGNAME-LIST
! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
! for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
! do
!   IFS=$as_save_IFS
!   test -z "$as_dir" && as_dir=.
!   for ac_prog in grep ggrep; do
!   for ac_exec_ext in '' $ac_executable_extensions; do
!     ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
!     { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
!     # Check for GNU ac_path_GREP and select it if it is found.
!   # Check for GNU $ac_path_GREP
! case `"$ac_path_GREP" --version 2>&1` in
! *GNU*)
!   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
! *)
!   ac_count=0
!   echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
!   while :
!   do
!     cat "conftest.in" "conftest.in" >"conftest.tmp"
!     mv "conftest.tmp" "conftest.in"
!     cp "conftest.in" "conftest.nl"
!     echo 'GREP' >> "conftest.nl"
!     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
!     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
!     ac_count=`expr $ac_count + 1`
!     if test $ac_count -gt ${ac_path_GREP_max-0}; then
!       # Best one so far, save it but keep looking for a better one
!       ac_cv_path_GREP="$ac_path_GREP"
!       ac_path_GREP_max=$ac_count
!     fi
!     # 10*(2^10) chars as input seems more than enough
!     test $ac_count -gt 10 && break
!   done
!   rm -f conftest.*;;
! esac
! 
! 
!     $ac_path_GREP_found && break 3
!   done
! done
! 
! done
! 
! 
! fi
! 
! GREP="$ac_cv_path_GREP"
! if test -z "$GREP"; then
!   { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
! echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
!    { (exit 1); exit 1; }; }
! fi
! 
! else
!   ac_cv_path_GREP=$GREP
! fi
! 
! 
! fi
! { echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
! echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
!  GREP="$ac_cv_path_GREP"
! 
! 
! { echo "$as_me:$LINENO: checking for egrep" >&5
! echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
! if test "${ac_cv_path_EGREP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
!    then ac_cv_path_EGREP="$GREP -E"
!    else
!      # Extract the first word of "egrep" to use in msg output
! if test -z "$EGREP"; then
! set dummy egrep; ac_prog_name=$2
! if test "${ac_cv_path_EGREP+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   ac_path_EGREP_found=false
! # Loop through the user's path and test for each of PROGNAME-LIST
! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
! for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
! do
!   IFS=$as_save_IFS
!   test -z "$as_dir" && as_dir=.
!   for ac_prog in egrep; do
!   for ac_exec_ext in '' $ac_executable_extensions; do
!     ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
!     { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
!     # Check for GNU ac_path_EGREP and select it if it is found.
!   # Check for GNU $ac_path_EGREP
! case `"$ac_path_EGREP" --version 2>&1` in
! *GNU*)
!   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
! *)
!   ac_count=0
!   echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
!   while :
!   do
!     cat "conftest.in" "conftest.in" >"conftest.tmp"
!     mv "conftest.tmp" "conftest.in"
!     cp "conftest.in" "conftest.nl"
!     echo 'EGREP' >> "conftest.nl"
!     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
!     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
!     ac_count=`expr $ac_count + 1`
!     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
!       # Best one so far, save it but keep looking for a better one
!       ac_cv_path_EGREP="$ac_path_EGREP"
!       ac_path_EGREP_max=$ac_count
      fi
+     # 10*(2^10) chars as input seems more than enough
+     test $ac_count -gt 10 && break
+   done
+   rm -f conftest.*;;
+ esac
+ 
+ 
+     $ac_path_EGREP_found && break 3
+   done
+ done
+ 
+ done
+ 
+ 
+ fi
+ 
+ EGREP="$ac_cv_path_EGREP"
+ if test -z "$EGREP"; then
+   { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+ echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+ else
+   ac_cv_path_EGREP=$EGREP
+ fi
+ 
+ 
+    fi
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
! echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
!  EGREP="$ac_cv_path_EGREP"
  
  
  
! { echo "$as_me:$LINENO: checking for AIX" >&5
! echo $ECHO_N "checking for AIX... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 3427,3447 ****
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    $EGREP "yes" >/dev/null 2>&1; then
!   echo "$as_me:$LINENO: result: yes" >&5
! echo "${ECHO_T}yes" >&6
  cat >>confdefs.h <<\_ACEOF
  #define _ALL_SOURCE 1
  _ACEOF
  
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  rm -f conftest*
  
  
! echo "$as_me:$LINENO: checking for ANSI C header files" >&5
! echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 4121,4141 ----
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    $EGREP "yes" >/dev/null 2>&1; then
!   { echo "$as_me:$LINENO: result: yes" >&5
! echo "${ECHO_T}yes" >&6; }
  cat >>confdefs.h <<\_ACEOF
  #define _ALL_SOURCE 1
  _ACEOF
  
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  rm -f conftest*
  
  
! { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
! echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 3491,3498 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_header_stdc=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
  if test $ac_cv_header_stdc = yes; then
--- 4185,4193 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_header_stdc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
  if test $ac_cv_header_stdc = yes; then
***************
*** 3549,3554 ****
--- 4244,4250 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
+ #include <stdlib.h>
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
***************
*** 3568,3574 ****
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
!       exit(2);
    exit (0);
  }
  _ACEOF
--- 4264,4270 ----
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
!       exit (2);
    exit (0);
  }
  _ACEOF
***************
*** 3592,3603 ****
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
! echo "${ECHO_T}$ac_cv_header_stdc" >&6
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 4288,4301 ----
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  fi
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
! echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 3620,3628 ****
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 4318,4326 ----
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 3662,3673 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_Header=no"
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--- 4360,4373 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_Header=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
***************
*** 3679,3695 ****
  
  
  if test "${ac_cv_header_minix_config_h+set}" = set; then
!   echo "$as_me:$LINENO: 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" >&6
  fi
! echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
! echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking minix/config.h usability" >&5
! echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 4379,4395 ----
  
  
  if test "${ac_cv_header_minix_config_h+set}" = set; then
!   { echo "$as_me:$LINENO: 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" >&6
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
! echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking minix/config.h usability" >&5
! echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 3726,3740 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking minix/config.h presence" >&5
! echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 4426,4441 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking minix/config.h presence" >&5
! echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 3768,3776 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 4469,4478 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 3804,3818 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: 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" >&6
  else
    ac_cv_header_minix_config_h=$ac_header_preproc
  fi
! echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
! echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6
  
  fi
  if test $ac_cv_header_minix_config_h = yes; then
--- 4506,4520 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: 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" >&6
  else
    ac_cv_header_minix_config_h=$ac_header_preproc
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5
! echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6; }
  
  fi
  if test $ac_cv_header_minix_config_h = yes; then
***************
*** 3872,3879 ****
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 4574,4581 ----
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 3886,3892 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 4588,4594 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 3898,3917 ****
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
!   echo "$as_me:$LINENO: result: $CC" >&5
! echo "${ECHO_T}$CC" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
  fi
  if test -z "$ac_cv_prog_CC"; then
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 4600,4620 ----
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
!   { echo "$as_me:$LINENO: result: $CC" >&5
! echo "${ECHO_T}$CC" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ 
  fi
  if test -z "$ac_cv_prog_CC"; then
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 3924,3930 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_ac_ct_CC="gcc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 4627,4633 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="gcc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 3936,3959 ****
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
!   echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
! echo "${ECHO_T}$ac_ct_CC" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
!   CC=$ac_ct_CC
  else
    CC="$ac_cv_prog_CC"
  fi
  
  if test -z "$CC"; then
!   if test -n "$ac_tool_prefix"; then
!   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 4639,4674 ----
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
!   { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
! echo "${ECHO_T}$ac_ct_CC" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
!   if test "x$ac_ct_CC" = x; then
!     CC=""
!   else
!     if test "$build" != "$host"; then
!       { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf@gnu.org." >&5
! echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf@gnu.org." >&2;}
!     fi
!     CC=$ac_ct_CC
!   fi
  else
    CC="$ac_cv_prog_CC"
  fi
  
  if test -z "$CC"; then
!           if test -n "$ac_tool_prefix"; then
!     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 3966,3972 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_CC="${ac_tool_prefix}cc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 4681,4687 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}cc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 3978,4039 ****
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
!   echo "$as_me:$LINENO: result: $CC" >&5
! echo "${ECHO_T}$CC" >&6
! else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
! fi
! 
! fi
! if test -z "$ac_cv_prog_CC"; then
!   ac_ct_CC=$CC
!   # Extract the first word of "cc", so it can be a program name with args.
! set dummy cc; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
! if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   if test -n "$ac_ct_CC"; then
!   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
! else
! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
! for as_dir in $PATH
! do
!   IFS=$as_save_IFS
!   test -z "$as_dir" && as_dir=.
!   for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
!     ac_cv_prog_ac_ct_CC="cc"
!     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
!     break 2
!   fi
! done
! done
! 
! fi
! fi
! ac_ct_CC=$ac_cv_prog_ac_ct_CC
! if test -n "$ac_ct_CC"; then
!   echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
! echo "${ECHO_T}$ac_ct_CC" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
-   CC=$ac_ct_CC
- else
-   CC="$ac_cv_prog_CC"
- fi
  
  fi
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 4693,4713 ----
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
!   { echo "$as_me:$LINENO: result: $CC" >&5
! echo "${ECHO_T}$CC" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
  
+   fi
  fi
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 4047,4053 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
--- 4721,4727 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
***************
*** 4075,4096 ****
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
!   echo "$as_me:$LINENO: result: $CC" >&5
! echo "${ECHO_T}$CC" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
  fi
  if test -z "$CC"; then
    if test -n "$ac_tool_prefix"; then
!   for ac_prog in cl
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 4749,4771 ----
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
!   { echo "$as_me:$LINENO: result: $CC" >&5
! echo "${ECHO_T}$CC" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ 
  fi
  if test -z "$CC"; then
    if test -n "$ac_tool_prefix"; then
!   for ac_prog in cl.exe
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 4103,4109 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 4778,4784 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 4115,4138 ****
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
!   echo "$as_me:$LINENO: result: $CC" >&5
! echo "${ECHO_T}$CC" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
      test -n "$CC" && break
    done
  fi
  if test -z "$CC"; then
    ac_ct_CC=$CC
!   for ac_prog in cl
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 4790,4814 ----
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
!   { echo "$as_me:$LINENO: result: $CC" >&5
! echo "${ECHO_T}$CC" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ 
      test -n "$CC" && break
    done
  fi
  if test -z "$CC"; then
    ac_ct_CC=$CC
!   for ac_prog in cl.exe
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 4145,4151 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_ac_ct_CC="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 4821,4827 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 4157,4173 ****
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
!   echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
! echo "${ECHO_T}$ac_ct_CC" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
    test -n "$ac_ct_CC" && break
  done
  
!   CC=$ac_ct_CC
  fi
  
  fi
--- 4833,4862 ----
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
!   { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
! echo "${ECHO_T}$ac_ct_CC" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ 
    test -n "$ac_ct_CC" && break
  done
  
!   if test "x$ac_ct_CC" = x; then
!     CC=""
!   else
!     if test "$build" != "$host"; then
!       { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf@gnu.org." >&5
! echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf@gnu.org." >&2;}
!     fi
!     CC=$ac_ct_CC
!   fi
  fi
  
  fi
***************
*** 4180,4206 ****
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
! echo "$as_me:$LINENO:" \
!      "checking for C compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
! { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
!   (eval $ac_compiler --version </dev/null >&5) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
! { (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
!   (eval $ac_compiler -v </dev/null >&5) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
! { (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
!   (eval $ac_compiler -V </dev/null >&5) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
  
! echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
! echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 4869,4894 ----
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
! echo "$as_me:$LINENO: checking for C compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
! { (eval echo "$as_me:$LINENO: \"$ac_compiler --version >&5\"") >&5
!   (eval $ac_compiler --version >&5) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
! { (eval echo "$as_me:$LINENO: \"$ac_compiler -v >&5\"") >&5
!   (eval $ac_compiler -v >&5) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
! { (eval echo "$as_me:$LINENO: \"$ac_compiler -V >&5\"") >&5
!   (eval $ac_compiler -V >&5) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
  
! { echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
! echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 4249,4272 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_compiler_gnu=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
! echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
! echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
  GCC=`test $ac_compiler_gnu = yes && echo yes`
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
! CFLAGS="-g"
! echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
! echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
  if test "${ac_cv_prog_cc_g+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!   cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 4937,5051 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_compiler_gnu=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
! echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
  GCC=`test $ac_compiler_gnu = yes && echo yes`
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
! { echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
! echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
  if test "${ac_cv_prog_cc_g+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!   ac_save_c_werror_flag=$ac_c_werror_flag
!    ac_c_werror_flag=yes
!    ac_cv_prog_cc_g=no
!    CFLAGS="-g"
!    cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! 
! int
! main ()
! {
! 
!   ;
!   return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext
! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
!   (eval $ac_compile) 2>conftest.er1
!   ac_status=$?
!   grep -v '^ *+' conftest.er1 >conftest.err
!   rm -f conftest.er1
!   cat conftest.err >&5
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"
! 			 || test ! -s conftest.err'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; } &&
! 	 { ac_try='test -s conftest.$ac_objext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
!   ac_cv_prog_cc_g=yes
! else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! 	CFLAGS=""
!       cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! 
! int
! main ()
! {
! 
!   ;
!   return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext
! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
!   (eval $ac_compile) 2>conftest.er1
!   ac_status=$?
!   grep -v '^ *+' conftest.er1 >conftest.err
!   rm -f conftest.er1
!   cat conftest.err >&5
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"
! 			 || test ! -s conftest.err'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; } &&
! 	 { ac_try='test -s conftest.$ac_objext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
!   :
! else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! 	ac_c_werror_flag=$ac_save_c_werror_flag
! 	 CFLAGS="-g"
! 	 cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 4308,4319 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_prog_cc_g=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
! echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
--- 5087,5106 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 
! fi
! 
! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! fi
! 
! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+    ac_c_werror_flag=$ac_save_c_werror_flag
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
! echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
***************
*** 4329,4340 ****
      CFLAGS=
    fi
  fi
! echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
! echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
! if test "${ac_cv_prog_cc_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!   ac_cv_prog_cc_stdc=no
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
--- 5116,5127 ----
      CFLAGS=
    fi
  fi
! { echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
! echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
! if test "${ac_cv_prog_cc_c89+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!   ac_cv_prog_cc_c89=no
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
***************
*** 4368,4377 ****
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
!    as 'x'.  The following induces an error, until -std1 is added to get
     proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
     array size at least.  It's necessary to write '\x00'==0 to get something
!    that's true only with -std1.  */
  int osf4_cc_array ['\x00' == 0 ? 1 : -1];
  
  int test (int i, double x);
--- 5155,5164 ----
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
!    as 'x'.  The following induces an error, until -std is added to get
     proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
     array size at least.  It's necessary to write '\x00'==0 to get something
!    that's true only with -std.  */
  int osf4_cc_array ['\x00' == 0 ? 1 : -1];
  
  int test (int i, double x);
***************
*** 4388,4401 ****
    return 0;
  }
  _ACEOF
! # Don't try gcc -ansi; that turns off useful extensions and
! # breaks some systems' header files.
! # AIX			-qlanglvl=ansi
! # Ultrix and OSF/1	-std1
! # HP-UX 10.20 and later	-Ae
! # HP-UX older versions	-Aa -D_HPUX_SOURCE
! # SVR4			-Xc -D__EXTENSIONS__
! for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
    rm -f conftest.$ac_objext
--- 5175,5182 ----
    return 0;
  }
  _ACEOF
! for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
! 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
    rm -f conftest.$ac_objext
***************
*** 4420,4449 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_prog_cc_stdc=$ac_arg
! break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext
  done
! rm -f conftest.$ac_ext conftest.$ac_objext
  CC=$ac_save_CC
  
  fi
! 
! case "x$ac_cv_prog_cc_stdc" in
!   x|xno)
!     echo "$as_me:$LINENO: result: none needed" >&5
! echo "${ECHO_T}none needed" >&6 ;;
    *)
!     echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
! echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
!     CC="$CC $ac_cv_prog_cc_stdc" ;;
  esac
  
  # Some people use a C++ compiler to compile C.  Since we use `exit',
  # in C++ we need to declare it.  In case someone uses the same compiler
  # for both compiling C and C++ we need to have the C++ compiler decide
--- 5201,5236 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_prog_cc_c89=$ac_arg
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext
+   test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
! rm -f conftest.$ac_ext
  CC=$ac_save_CC
  
  fi
! # AC_CACHE_VAL
! case "x$ac_cv_prog_cc_c89" in
!   x)
!     { echo "$as_me:$LINENO: result: none needed" >&5
! echo "${ECHO_T}none needed" >&6; } ;;
!   xno)
!     { echo "$as_me:$LINENO: result: unsupported" >&5
! echo "${ECHO_T}unsupported" >&6; } ;;
    *)
!     CC="$CC $ac_cv_prog_cc_c89"
!     { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
! echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
  esac
  
+ 
  # Some people use a C++ compiler to compile C.  Since we use `exit',
  # in C++ we need to declare it.  In case someone uses the same compiler
  # for both compiling C and C++ we need to have the C++ compiler decide
***************
*** 4526,4533 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! continue
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
--- 5313,5321 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	continue
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
***************
*** 4571,4577 ****
--- 5359,5367 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  rm -f conftest*
***************
*** 4585,4591 ****
--- 5375,5383 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
***************
*** 4595,4602 ****
  
  depcc="$CC"   am_compiler_list=
  
! echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
! echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 5387,5394 ----
  
  depcc="$CC"   am_compiler_list=
  
! { echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
! echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 4685,4692 ****
  fi
  
  fi
! echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
! echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
--- 5477,5484 ----
  fi
  
  fi
! { echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
! echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
***************
*** 4703,4717 ****
  
  
  if test "x$CC" != xcc; then
!   echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
! echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6
  else
!   echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
! echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6
  fi
  set dummy $CC; ac_cc=`echo $2 |
  		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
! if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 5495,5509 ----
  
  
  if test "x$CC" != xcc; then
!   { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
! echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
  else
!   { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
! echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
  fi
  set dummy $CC; ac_cc=`echo $2 |
  		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
! if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 4732,4744 ****
  # Make sure it works both with $CC and with simple cc.
  # We do the test twice because some compilers refuse to overwrite an
  # existing .o file with -o, though they will create one.
! ac_try='$CC -c conftest.$ac_ext -o conftest.$ac_objext >&5'
  if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
!    test -f conftest.$ac_objext && { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
--- 5524,5537 ----
  # Make sure it works both with $CC and with simple cc.
  # We do the test twice because some compilers refuse to overwrite an
  # existing .o file with -o, though they will create one.
! ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
! rm -f conftest2.*
  if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
!    test -f conftest2.$ac_objext && { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
***************
*** 4753,4765 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!       ac_try='cc -c conftest.$ac_ext -o conftest.$ac_objext >&5'
        if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 test -f conftest.$ac_objext && { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
--- 5546,5559 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!       ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
!       rm -f conftest2.*
        if { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
! 	 test -f conftest2.$ac_objext && { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
***************
*** 4780,4790 ****
  
  fi
  if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = yes"; then
!   echo "$as_me:$LINENO: result: yes" >&5
! echo "${ECHO_T}yes" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  
  cat >>confdefs.h <<\_ACEOF
  #define NO_MINUS_C_MINUS_O 1
--- 5574,5584 ----
  
  fi
  if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = yes"; then
!   { echo "$as_me:$LINENO: result: yes" >&5
! echo "${ECHO_T}yes" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  
  cat >>confdefs.h <<\_ACEOF
  #define NO_MINUS_C_MINUS_O 1
***************
*** 4807,4819 ****
  
  
  # Find the posix library needed on INTERACTIVE UNIX (ISC)
! echo "$as_me:$LINENO: checking for library containing strerror" >&5
! echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
  if test "${ac_cv_search_strerror+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
- ac_cv_search_strerror=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 5601,5612 ----
  
  
  # Find the posix library needed on INTERACTIVE UNIX (ISC)
! { echo "$as_me:$LINENO: checking for library containing strerror" >&5
! echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
  if test "${ac_cv_search_strerror+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 4821,4897 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
- char strerror ();
- int
- main ()
- {
- strerror ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
- 	 { ac_try='test -z "$ac_c_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_search_strerror="none required"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_strerror" = no; then
-   for ac_lib in cposix; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char strerror ();
  int
  main ()
  {
! strerror ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 5614,5642 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
     builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char strerror ();
  int
  main ()
  {
! return strerror ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' cposix; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 4913,4935 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_strerror="-l$ac_lib"
! break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
! echo "${ECHO_T}$ac_cv_search_strerror" >&6
! if test "$ac_cv_search_strerror" != no; then
!   test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
  
  fi
  
--- 5658,5690 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_strerror=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_strerror+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search_strerror+set}" = set; then
!   :
! else
!   ac_cv_search_strerror=no
  fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
! echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
! ac_res=$ac_cv_search_strerror
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
  
***************
*** 4938,4945 ****
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 5693,5700 ----
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 4952,4958 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 5707,5713 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 4964,4983 ****
  fi
  RANLIB=$ac_cv_prog_RANLIB
  if test -n "$RANLIB"; then
!   echo "$as_me:$LINENO: result: $RANLIB" >&5
! echo "${ECHO_T}$RANLIB" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
  fi
  if test -z "$ac_cv_prog_RANLIB"; then
    ac_ct_RANLIB=$RANLIB
    # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 5719,5739 ----
  fi
  RANLIB=$ac_cv_prog_RANLIB
  if test -n "$RANLIB"; then
!   { echo "$as_me:$LINENO: result: $RANLIB" >&5
! echo "${ECHO_T}$RANLIB" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ 
  fi
  if test -z "$ac_cv_prog_RANLIB"; then
    ac_ct_RANLIB=$RANLIB
    # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 4990,4996 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_ac_ct_RANLIB="ranlib"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 5746,5752 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_RANLIB="ranlib"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 4998,5040 ****
  done
  done
  
-   test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
  fi
  fi
  ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
  if test -n "$ac_ct_RANLIB"; then
!   echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
! echo "${ECHO_T}$ac_ct_RANLIB" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
!   RANLIB=$ac_ct_RANLIB
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
  
! echo "$as_me:$LINENO: checking whether ln -s works" >&5
! echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
  LN_S=$as_ln_s
  if test "$LN_S" = "ln -s"; then
!   echo "$as_me:$LINENO: result: yes" >&5
! echo "${ECHO_T}yes" >&6
  else
!   echo "$as_me:$LINENO: result: no, using $LN_S" >&5
! echo "${ECHO_T}no, using $LN_S" >&6
  fi
  
! # Check whether --enable-largefile or --disable-largefile was given.
  if test "${enable_largefile+set}" = set; then
!   enableval="$enable_largefile"
  
- fi;
  if test "$enable_largefile" != no; then
  
!   echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
! echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
  if test "${ac_cv_sys_largefile_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 5754,5807 ----
  done
  done
  
  fi
  fi
  ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
  if test -n "$ac_ct_RANLIB"; then
!   { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
! echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
!   if test "x$ac_ct_RANLIB" = x; then
!     RANLIB=":"
!   else
!     if test "$build" != "$host"; then
!       { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf@gnu.org." >&5
! echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
! whose name does not start with the host triplet.  If you think this
! configuration is useful to you, please write to autoconf@gnu.org." >&2;}
!     fi
!     RANLIB=$ac_ct_RANLIB
!   fi
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
  
! { echo "$as_me:$LINENO: checking whether ln -s works" >&5
! echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
  LN_S=$as_ln_s
  if test "$LN_S" = "ln -s"; then
!   { echo "$as_me:$LINENO: result: yes" >&5
! echo "${ECHO_T}yes" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
! echo "${ECHO_T}no, using $LN_S" >&6; }
  fi
  
! # Check whether --enable-largefile was given.
  if test "${enable_largefile+set}" = set; then
!   enableval=$enable_largefile;
! fi
  
  if test "$enable_largefile" != no; then
  
!   { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
! echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
  if test "${ac_cv_sys_largefile_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 5094,5100 ****
--- 5861,5869 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext
       	 CC="$CC -n32"
       	 rm -f conftest.$ac_objext
***************
*** 5124,5130 ****
--- 5893,5901 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext
  	 break
         done
***************
*** 5132,5145 ****
         rm -f conftest.$ac_ext
      fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
! echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
    if test "$ac_cv_sys_largefile_CC" != no; then
      CC=$CC$ac_cv_sys_largefile_CC
    fi
  
!   echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
! echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
  if test "${ac_cv_sys_file_offset_bits+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 5903,5916 ----
         rm -f conftest.$ac_ext
      fi
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
! echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
    if test "$ac_cv_sys_largefile_CC" != no; then
      CC=$CC$ac_cv_sys_largefile_CC
    fi
  
!   { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
! echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
  if test "${ac_cv_sys_file_offset_bits+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 5195,5201 ****
--- 5966,5974 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
***************
*** 5248,5260 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    break
  done
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
! echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
  if test "$ac_cv_sys_file_offset_bits" != no; then
  
  cat >>confdefs.h <<_ACEOF
--- 6021,6035 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    break
  done
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
! echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
  if test "$ac_cv_sys_file_offset_bits" != no; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 5263,5270 ****
  
  fi
  rm -f conftest*
!   echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
! echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
  if test "${ac_cv_sys_large_files+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 6038,6045 ----
  
  fi
  rm -f conftest*
!   { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
! echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
  if test "${ac_cv_sys_large_files+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 5320,5326 ****
--- 6095,6103 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
***************
*** 5373,5385 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    break
  done
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
! echo "${ECHO_T}$ac_cv_sys_large_files" >&6
  if test "$ac_cv_sys_large_files" != no; then
  
  cat >>confdefs.h <<_ACEOF
--- 6150,6164 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    break
  done
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
! echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
  if test "$ac_cv_sys_large_files" != no; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 5394,5401 ****
  
  # Extract the first word of "perl", so it can be a program name with args.
  set dummy perl; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_PERL+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 6173,6180 ----
  
  # Extract the first word of "perl", so it can be a program name with args.
  set dummy perl; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_PERL+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 5410,5416 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 6189,6195 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 5422,5441 ****
    ;;
  esac
  fi
- PERL=$ac_cv_path_PERL
- 
  if test -n "$PERL"; then
!   echo "$as_me:$LINENO: result: $PERL" >&5
! echo "${ECHO_T}$PERL" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
  # Extract the first word of "csh", so it can be a program name with args.
  set dummy csh; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_CSH+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 6201,6220 ----
    ;;
  esac
  fi
  if test -n "$PERL"; then
!   { echo "$as_me:$LINENO: result: $PERL" >&5
! echo "${ECHO_T}$PERL" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ PERL=$ac_cv_path_PERL
+ 
  # Extract the first word of "csh", so it can be a program name with args.
  set dummy csh; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_CSH+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 5450,5456 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_CSH="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 6229,6235 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_CSH="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 5462,5482 ****
    ;;
  esac
  fi
- CSH=$ac_cv_path_CSH
- 
  if test -n "$CSH"; then
!   echo "$as_me:$LINENO: result: $CSH" >&5
! echo "${ECHO_T}$CSH" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
  # for contrib/rcs2log.sh & src/cvsbug.in.
  # Extract the first word of "mktemp", so it can be a program name with args.
  set dummy mktemp; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_MKTEMP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 6241,6261 ----
    ;;
  esac
  fi
  if test -n "$CSH"; then
!   { echo "$as_me:$LINENO: result: $CSH" >&5
! echo "${ECHO_T}$CSH" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ CSH=$ac_cv_path_CSH
+ 
  # for contrib/rcs2log.sh & src/cvsbug.in.
  # Extract the first word of "mktemp", so it can be a program name with args.
  set dummy mktemp; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_MKTEMP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 5491,5497 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_MKTEMP="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 6270,6276 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_MKTEMP="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 5503,5518 ****
    ;;
  esac
  fi
- MKTEMP=$ac_cv_path_MKTEMP
- 
  if test -n "$MKTEMP"; then
!   echo "$as_me:$LINENO: result: $MKTEMP" >&5
! echo "${ECHO_T}$MKTEMP" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
  if test x"$MKTEMP" = xmktemp; then
  	MKTEMP_SH_FUNCTION=$srcdir/mktemp.sh
  else
--- 6282,6297 ----
    ;;
  esac
  fi
  if test -n "$MKTEMP"; then
!   { echo "$as_me:$LINENO: result: $MKTEMP" >&5
! echo "${ECHO_T}$MKTEMP" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ MKTEMP=$ac_cv_path_MKTEMP
+ 
  if test x"$MKTEMP" = xmktemp; then
  	MKTEMP_SH_FUNCTION=$srcdir/mktemp.sh
  else
***************
*** 5522,5529 ****
  # for src/cvsbug.in
  # Extract the first word of "sendmail", so it can be a program name with args.
  set dummy sendmail; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_SENDMAIL+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 6301,6308 ----
  # for src/cvsbug.in
  # Extract the first word of "sendmail", so it can be a program name with args.
  set dummy sendmail; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_SENDMAIL+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 5539,5545 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_SENDMAIL="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 6318,6324 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_SENDMAIL="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 5551,5571 ****
    ;;
  esac
  fi
- SENDMAIL=$ac_cv_path_SENDMAIL
- 
  if test -n "$SENDMAIL"; then
!   echo "$as_me:$LINENO: result: $SENDMAIL" >&5
! echo "${ECHO_T}$SENDMAIL" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
  # For diff/util.c
  # Extract the first word of "pr", so it can be a program name with args.
  set dummy pr; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_PR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 6330,6350 ----
    ;;
  esac
  fi
  if test -n "$SENDMAIL"; then
!   { echo "$as_me:$LINENO: result: $SENDMAIL" >&5
! echo "${ECHO_T}$SENDMAIL" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ SENDMAIL=$ac_cv_path_SENDMAIL
+ 
  # For diff/util.c
  # Extract the first word of "pr", so it can be a program name with args.
  set dummy pr; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_PR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 5580,5586 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_PR="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 6359,6365 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_PR="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 5592,5607 ****
    ;;
  esac
  fi
- PR=$ac_cv_path_PR
- 
  if test -n "$PR"; then
!   echo "$as_me:$LINENO: result: $PR" >&5
! echo "${ECHO_T}$PR" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
  if test x"$PR" != xno; then
  
  cat >>confdefs.h <<_ACEOF
--- 6371,6386 ----
    ;;
  esac
  fi
  if test -n "$PR"; then
!   { echo "$as_me:$LINENO: result: $PR" >&5
! echo "${ECHO_T}$PR" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ PR=$ac_cv_path_PR
+ 
  if test x"$PR" != xno; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 5616,5623 ****
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_ROFF+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 6395,6402 ----
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_ROFF+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 5632,5638 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_ROFF="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 6411,6417 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_ROFF="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 5643,5666 ****
    ;;
  esac
  fi
- ROFF=$ac_cv_path_ROFF
- 
  if test -n "$ROFF"; then
!   echo "$as_me:$LINENO: result: $ROFF" >&5
! echo "${ECHO_T}$ROFF" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
    test -n "$ROFF" && break
  done
  test -n "$ROFF" || ROFF="$missing_dir/missing roff"
  
  # Extract the first word of "ps2pdf", so it can be a program name with args.
  set dummy ps2pdf; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_PS2PDF+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 6422,6445 ----
    ;;
  esac
  fi
  if test -n "$ROFF"; then
!   { echo "$as_me:$LINENO: result: $ROFF" >&5
! echo "${ECHO_T}$ROFF" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ ROFF=$ac_cv_path_ROFF
+ 
    test -n "$ROFF" && break
  done
  test -n "$ROFF" || ROFF="$missing_dir/missing roff"
  
  # Extract the first word of "ps2pdf", so it can be a program name with args.
  set dummy ps2pdf; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_PS2PDF+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 5675,5681 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_PS2PDF="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 6454,6460 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_PS2PDF="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 5687,5706 ****
    ;;
  esac
  fi
- PS2PDF=$ac_cv_path_PS2PDF
- 
  if test -n "$PS2PDF"; then
!   echo "$as_me:$LINENO: result: $PS2PDF" >&5
! echo "${ECHO_T}$PS2PDF" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
  # Extract the first word of "texi2dvi", so it can be a program name with args.
  set dummy texi2dvi; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_TEXI2DVI+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 6466,6485 ----
    ;;
  esac
  fi
  if test -n "$PS2PDF"; then
!   { echo "$as_me:$LINENO: result: $PS2PDF" >&5
! echo "${ECHO_T}$PS2PDF" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ PS2PDF=$ac_cv_path_PS2PDF
+ 
  # Extract the first word of "texi2dvi", so it can be a program name with args.
  set dummy texi2dvi; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_TEXI2DVI+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 5715,5721 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_TEXI2DVI="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 6494,6500 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_TEXI2DVI="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 5727,5745 ****
    ;;
  esac
  fi
- TEXI2DVI=$ac_cv_path_TEXI2DVI
- 
  if test -n "$TEXI2DVI"; then
!   echo "$as_me:$LINENO: result: $TEXI2DVI" >&5
! echo "${ECHO_T}$TEXI2DVI" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
  
! echo "$as_me:$LINENO: checking whether #! works in shell scripts" >&5
! echo $ECHO_N "checking whether #! works in shell scripts... $ECHO_C" >&6
  if test "${ac_cv_sys_interpreter+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 6506,6524 ----
    ;;
  esac
  fi
  if test -n "$TEXI2DVI"; then
!   { echo "$as_me:$LINENO: result: $TEXI2DVI" >&5
! echo "${ECHO_T}$TEXI2DVI" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ TEXI2DVI=$ac_cv_path_TEXI2DVI
+ 
  
! { echo "$as_me:$LINENO: checking whether #! works in shell scripts" >&5
! echo $ECHO_N "checking whether #! works in shell scripts... $ECHO_C" >&6; }
  if test "${ac_cv_sys_interpreter+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 5755,5762 ****
  fi
  rm -f conftest
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sys_interpreter" >&5
! echo "${ECHO_T}$ac_cv_sys_interpreter" >&6
  interpval=$ac_cv_sys_interpreter
  
  if test X"$ac_cv_sys_interpreter" != X"yes" ; then
--- 6534,6541 ----
  fi
  rm -f conftest
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sys_interpreter" >&5
! echo "${ECHO_T}$ac_cv_sys_interpreter" >&6; }
  interpval=$ac_cv_sys_interpreter
  
  if test X"$ac_cv_sys_interpreter" != X"yes" ; then
***************
*** 5767,5774 ****
  fi
  
  # BSD's logo is a devil for a reason, hey?
! echo "$as_me:$LINENO: checking for BSD VPATH bug in make" >&5
! echo $ECHO_N "checking for BSD VPATH bug in make... $ECHO_C" >&6
  if test "${ccvs_cv_bsd_make_vpath_bug+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 6546,6553 ----
  fi
  
  # BSD's logo is a devil for a reason, hey?
! { echo "$as_me:$LINENO: checking for BSD VPATH bug in make" >&5
! echo $ECHO_N "checking for BSD VPATH bug in make... $ECHO_C" >&6; }
  if test "${ccvs_cv_bsd_make_vpath_bug+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 5809,5816 ****
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }
  fi
! echo "$as_me:$LINENO: result: $ccvs_cv_bsd_make_vpath_bug" >&5
! echo "${ECHO_T}$ccvs_cv_bsd_make_vpath_bug" >&6
  # We also don't need to worry about the bug when $srcdir = $builddir
  
  
--- 6588,6595 ----
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }
  fi
! { echo "$as_me:$LINENO: result: $ccvs_cv_bsd_make_vpath_bug" >&5
! echo "${ECHO_T}$ccvs_cv_bsd_make_vpath_bug" >&6; }
  # We also don't need to worry about the bug when $srcdir = $builddir
  
  
***************
*** 5833,5841 ****
  ac_header_dirent=no
  for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
    as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
! echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 6612,6620 ----
  ac_header_dirent=no
  for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
    as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
! echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 5883,5894 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_Header=no"
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
--- 6662,6675 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_Header=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
***************
*** 5900,5912 ****
  done
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
!   echo "$as_me:$LINENO: checking for library containing opendir" >&5
! echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
  if test "${ac_cv_search_opendir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
- ac_cv_search_opendir=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 6681,6692 ----
  done
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
!   { echo "$as_me:$LINENO: checking for library containing opendir" >&5
! echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
  if test "${ac_cv_search_opendir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 5914,5935 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char opendir ();
  int
  main ()
  {
! opendir ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 6694,6722 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char opendir ();
  int
  main ()
  {
! return opendir ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' dir; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 5951,6039 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_opendir="none required"
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
! if test "$ac_cv_search_opendir" = no; then
!   for ac_lib in dir; do
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!     cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! 
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char opendir ();
! int
! main ()
! {
! opendir ();
!   ;
!   return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
!   (eval $ac_link) 2>conftest.er1
!   ac_status=$?
!   grep -v '^ *+' conftest.er1 >conftest.err
!   rm -f conftest.er1
!   cat conftest.err >&5
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"
! 			 || test ! -s conftest.err'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; } &&
! 	 { ac_try='test -s conftest$ac_exeext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
!   ac_cv_search_opendir="-l$ac_lib"
! break
! else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
  fi
! rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
! echo "${ECHO_T}$ac_cv_search_opendir" >&6
! if test "$ac_cv_search_opendir" != no; then
!   test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
  
  fi
  
  else
!   echo "$as_me:$LINENO: checking for library containing opendir" >&5
! echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
  if test "${ac_cv_search_opendir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
- ac_cv_search_opendir=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 6738,6780 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_opendir=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_opendir+set}" = set; then
!   break
  fi
! done
! if test "${ac_cv_search_opendir+set}" = set; then
!   :
! else
!   ac_cv_search_opendir=no
  fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
! echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
! ac_res=$ac_cv_search_opendir
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
  
  else
!   { echo "$as_me:$LINENO: checking for library containing opendir" >&5
! echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
  if test "${ac_cv_search_opendir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 6041,6117 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
- char opendir ();
- int
- main ()
- {
- opendir ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
- 	 { ac_try='test -z "$ac_c_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_search_opendir="none required"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_opendir" = no; then
-   for ac_lib in x; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char opendir ();
  int
  main ()
  {
! opendir ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 6782,6810 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
     builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char opendir ();
  int
  main ()
  {
! return opendir ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' x; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 6133,6162 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_opendir="-l$ac_lib"
! break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
! echo "${ECHO_T}$ac_cv_search_opendir" >&6
! if test "$ac_cv_search_opendir" != no; then
!   test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
  
  fi
  
  fi
  
! echo "$as_me:$LINENO: checking for ANSI C header files" >&5
! echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 6826,6865 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_opendir=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_opendir+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search_opendir+set}" = set; then
!   :
! else
!   ac_cv_search_opendir=no
  fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
! echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
! ac_res=$ac_cv_search_opendir
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
  
  fi
  
! { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
! echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 6206,6213 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_header_stdc=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
  if test $ac_cv_header_stdc = yes; then
--- 6909,6917 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_header_stdc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
  if test $ac_cv_header_stdc = yes; then
***************
*** 6264,6269 ****
--- 6968,6974 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
+ #include <stdlib.h>
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
***************
*** 6283,6289 ****
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
!       exit(2);
    exit (0);
  }
  _ACEOF
--- 6988,6994 ----
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
!       exit (2);
    exit (0);
  }
  _ACEOF
***************
*** 6307,6318 ****
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
! echo "${ECHO_T}$ac_cv_header_stdc" >&6
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 7012,7025 ----
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  fi
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
! echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 6321,6328 ****
  
  fi
  
! echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
! echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
  if test "${ac_cv_header_sys_wait_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 7028,7035 ----
  
  fi
  
! { echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
! echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
  if test "${ac_cv_header_sys_wait_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 6335,6341 ****
  #include <sys/types.h>
  #include <sys/wait.h>
  #ifndef WEXITSTATUS
! # define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
  #endif
  #ifndef WIFEXITED
  # define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
--- 7042,7048 ----
  #include <sys/types.h>
  #include <sys/wait.h>
  #ifndef WEXITSTATUS
! # define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
  #endif
  #ifndef WIFEXITED
  # define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
***************
*** 6378,6389 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_header_sys_wait_h=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
! echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
  if test $ac_cv_header_sys_wait_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 7085,7097 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_header_sys_wait_h=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
! echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; }
  if test $ac_cv_header_sys_wait_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 6424,6441 ****
  
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 7132,7150 ----
  
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 6472,6486 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 7181,7196 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 6514,6522 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 7224,7233 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 6550,6564 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 7261,7276 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 6570,6577 ****
  
  done
  
! echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
! echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6
  if test "${ac_cv_header_stat_broken+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 7282,7289 ----
  
  done
  
! { echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
! echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6; }
  if test "${ac_cv_header_stat_broken+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 6618,6625 ****
  rm -f conftest*
  
  fi
! echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5
! echo "${ECHO_T}$ac_cv_header_stat_broken" >&6
  if test $ac_cv_header_stat_broken = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 7330,7337 ----
  rm -f conftest*
  
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5
! echo "${ECHO_T}$ac_cv_header_stat_broken" >&6; }
  if test $ac_cv_header_stat_broken = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 6629,6636 ****
  fi
  
  
! echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
! echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
  if test "${ac_cv_c_const+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 7341,7348 ----
  fi
  
  
! { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
! echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
  if test "${ac_cv_c_const+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 6722,6733 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_c_const=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
! echo "${ECHO_T}$ac_cv_c_const" >&6
  if test $ac_cv_c_const = no; then
  
  cat >>confdefs.h <<\_ACEOF
--- 7434,7446 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_c_const=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
! echo "${ECHO_T}$ac_cv_c_const" >&6; }
  if test $ac_cv_c_const = no; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 6736,6743 ****
  
  fi
  
! echo "$as_me:$LINENO: 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" >&6
  else
--- 7449,7456 ----
  
  fi
  
! { echo "$as_me:$LINENO: 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" >&6
  else
***************
*** 6759,6766 ****
  rm -f conftest*
  
  fi
! echo "$as_me:$LINENO: 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 <<\_ACEOF
--- 7472,7479 ----
  rm -f conftest*
  
  fi
! { echo "$as_me:$LINENO: 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 <<\_ACEOF
***************
*** 6774,6781 ****
  
  fi
  
! echo "$as_me:$LINENO: checking for mode_t" >&5
! echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
  if test "${ac_cv_type_mode_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 7487,7494 ----
  
  fi
  
! { echo "$as_me:$LINENO: checking for mode_t" >&5
! echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_mode_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 6824,6835 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_mode_t=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
! echo "${ECHO_T}$ac_cv_type_mode_t" >&6
  if test $ac_cv_type_mode_t = yes; then
    :
  else
--- 7537,7549 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_mode_t=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
! echo "${ECHO_T}$ac_cv_type_mode_t" >&6; }
  if test $ac_cv_type_mode_t = yes; then
    :
  else
***************
*** 6840,6847 ****
  
  fi
  
! echo "$as_me:$LINENO: checking for pid_t" >&5
! echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
  if test "${ac_cv_type_pid_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 7554,7561 ----
  
  fi
  
! { echo "$as_me:$LINENO: checking for pid_t" >&5
! echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_pid_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 6890,6901 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_pid_t=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
! echo "${ECHO_T}$ac_cv_type_pid_t" >&6
  if test $ac_cv_type_pid_t = yes; then
    :
  else
--- 7604,7616 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_pid_t=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
! echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
  if test $ac_cv_type_pid_t = yes; then
    :
  else
***************
*** 6906,6913 ****
  
  fi
  
! echo "$as_me:$LINENO: 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" >&6
  else
--- 7621,7628 ----
  
  fi
  
! { echo "$as_me:$LINENO: 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" >&6
  else
***************
*** 6919,6937 ****
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <signal.h>
- #ifdef signal
- # undef signal
- #endif
- #ifdef __cplusplus
- extern "C" void (*signal (int, void (*)(int)))(int);
- #else
- void (*signal ()) ();
- #endif
  
  int
  main ()
  {
! int i;
    ;
    return 0;
  }
--- 7634,7644 ----
  /* end confdefs.h.  */
  #include <sys/types.h>
  #include <signal.h>
  
  int
  main ()
  {
! return *(signal (0, 0)) (0) == 1;
    ;
    return 0;
  }
***************
*** 6958,6974 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_type_signal=void
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_signal=int
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
! echo "${ECHO_T}$ac_cv_type_signal" >&6
  
  cat >>confdefs.h <<_ACEOF
  #define RETSIGTYPE $ac_cv_type_signal
--- 7665,7682 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_type_signal=int
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_signal=void
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
! echo "${ECHO_T}$ac_cv_type_signal" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define RETSIGTYPE $ac_cv_type_signal
***************
*** 6976,6983 ****
  
  
  
! echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
! echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6
  if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 7684,7691 ----
  
  
  
! { echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
! echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 7025,7031 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 7733,7739 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 7069,7082 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_member_struct_stat_st_blksize=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5
! echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6
  if test $ac_cv_member_struct_stat_st_blksize = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 7777,7792 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_member_struct_stat_st_blksize=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5
! echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6; }
  if test $ac_cv_member_struct_stat_st_blksize = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 7086,7093 ****
  
  fi
  
! echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
! echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6
  if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 7796,7803 ----
  
  fi
  
! { echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5
! echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 7135,7141 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 7845,7851 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 7179,7192 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_member_struct_stat_st_rdev=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
! echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6
  if test $ac_cv_member_struct_stat_st_rdev = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 7889,7904 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_member_struct_stat_st_rdev=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5
! echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6; }
  if test $ac_cv_member_struct_stat_st_rdev = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 7197,7204 ****
  fi
  
  
! echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
! echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
  if test "${ac_cv_sys_largefile_source+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 7909,7916 ----
  fi
  
  
! { echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
! echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; }
  if test "${ac_cv_sys_largefile_source+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 7246,7252 ****
--- 7958,7966 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
***************
*** 7291,7303 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    break
  done
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
! echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
  if test "$ac_cv_sys_largefile_source" != no; then
  
  cat >>confdefs.h <<_ACEOF
--- 8005,8019 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    break
  done
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
! echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6; }
  if test "$ac_cv_sys_largefile_source" != no; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 7310,7317 ****
  # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
  # in glibc 2.1.3, but that breaks too many other things.
  # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
! echo "$as_me:$LINENO: checking for fseeko" >&5
! echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
  if test "${ac_cv_func_fseeko+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 8026,8033 ----
  # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
  # in glibc 2.1.3, but that breaks too many other things.
  # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
! { echo "$as_me:$LINENO: checking for fseeko" >&5
! echo $ECHO_N "checking for fseeko... $ECHO_C" >&6; }
  if test "${ac_cv_func_fseeko+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 7357,7369 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_func_fseeko=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5
! echo "${ECHO_T}$ac_cv_func_fseeko" >&6
  if test $ac_cv_func_fseeko = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 8073,8086 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_func_fseeko=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5
! echo "${ECHO_T}$ac_cv_func_fseeko" >&6; }
  if test $ac_cv_func_fseeko = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 7378,7384 ****
    *" fseeko.$ac_objext"   | \
      "fseeko.$ac_objext "* | \
    *" fseeko.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS fseeko.$ac_objext" ;;
  esac
  
      case $LIBOBJS in
--- 8095,8102 ----
    *" fseeko.$ac_objext"   | \
      "fseeko.$ac_objext "* | \
    *" fseeko.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS fseeko.$ac_objext"
!  ;;
  esac
  
      case $LIBOBJS in
***************
*** 7386,7392 ****
    *" ftello.$ac_objext"   | \
      "ftello.$ac_objext "* | \
    *" ftello.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS ftello.$ac_objext" ;;
  esac
  
  fi
--- 8104,8111 ----
    *" ftello.$ac_objext"   | \
      "ftello.$ac_objext "* | \
    *" ftello.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS ftello.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 7398,7406 ****
  
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 8117,8125 ----
  
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 7426,7455 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 8145,8168 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 7481,7493 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 8194,8208 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 7499,7505 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 8214,8221 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 7515,7532 ****
  for ac_header in fcntl.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 8231,8249 ----
  for ac_header in fcntl.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 7563,7577 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 8280,8295 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 7605,7613 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 8323,8332 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 7641,7655 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 8360,8375 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 7661,7668 ****
  
  done
  
!  echo "$as_me:$LINENO: checking whether select hangs on /dev/null fd when timeout is NULL" >&5
! echo $ECHO_N "checking whether select hangs on /dev/null fd when timeout is NULL... $ECHO_C" >&6
  if test "${ccvs_cv_func_select_hang+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 8381,8388 ----
  
  done
  
!  { echo "$as_me:$LINENO: checking whether select hangs on /dev/null fd when timeout is NULL" >&5
! echo $ECHO_N "checking whether select hangs on /dev/null fd when timeout is NULL... $ECHO_C" >&6; }
  if test "${ccvs_cv_func_select_hang+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 7724,7735 ****
  ( exit $ac_status )
  ccvs_cv_func_select_hang=yes
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  fi
! echo "$as_me:$LINENO: result: $ccvs_cv_func_select_hang" >&5
! echo "${ECHO_T}$ccvs_cv_func_select_hang" >&6
    if test $ccvs_cv_func_select_hang = yes; then
  
  
--- 8444,8457 ----
  ( exit $ac_status )
  ccvs_cv_func_select_hang=yes
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $ccvs_cv_func_select_hang" >&5
! echo "${ECHO_T}$ccvs_cv_func_select_hang" >&6; }
    if test $ccvs_cv_func_select_hang = yes; then
  
  
***************
*** 7737,7754 ****
  for ac_header in fcntl.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 8459,8477 ----
  for ac_header in fcntl.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 7785,7799 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 8508,8523 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 7827,7835 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 8551,8560 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 7863,7877 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 8588,8603 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 7889,7895 ****
    *" sunos57-select.$ac_objext"   | \
      "sunos57-select.$ac_objext "* | \
    *" sunos57-select.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS sunos57-select.$ac_objext" ;;
  esac
  
  
--- 8615,8622 ----
    *" sunos57-select.$ac_objext"   | \
      "sunos57-select.$ac_objext "* | \
    *" sunos57-select.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS sunos57-select.$ac_objext"
!  ;;
  esac
  
  
***************
*** 7908,7915 ****
  # necessary.
  # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
  # for constant arguments.  Useless!
! echo "$as_me:$LINENO: checking for working alloca.h" >&5
! echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
  if test "${ac_cv_working_alloca_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 8635,8642 ----
  # necessary.
  # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
  # for constant arguments.  Useless!
! { echo "$as_me:$LINENO: checking for working alloca.h" >&5
! echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
  if test "${ac_cv_working_alloca_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 7955,7967 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_working_alloca_h=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
! echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
  if test $ac_cv_working_alloca_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 8682,8695 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_working_alloca_h=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
! echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
  if test $ac_cv_working_alloca_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 7970,7977 ****
  
  fi
  
! echo "$as_me:$LINENO: checking for alloca" >&5
! echo $ECHO_N "checking for alloca... $ECHO_C" >&6
  if test "${ac_cv_func_alloca_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 8698,8705 ----
  
  fi
  
! { echo "$as_me:$LINENO: checking for alloca" >&5
! echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
  if test "${ac_cv_func_alloca_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 8037,8049 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_func_alloca_works=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
! echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
  
  if test $ac_cv_func_alloca_works = yes; then
  
--- 8765,8778 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_func_alloca_works=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
! echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
  
  if test $ac_cv_func_alloca_works = yes; then
  
***************
*** 8057,8071 ****
  # contain a buggy version.  If you still want to use their alloca,
  # use ar to extract alloca.o from them instead of compiling alloca.c.
  
! ALLOCA=alloca.$ac_objext
  
  cat >>confdefs.h <<\_ACEOF
  #define C_ALLOCA 1
  _ACEOF
  
  
! echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
! echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
  if test "${ac_cv_os_cray+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 8786,8800 ----
  # contain a buggy version.  If you still want to use their alloca,
  # use ar to extract alloca.o from them instead of compiling alloca.c.
  
! ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
  
  cat >>confdefs.h <<\_ACEOF
  #define C_ALLOCA 1
  _ACEOF
  
  
! { echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
! echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
  if test "${ac_cv_os_cray+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 8091,8104 ****
  rm -f conftest*
  
  fi
! echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
! echo "${ECHO_T}$ac_cv_os_cray" >&6
  if test $ac_cv_os_cray = yes; then
    for ac_func in _getb67 GETB67 getb67; do
      as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 8820,8833 ----
  rm -f conftest*
  
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
! echo "${ECHO_T}$ac_cv_os_cray" >&6; }
  if test $ac_cv_os_cray = yes; then
    for ac_func in _getb67 GETB67 getb67; do
      as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 8124,8153 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 8853,8876 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 8179,8191 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 8902,8916 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 8198,8205 ****
    done
  fi
  
! echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
! echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
  if test "${ac_cv_c_stack_direction+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 8923,8930 ----
    done
  fi
  
! { echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
! echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
  if test "${ac_cv_c_stack_direction+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 8212,8217 ****
--- 8937,8943 ----
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
+ $ac_includes_default
  int
  find_stack_direction ()
  {
***************
*** 8252,8262 ****
  ( exit $ac_status )
  ac_cv_c_stack_direction=-1
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
! echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
  
  cat >>confdefs.h <<_ACEOF
  #define STACK_DIRECTION $ac_cv_c_stack_direction
--- 8978,8990 ----
  ( exit $ac_status )
  ac_cv_c_stack_direction=-1
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
! echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define STACK_DIRECTION $ac_cv_c_stack_direction
***************
*** 8270,8287 ****
  for ac_header in stdlib.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 8998,9016 ----
  for ac_header in stdlib.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 8318,8332 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 9047,9062 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 8360,8368 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 9090,9099 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 8396,8410 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 9127,9142 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 8416,8423 ****
  
  done
  
! echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
! echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6
  if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 9148,9155 ----
  
  done
  
! { echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
! echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6; }
  if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 8464,8474 ****
  ( exit $ac_status )
  ac_cv_func_malloc_0_nonnull=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
! echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6
  if test $ac_cv_func_malloc_0_nonnull = yes; then
    gl_cv_func_malloc_0_nonnull=1
  else
--- 9196,9208 ----
  ( exit $ac_status )
  ac_cv_func_malloc_0_nonnull=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
! echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6; }
  if test $ac_cv_func_malloc_0_nonnull = yes; then
    gl_cv_func_malloc_0_nonnull=1
  else
***************
*** 8483,8490 ****
  
  
  
!   echo "$as_me:$LINENO: checking for long long" >&5
! echo $ECHO_N "checking for long long... $ECHO_C" >&6
  if test "${ac_cv_type_long_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 9217,9224 ----
  
  
  
!   { echo "$as_me:$LINENO: checking for long long" >&5
! echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
  if test "${ac_cv_type_long_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 8531,8543 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_long_long=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
! echo "${ECHO_T}$ac_cv_type_long_long" >&6
    if test $ac_cv_type_long_long = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 9265,9278 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_long_long=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
! echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
    if test $ac_cv_type_long_long = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 8547,8554 ****
    fi
  
  
!   echo "$as_me:$LINENO: checking for long double" >&5
! echo $ECHO_N "checking for long double... $ECHO_C" >&6
  if test "${gt_cv_c_long_double+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 9282,9289 ----
    fi
  
  
!   { echo "$as_me:$LINENO: checking for long double" >&5
! echo $ECHO_N "checking for long double... $ECHO_C" >&6; }
  if test "${gt_cv_c_long_double+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 8602,8614 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gt_cv_c_long_double=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
       fi
  fi
! echo "$as_me:$LINENO: result: $gt_cv_c_long_double" >&5
! echo "${ECHO_T}$gt_cv_c_long_double" >&6
    if test $gt_cv_c_long_double = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 9337,9350 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gt_cv_c_long_double=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
       fi
  fi
! { echo "$as_me:$LINENO: result: $gt_cv_c_long_double" >&5
! echo "${ECHO_T}$gt_cv_c_long_double" >&6; }
    if test $gt_cv_c_long_double = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 8617,8624 ****
  
    fi
  
! echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5
! echo $ECHO_N "checking for C/C++ restrict keyword... $ECHO_C" >&6
  if test "${gl_cv_c_restrict+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 9353,9360 ----
  
    fi
  
! { echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5
! echo $ECHO_N "checking for C/C++ restrict keyword... $ECHO_C" >&6; }
  if test "${gl_cv_c_restrict+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 8661,8673 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     done
  
  fi
! echo "$as_me:$LINENO: result: $gl_cv_c_restrict" >&5
! echo "${ECHO_T}$gl_cv_c_restrict" >&6
   case $gl_cv_c_restrict in
     restrict) ;;
     no)
--- 9397,9411 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     done
  
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_c_restrict" >&5
! echo "${ECHO_T}$gl_cv_c_restrict" >&6; }
   case $gl_cv_c_restrict in
     restrict) ;;
     no)
***************
*** 8682,8689 ****
   esac
  
  
!   echo "$as_me:$LINENO: checking for IPv4 sockets" >&5
! echo $ECHO_N "checking for IPv4 sockets... $ECHO_C" >&6
    if test "${gl_cv_socket_ipv4+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 9420,9427 ----
   esac
  
  
!   { echo "$as_me:$LINENO: checking for IPv4 sockets" >&5
! echo $ECHO_N "checking for IPv4 sockets... $ECHO_C" >&6; }
    if test "${gl_cv_socket_ipv4+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 8731,8743 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gl_cv_socket_ipv4=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
!   echo "$as_me:$LINENO: result: $gl_cv_socket_ipv4" >&5
! echo "${ECHO_T}$gl_cv_socket_ipv4" >&6
    if test $gl_cv_socket_ipv4 = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 9469,9482 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gl_cv_socket_ipv4=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
!   { echo "$as_me:$LINENO: result: $gl_cv_socket_ipv4" >&5
! echo "${ECHO_T}$gl_cv_socket_ipv4" >&6; }
    if test $gl_cv_socket_ipv4 = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 8746,8753 ****
  
    fi
  
!   echo "$as_me:$LINENO: checking for IPv6 sockets" >&5
! echo $ECHO_N "checking for IPv6 sockets... $ECHO_C" >&6
    if test "${gl_cv_socket_ipv6+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 9485,9492 ----
  
    fi
  
!   { echo "$as_me:$LINENO: checking for IPv6 sockets" >&5
! echo $ECHO_N "checking for IPv6 sockets... $ECHO_C" >&6; }
    if test "${gl_cv_socket_ipv6+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 8795,8807 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gl_cv_socket_ipv6=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
!   echo "$as_me:$LINENO: result: $gl_cv_socket_ipv6" >&5
! echo "${ECHO_T}$gl_cv_socket_ipv6" >&6
    if test $gl_cv_socket_ipv6 = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 9534,9547 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gl_cv_socket_ipv6=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
!   { echo "$as_me:$LINENO: result: $gl_cv_socket_ipv6" >&5
! echo "${ECHO_T}$gl_cv_socket_ipv6" >&6; }
    if test $gl_cv_socket_ipv6 = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 8810,8817 ****
  
    fi
  
! echo "$as_me:$LINENO: 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" >&6
  else
--- 9550,9557 ----
  
    fi
  
! { echo "$as_me:$LINENO: 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" >&6
  else
***************
*** 8857,8869 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  
  fi
! echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
! echo "${ECHO_T}$ac_cv_c_inline" >&6
  
  
  case $ac_cv_c_inline in
--- 9597,9611 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
! echo "${ECHO_T}$ac_cv_c_inline" >&6; }
  
  
  case $ac_cv_c_inline in
***************
*** 8882,8894 ****
  esac
  
  
!   echo "$as_me:$LINENO: checking for library containing getaddrinfo" >&5
! echo $ECHO_N "checking for library containing getaddrinfo... $ECHO_C" >&6
  if test "${ac_cv_search_getaddrinfo+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
- ac_cv_search_getaddrinfo=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 9624,9635 ----
  esac
  
  
!   { echo "$as_me:$LINENO: checking for library containing getaddrinfo" >&5
! echo $ECHO_N "checking for library containing getaddrinfo... $ECHO_C" >&6; }
  if test "${ac_cv_search_getaddrinfo+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 8896,8972 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
- char getaddrinfo ();
- int
- main ()
- {
- getaddrinfo ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
- 	 { ac_try='test -z "$ac_c_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_search_getaddrinfo="none required"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_getaddrinfo" = no; then
-   for ac_lib in nsl socket; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char getaddrinfo ();
  int
  main ()
  {
! getaddrinfo ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 9637,9665 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
     builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char getaddrinfo ();
  int
  main ()
  {
! return getaddrinfo ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' nsl socket; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 8988,9010 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_getaddrinfo="-l$ac_lib"
! break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_getaddrinfo" >&5
! echo "${ECHO_T}$ac_cv_search_getaddrinfo" >&6
! if test "$ac_cv_search_getaddrinfo" != no; then
!   test "$ac_cv_search_getaddrinfo" = "none required" || LIBS="$ac_cv_search_getaddrinfo $LIBS"
  
  fi
  
--- 9681,9713 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_getaddrinfo=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_getaddrinfo+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search_getaddrinfo+set}" = set; then
!   :
! else
!   ac_cv_search_getaddrinfo=no
  fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_getaddrinfo" >&5
! echo "${ECHO_T}$ac_cv_search_getaddrinfo" >&6; }
! ac_res=$ac_cv_search_getaddrinfo
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
  
***************
*** 9013,9021 ****
  for ac_func in getaddrinfo gai_strerror
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 9716,9724 ----
  for ac_func in getaddrinfo gai_strerror
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 9041,9070 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 9744,9767 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 9096,9108 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 9793,9807 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 9114,9120 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 9813,9820 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 9127,9134 ****
  
  
  
! echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
! echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6
  if test "${ac_cv_header_stdbool_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 9827,9834 ----
  
  
  
! { echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
! echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6; }
  if test "${ac_cv_header_stdbool_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 9212,9225 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_header_stdbool_h=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
! echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6
!    echo "$as_me:$LINENO: checking for _Bool" >&5
! echo $ECHO_N "checking for _Bool... $ECHO_C" >&6
  if test "${ac_cv_type__Bool+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 9912,9926 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_header_stdbool_h=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
! echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6; }
!    { echo "$as_me:$LINENO: checking for _Bool" >&5
! echo $ECHO_N "checking for _Bool... $ECHO_C" >&6; }
  if test "${ac_cv_type__Bool+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 9268,9279 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type__Bool=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
! echo "${ECHO_T}$ac_cv_type__Bool" >&6
  if test $ac_cv_type__Bool = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 9969,9981 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type__Bool=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
! echo "${ECHO_T}$ac_cv_type__Bool" >&6; }
  if test $ac_cv_type__Bool = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 9298,9306 ****
  for ac_func in $gl_func_list
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 10000,10008 ----
  for ac_func in $gl_func_list
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 9326,9355 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 10028,10051 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 9381,9393 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 10077,10091 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 9409,9426 ****
  for ac_header in $gl_header_list
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 10107,10125 ----
  for ac_header in $gl_header_list
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 9457,9471 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 10156,10171 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 9499,9507 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 10199,10208 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 9535,9549 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 10236,10251 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 9567,9573 ****
    *" save-cwd.$ac_objext"   | \
      "save-cwd.$ac_objext "* | \
    *" save-cwd.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS save-cwd.$ac_objext" ;;
  esac
  
  
--- 10269,10276 ----
    *" save-cwd.$ac_objext"   | \
      "save-cwd.$ac_objext "* | \
    *" save-cwd.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS save-cwd.$ac_objext"
!  ;;
  esac
  
  
***************
*** 9586,9593 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether memrchr is declared" >&5
! echo $ECHO_N "checking whether memrchr is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_memrchr+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 10289,10296 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether memrchr is declared" >&5
! echo $ECHO_N "checking whether memrchr is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_memrchr+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 9636,9647 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_memrchr=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_memrchr" >&5
! echo "${ECHO_T}$ac_cv_have_decl_memrchr" >&6
  if test $ac_cv_have_decl_memrchr = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 10339,10351 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_memrchr=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_memrchr" >&5
! echo "${ECHO_T}$ac_cv_have_decl_memrchr" >&6; }
  if test $ac_cv_have_decl_memrchr = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 9660,9667 ****
  
  
  
!     echo "$as_me:$LINENO: checking whether system is Windows or MSDOS" >&5
! echo $ECHO_N "checking whether system is Windows or MSDOS... $ECHO_C" >&6
  if test "${ac_cv_win_or_dos+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 10364,10371 ----
  
  
  
!     { echo "$as_me:$LINENO: checking whether system is Windows or MSDOS" >&5
! echo $ECHO_N "checking whether system is Windows or MSDOS... $ECHO_C" >&6; }
  if test "${ac_cv_win_or_dos+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 9710,9722 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_win_or_dos=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
! echo "$as_me:$LINENO: result: $ac_cv_win_or_dos" >&5
! echo "${ECHO_T}$ac_cv_win_or_dos" >&6
  
      if test x"$ac_cv_win_or_dos" = xyes; then
        ac_fs_accepts_drive_letter_prefix=1
--- 10414,10427 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_win_or_dos=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_win_or_dos" >&5
! echo "${ECHO_T}$ac_cv_win_or_dos" >&6; }
  
      if test x"$ac_cv_win_or_dos" = xyes; then
        ac_fs_accepts_drive_letter_prefix=1
***************
*** 9744,9751 ****
  _ACEOF
  
  
! echo "$as_me:$LINENO: checking whether strerror_r is declared" >&5
! echo $ECHO_N "checking whether strerror_r is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_strerror_r+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 10449,10456 ----
  _ACEOF
  
  
! { echo "$as_me:$LINENO: checking whether strerror_r is declared" >&5
! echo $ECHO_N "checking whether strerror_r is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_strerror_r+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 9794,9805 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_strerror_r=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror_r" >&5
! echo "${ECHO_T}$ac_cv_have_decl_strerror_r" >&6
  if test $ac_cv_have_decl_strerror_r = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 10499,10511 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_strerror_r=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror_r" >&5
! echo "${ECHO_T}$ac_cv_have_decl_strerror_r" >&6; }
  if test $ac_cv_have_decl_strerror_r = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 9820,9828 ****
  for ac_func in strerror_r
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 10526,10534 ----
  for ac_func in strerror_r
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 9848,9877 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 10554,10577 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 9903,9915 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 10603,10617 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 9918,9925 ****
  fi
  done
  
! echo "$as_me:$LINENO: checking whether strerror_r returns char *" >&5
! echo $ECHO_N "checking whether strerror_r returns char *... $ECHO_C" >&6
  if test "${ac_cv_func_strerror_r_char_p+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 10620,10627 ----
  fi
  done
  
! { echo "$as_me:$LINENO: checking whether strerror_r returns char *" >&5
! echo $ECHO_N "checking whether strerror_r returns char *... $ECHO_C" >&6; }
  if test "${ac_cv_func_strerror_r_char_p+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 9972,9978 ****
--- 10674,10682 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
      else
        # strerror_r is not declared.  Choose between
***************
*** 10020,10032 ****
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
      fi
  
  fi
! echo "$as_me:$LINENO: result: $ac_cv_func_strerror_r_char_p" >&5
! echo "${ECHO_T}$ac_cv_func_strerror_r_char_p" >&6
  if test $ac_cv_func_strerror_r_char_p = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 10724,10738 ----
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
      fi
  
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_func_strerror_r_char_p" >&5
! echo "${ECHO_T}$ac_cv_func_strerror_r_char_p" >&6; }
  if test $ac_cv_func_strerror_r_char_p = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 10041,10048 ****
  
  
  
! echo "$as_me:$LINENO: checking for mbstate_t" >&5
! echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6
  if test "${ac_cv_type_mbstate_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 10747,10754 ----
  
  
  
! { echo "$as_me:$LINENO: checking for mbstate_t" >&5
! echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_mbstate_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 10089,10100 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_mbstate_t=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5
! echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6
     if test $ac_cv_type_mbstate_t = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 10795,10807 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_mbstate_t=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5
! echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6; }
     if test $ac_cv_type_mbstate_t = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 10118,10125 ****
  
  
  
!    echo "$as_me:$LINENO: checking whether getcwd (NULL, 0) allocates memory for result" >&5
! echo $ECHO_N "checking whether getcwd (NULL, 0) allocates memory for result... $ECHO_C" >&6
  if test "${gl_cv_func_getcwd_null+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 10825,10832 ----
  
  
  
!    { echo "$as_me:$LINENO: checking whether getcwd (NULL, 0) allocates memory for result" >&5
! echo $ECHO_N "checking whether getcwd (NULL, 0) allocates memory for result... $ECHO_C" >&6; }
  if test "${gl_cv_func_getcwd_null+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 10172,10186 ****
  ( exit $ac_status )
  gl_cv_func_getcwd_null=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
! echo "$as_me:$LINENO: result: $gl_cv_func_getcwd_null" >&5
! echo "${ECHO_T}$gl_cv_func_getcwd_null" >&6
  
  
!       echo "$as_me:$LINENO: checking whether getcwd is declared" >&5
! echo $ECHO_N "checking whether getcwd is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_getcwd+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 10879,10895 ----
  ( exit $ac_status )
  gl_cv_func_getcwd_null=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_func_getcwd_null" >&5
! echo "${ECHO_T}$gl_cv_func_getcwd_null" >&6; }
  
  
!       { echo "$as_me:$LINENO: checking whether getcwd is declared" >&5
! echo $ECHO_N "checking whether getcwd is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_getcwd+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 10229,10240 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_getcwd=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_getcwd" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getcwd" >&6
  if test $ac_cv_have_decl_getcwd = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 10938,10950 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_getcwd=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_getcwd" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getcwd" >&6; }
  if test $ac_cv_have_decl_getcwd = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 10252,10259 ****
  
  
  
!    echo "$as_me:$LINENO: checking for d_ino member in directory struct" >&5
! echo $ECHO_N "checking for d_ino member in directory struct... $ECHO_C" >&6
  if test "${jm_cv_struct_dirent_d_ino+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 10962,10969 ----
  
  
  
!    { echo "$as_me:$LINENO: checking for d_ino member in directory struct" >&5
! echo $ECHO_N "checking for d_ino member in directory struct... $ECHO_C" >&6; }
  if test "${jm_cv_struct_dirent_d_ino+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 10315,10329 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! jm_cv_struct_dirent_d_ino=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  
  
  fi
! echo "$as_me:$LINENO: result: $jm_cv_struct_dirent_d_ino" >&5
! echo "${ECHO_T}$jm_cv_struct_dirent_d_ino" >&6
     if test $jm_cv_struct_dirent_d_ino = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 11025,11040 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	jm_cv_struct_dirent_d_ino=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  
  
  fi
! { echo "$as_me:$LINENO: result: $jm_cv_struct_dirent_d_ino" >&5
! echo "${ECHO_T}$jm_cv_struct_dirent_d_ino" >&6; }
     if test $jm_cv_struct_dirent_d_ino = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 10333,10340 ****
     fi
  
  
! echo "$as_me:$LINENO: 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" >&6
  else
--- 11044,11051 ----
     fi
  
  
! { echo "$as_me:$LINENO: 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" >&6
  else
***************
*** 10384,10395 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_header_time=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: 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 <<\_ACEOF
--- 11095,11107 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_header_time=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: 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 <<\_ACEOF
***************
*** 10427,10434 ****
  
  
  
!   echo "$as_me:$LINENO: checking for struct timespec" >&5
! echo $ECHO_N "checking for struct timespec... $ECHO_C" >&6
  if test "${fu_cv_sys_struct_timespec+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 11139,11146 ----
  
  
  
!   { echo "$as_me:$LINENO: checking for struct timespec" >&5
! echo $ECHO_N "checking for struct timespec... $ECHO_C" >&6; }
  if test "${fu_cv_sys_struct_timespec+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 10485,10497 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! fu_cv_sys_struct_timespec=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
! echo "$as_me:$LINENO: result: $fu_cv_sys_struct_timespec" >&5
! echo "${ECHO_T}$fu_cv_sys_struct_timespec" >&6
  
    if test $fu_cv_sys_struct_timespec = yes; then
  
--- 11197,11210 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	fu_cv_sys_struct_timespec=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
! { echo "$as_me:$LINENO: result: $fu_cv_sys_struct_timespec" >&5
! echo "${ECHO_T}$fu_cv_sys_struct_timespec" >&6; }
  
    if test $fu_cv_sys_struct_timespec = yes; then
  
***************
*** 10504,10511 ****
  
  
  
!   echo "$as_me:$LINENO: checking whether nanosleep is declared" >&5
! echo $ECHO_N "checking whether nanosleep is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_nanosleep+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 11217,11224 ----
  
  
  
!   { echo "$as_me:$LINENO: checking whether nanosleep is declared" >&5
! echo $ECHO_N "checking whether nanosleep is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_nanosleep+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 10555,10566 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_nanosleep=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_nanosleep" >&5
! echo "${ECHO_T}$ac_cv_have_decl_nanosleep" >&6
  if test $ac_cv_have_decl_nanosleep = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 11268,11280 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_nanosleep=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_nanosleep" >&5
! echo "${ECHO_T}$ac_cv_have_decl_nanosleep" >&6; }
  if test $ac_cv_have_decl_nanosleep = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 10590,10597 ****
  
  
  
! echo "$as_me:$LINENO: 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" >&6
  else
--- 11304,11311 ----
  
  
  
! { echo "$as_me:$LINENO: 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" >&6
  else
***************
*** 10639,10650 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_struct_tm=sys/time.h
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: 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 <<\_ACEOF
--- 11353,11365 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_struct_tm=sys/time.h
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: 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 <<\_ACEOF
***************
*** 10664,10676 ****
    # programs in the package would end up linked with that potentially-shared
    # library, inducing unnecessary run-time overhead.
    gl_saved_libs=$LIBS
!     echo "$as_me:$LINENO: checking for library containing clock_gettime" >&5
! echo $ECHO_N "checking for library containing clock_gettime... $ECHO_C" >&6
  if test "${ac_cv_search_clock_gettime+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
- ac_cv_search_clock_gettime=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 11379,11390 ----
    # programs in the package would end up linked with that potentially-shared
    # library, inducing unnecessary run-time overhead.
    gl_saved_libs=$LIBS
!     { echo "$as_me:$LINENO: checking for library containing clock_gettime" >&5
! echo $ECHO_N "checking for library containing clock_gettime... $ECHO_C" >&6; }
  if test "${ac_cv_search_clock_gettime+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 10678,10754 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
- char clock_gettime ();
- int
- main ()
- {
- clock_gettime ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
- 	 { ac_try='test -z "$ac_c_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_search_clock_gettime="none required"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_clock_gettime" = no; then
-   for ac_lib in rt posix4; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char clock_gettime ();
  int
  main ()
  {
! clock_gettime ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 11392,11420 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
     builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char clock_gettime ();
  int
  main ()
  {
! return clock_gettime ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' rt posix4; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 10770,10792 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_clock_gettime="-l$ac_lib"
! break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_clock_gettime" >&5
! echo "${ECHO_T}$ac_cv_search_clock_gettime" >&6
! if test "$ac_cv_search_clock_gettime" != no; then
!   test "$ac_cv_search_clock_gettime" = "none required" || LIBS="$ac_cv_search_clock_gettime $LIBS"
    test "$ac_cv_search_clock_gettime" = "none required" ||
                      LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime
  fi
--- 11436,11468 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_clock_gettime=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_clock_gettime+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search_clock_gettime+set}" = set; then
!   :
! else
!   ac_cv_search_clock_gettime=no
  fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_clock_gettime" >&5
! echo "${ECHO_T}$ac_cv_search_clock_gettime" >&6; }
! ac_res=$ac_cv_search_clock_gettime
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
    test "$ac_cv_search_clock_gettime" = "none required" ||
                      LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime
  fi
***************
*** 10797,10805 ****
  for ac_func in clock_gettime clock_settime
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 11473,11481 ----
  for ac_func in clock_gettime clock_settime
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 10825,10854 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 11501,11524 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 10880,10892 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 11550,11564 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 10898,10905 ****
    LIBS=$gl_saved_libs
  
  
!  echo "$as_me:$LINENO: checking for struct tm.tm_gmtoff" >&5
! echo $ECHO_N "checking for struct tm.tm_gmtoff... $ECHO_C" >&6
  if test "${ac_cv_member_struct_tm_tm_gmtoff+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 11570,11577 ----
    LIBS=$gl_saved_libs
  
  
!  { echo "$as_me:$LINENO: checking for struct tm.tm_gmtoff" >&5
! echo $ECHO_N "checking for struct tm.tm_gmtoff... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_tm_tm_gmtoff+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 10948,10954 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 11620,11626 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 10993,11006 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_member_struct_tm_tm_gmtoff=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5
! echo "${ECHO_T}$ac_cv_member_struct_tm_tm_gmtoff" >&6
  if test $ac_cv_member_struct_tm_tm_gmtoff = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 11665,11680 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_member_struct_tm_tm_gmtoff=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5
! echo "${ECHO_T}$ac_cv_member_struct_tm_tm_gmtoff" >&6; }
  if test $ac_cv_member_struct_tm_tm_gmtoff = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 11011,11018 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether getdelim is declared" >&5
! echo $ECHO_N "checking whether getdelim is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_getdelim+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 11685,11692 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether getdelim is declared" >&5
! echo $ECHO_N "checking whether getdelim is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_getdelim+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 11061,11072 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_getdelim=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_getdelim" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getdelim" >&6
  if test $ac_cv_have_decl_getdelim = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 11735,11747 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_getdelim=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_getdelim" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getdelim" >&6; }
  if test $ac_cv_have_decl_getdelim = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 11085,11092 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether getlogin is declared" >&5
! echo $ECHO_N "checking whether getlogin is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_getlogin+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 11760,11767 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether getlogin is declared" >&5
! echo $ECHO_N "checking whether getlogin is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_getlogin+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 11135,11146 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_getlogin=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_getlogin" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getlogin" >&6
  if test $ac_cv_have_decl_getlogin = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 11810,11822 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_getlogin=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_getlogin" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getlogin" >&6; }
  if test $ac_cv_have_decl_getlogin = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 11159,11166 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether getlogin_r is declared" >&5
! echo $ECHO_N "checking whether getlogin_r is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_getlogin_r+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 11835,11842 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether getlogin_r is declared" >&5
! echo $ECHO_N "checking whether getlogin_r is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_getlogin_r+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 11209,11220 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_getlogin_r=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_getlogin_r" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getlogin_r" >&6
  if test $ac_cv_have_decl_getlogin_r = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 11885,11897 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_getlogin_r=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_getlogin_r" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getlogin_r" >&6; }
  if test $ac_cv_have_decl_getlogin_r = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 11233,11240 ****
  
  
  
!   echo "$as_me:$LINENO: checking for ssize_t" >&5
! echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
  if test "${gt_cv_ssize_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 11910,11917 ----
  
  
  
!   { echo "$as_me:$LINENO: checking for ssize_t" >&5
! echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
  if test "${gt_cv_ssize_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 11280,11291 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gt_cv_ssize_t=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gt_cv_ssize_t" >&5
! echo "${ECHO_T}$gt_cv_ssize_t" >&6
    if test $gt_cv_ssize_t = no; then
  
  cat >>confdefs.h <<\_ACEOF
--- 11957,11969 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gt_cv_ssize_t=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gt_cv_ssize_t" >&5
! echo "${ECHO_T}$gt_cv_ssize_t" >&6; }
    if test $gt_cv_ssize_t = no; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 11300,11317 ****
  for ac_header in getopt.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 11978,11996 ----
  for ac_header in getopt.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 11348,11362 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 12027,12042 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 11390,11398 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 12070,12079 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 11426,11440 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 12107,12122 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 11455,11463 ****
  for ac_func in getopt_long_only
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 12137,12145 ----
  for ac_func in getopt_long_only
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 11483,11512 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 12165,12188 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 11538,11550 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 12214,12228 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 11558,11565 ****
    fi
  
        if test -z "$GETOPT_H"; then
!     echo "$as_me:$LINENO: checking whether optreset is declared" >&5
! echo $ECHO_N "checking whether optreset is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_optreset+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 12236,12243 ----
    fi
  
        if test -z "$GETOPT_H"; then
!     { echo "$as_me:$LINENO: checking whether optreset is declared" >&5
! echo $ECHO_N "checking whether optreset is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_optreset+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 11609,11620 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_optreset=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_optreset" >&5
! echo "${ECHO_T}$ac_cv_have_decl_optreset" >&6
  if test $ac_cv_have_decl_optreset = yes; then
    GETOPT_H=getopt.h
  fi
--- 12287,12299 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_optreset=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_optreset" >&5
! echo "${ECHO_T}$ac_cv_have_decl_optreset" >&6; }
  if test $ac_cv_have_decl_optreset = yes; then
    GETOPT_H=getopt.h
  fi
***************
*** 11622,11635 ****
    fi
  
        if test -z "$GETOPT_H"; then
!     echo "$as_me:$LINENO: checking for working GNU getopt function" >&5
! echo $ECHO_N "checking for working GNU getopt function... $ECHO_C" >&6
  if test "${gl_cv_func_gnu_getopt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$cross_compiling" = yes; then
!   	 	 	 echo "$as_me:$LINENO: checking whether getopt_clip is declared" >&5
! echo $ECHO_N "checking whether getopt_clip is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_getopt_clip+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 12301,12314 ----
    fi
  
        if test -z "$GETOPT_H"; then
!     { echo "$as_me:$LINENO: checking for working GNU getopt function" >&5
! echo $ECHO_N "checking for working GNU getopt function... $ECHO_C" >&6; }
  if test "${gl_cv_func_gnu_getopt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$cross_compiling" = yes; then
!   	 	 	 { echo "$as_me:$LINENO: checking whether getopt_clip is declared" >&5
! echo $ECHO_N "checking whether getopt_clip is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_getopt_clip+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 11679,11690 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_getopt_clip=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_getopt_clip" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getopt_clip" >&6
  if test $ac_cv_have_decl_getopt_clip = yes; then
    gl_cv_func_gnu_getopt=no
  else
--- 12358,12370 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_getopt_clip=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_getopt_clip" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getopt_clip" >&6; }
  if test $ac_cv_have_decl_getopt_clip = yes; then
    gl_cv_func_gnu_getopt=no
  else
***************
*** 11733,11743 ****
  ( exit $ac_status )
  gl_cv_func_gnu_getopt=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
! echo "$as_me:$LINENO: result: $gl_cv_func_gnu_getopt" >&5
! echo "${ECHO_T}$gl_cv_func_gnu_getopt" >&6
      if test "$gl_cv_func_gnu_getopt" = "no"; then
        GETOPT_H=getopt.h
      fi
--- 12413,12425 ----
  ( exit $ac_status )
  gl_cv_func_gnu_getopt=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_func_gnu_getopt" >&5
! echo "${ECHO_T}$gl_cv_func_gnu_getopt" >&6; }
      if test "$gl_cv_func_gnu_getopt" = "no"; then
        GETOPT_H=getopt.h
      fi
***************
*** 11750,11757 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether getpass is declared" >&5
! echo $ECHO_N "checking whether getpass is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_getpass+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 12432,12439 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether getpass is declared" >&5
! echo $ECHO_N "checking whether getpass is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_getpass+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 11800,11811 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_getpass=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_getpass" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getpass" >&6
  if test $ac_cv_have_decl_getpass = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 12482,12494 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_getpass=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_getpass" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getpass" >&6; }
  if test $ac_cv_have_decl_getpass = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 11854,11861 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether fflush_unlocked is declared" >&5
! echo $ECHO_N "checking whether fflush_unlocked is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_fflush_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 12537,12544 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether fflush_unlocked is declared" >&5
! echo $ECHO_N "checking whether fflush_unlocked is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_fflush_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 11904,11915 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_fflush_unlocked=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_fflush_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_fflush_unlocked" >&6
  if test $ac_cv_have_decl_fflush_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 12587,12599 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_fflush_unlocked=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_fflush_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_fflush_unlocked" >&6; }
  if test $ac_cv_have_decl_fflush_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 11928,11935 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether flockfile is declared" >&5
! echo $ECHO_N "checking whether flockfile is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_flockfile+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 12612,12619 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether flockfile is declared" >&5
! echo $ECHO_N "checking whether flockfile is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_flockfile+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 11978,11989 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_flockfile=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_flockfile" >&5
! echo "${ECHO_T}$ac_cv_have_decl_flockfile" >&6
  if test $ac_cv_have_decl_flockfile = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 12662,12674 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_flockfile=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_flockfile" >&5
! echo "${ECHO_T}$ac_cv_have_decl_flockfile" >&6; }
  if test $ac_cv_have_decl_flockfile = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 12002,12009 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether fputs_unlocked is declared" >&5
! echo $ECHO_N "checking whether fputs_unlocked is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_fputs_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 12687,12694 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether fputs_unlocked is declared" >&5
! echo $ECHO_N "checking whether fputs_unlocked is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_fputs_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 12052,12063 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_fputs_unlocked=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_fputs_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_fputs_unlocked" >&6
  if test $ac_cv_have_decl_fputs_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 12737,12749 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_fputs_unlocked=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_fputs_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_fputs_unlocked" >&6; }
  if test $ac_cv_have_decl_fputs_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 12076,12083 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether funlockfile is declared" >&5
! echo $ECHO_N "checking whether funlockfile is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_funlockfile+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 12762,12769 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether funlockfile is declared" >&5
! echo $ECHO_N "checking whether funlockfile is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_funlockfile+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 12126,12137 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_funlockfile=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_funlockfile" >&5
! echo "${ECHO_T}$ac_cv_have_decl_funlockfile" >&6
  if test $ac_cv_have_decl_funlockfile = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 12812,12824 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_funlockfile=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_funlockfile" >&5
! echo "${ECHO_T}$ac_cv_have_decl_funlockfile" >&6; }
  if test $ac_cv_have_decl_funlockfile = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 12150,12157 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether putc_unlocked is declared" >&5
! echo $ECHO_N "checking whether putc_unlocked is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_putc_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 12837,12844 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether putc_unlocked is declared" >&5
! echo $ECHO_N "checking whether putc_unlocked is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_putc_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 12200,12211 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_putc_unlocked=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_putc_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_putc_unlocked" >&6
  if test $ac_cv_have_decl_putc_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 12887,12899 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_putc_unlocked=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_putc_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_putc_unlocked" >&6; }
  if test $ac_cv_have_decl_putc_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 12235,12242 ****
  
  
  
!    echo "$as_me:$LINENO: checking for d_type member in directory struct" >&5
! echo $ECHO_N "checking for d_type member in directory struct... $ECHO_C" >&6
  if test "${jm_cv_struct_dirent_d_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 12923,12930 ----
  
  
  
!    { echo "$as_me:$LINENO: checking for d_type member in directory struct" >&5
! echo $ECHO_N "checking for d_type member in directory struct... $ECHO_C" >&6; }
  if test "${jm_cv_struct_dirent_d_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 12298,12312 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! jm_cv_struct_dirent_d_type=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  
  
  fi
! echo "$as_me:$LINENO: result: $jm_cv_struct_dirent_d_type" >&5
! echo "${ECHO_T}$jm_cv_struct_dirent_d_type" >&6
     if test $jm_cv_struct_dirent_d_type = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 12986,13001 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	jm_cv_struct_dirent_d_type=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  
  
  fi
! { echo "$as_me:$LINENO: result: $jm_cv_struct_dirent_d_type" >&5
! echo "${ECHO_T}$jm_cv_struct_dirent_d_type" >&6; }
     if test $jm_cv_struct_dirent_d_type = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 12334,12341 ****
  
  
  
! echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
! echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6
  if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 13023,13030 ----
  
  
  
! { echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
! echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6; }
  if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 12384,12391 ****
  ( exit $ac_status )
  ac_cv_func_lstat_dereferences_slashed_symlink=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  else
    # If the `ln -s' command failed, then we probably don't even
    # have an lstat function.
--- 13073,13082 ----
  ( exit $ac_status )
  ac_cv_func_lstat_dereferences_slashed_symlink=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  else
    # If the `ln -s' command failed, then we probably don't even
    # have an lstat function.
***************
*** 12394,12401 ****
  rm -f conftest.sym conftest.file
  
  fi
! echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
! echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6
  
  test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
  
--- 13085,13092 ----
  rm -f conftest.sym conftest.file
  
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
! echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
  
  test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
  
***************
*** 12410,12416 ****
    *" lstat.$ac_objext"   | \
      "lstat.$ac_objext "* | \
    *" lstat.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS lstat.$ac_objext" ;;
  esac
  
  fi
--- 13101,13108 ----
    *" lstat.$ac_objext"   | \
      "lstat.$ac_objext "* | \
    *" lstat.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS lstat.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 12428,12435 ****
  
  
  
!   echo "$as_me:$LINENO: checking for uint32_t" >&5
! echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6
  if test "${gl_cv_c_uint32_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 13120,13127 ----
  
  
  
!   { echo "$as_me:$LINENO: checking for uint32_t" >&5
! echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6; }
  if test "${gl_cv_c_uint32_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 12480,12492 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
         test "$gl_cv_c_uint32_t" != no && break
       done
  fi
! echo "$as_me:$LINENO: result: $gl_cv_c_uint32_t" >&5
! echo "${ECHO_T}$gl_cv_c_uint32_t" >&6
    case "$gl_cv_c_uint32_t" in
    no|uint32_t) ;;
    *)
--- 13172,13186 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
         test "$gl_cv_c_uint32_t" != no && break
       done
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_c_uint32_t" >&5
! echo "${ECHO_T}$gl_cv_c_uint32_t" >&6; }
    case "$gl_cv_c_uint32_t" in
    no|uint32_t) ;;
    *)
***************
*** 12503,12510 ****
      ;;
    esac
  
!   echo "$as_me:$LINENO: checking for UINT32_MAX" >&5
! echo $ECHO_N "checking for UINT32_MAX... $ECHO_C" >&6
  if test "${gl_cv_c_uint32_max+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 13197,13204 ----
      ;;
    esac
  
!   { echo "$as_me:$LINENO: checking for UINT32_MAX" >&5
! echo $ECHO_N "checking for UINT32_MAX... $ECHO_C" >&6; }
  if test "${gl_cv_c_uint32_max+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 12552,12563 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gl_cv_c_uint32_max=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gl_cv_c_uint32_max" >&5
! echo "${ECHO_T}$gl_cv_c_uint32_max" >&6
    case $gl_cv_c_uint32_max,$gl_cv_c_uint32_t in
    yes,*) ;;
    *,no) ;;
--- 13246,13258 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gl_cv_c_uint32_max=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_c_uint32_max" >&5
! echo "${ECHO_T}$gl_cv_c_uint32_max" >&6; }
    case $gl_cv_c_uint32_max,$gl_cv_c_uint32_t in
    yes,*) ;;
    *,no) ;;
***************
*** 12570,12577 ****
      ;;
    esac
  
! echo "$as_me:$LINENO: 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" >&6
  else
--- 13265,13272 ----
      ;;
    esac
  
! { echo "$as_me:$LINENO: 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" >&6
  else
***************
*** 12666,12679 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_c_bigendian=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! # It does not; compile a test program.
  if test "$cross_compiling" = yes; then
    # try to guess the endianness by grepping values into an object file
    ac_cv_c_bigendian=unknown
--- 13361,13375 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_c_bigendian=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	# It does not; compile a test program.
  if test "$cross_compiling" = yes; then
    # try to guess the endianness by grepping values into an object file
    ac_cv_c_bigendian=unknown
***************
*** 12683,12693 ****
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
! short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
! short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
  void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
! short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
! short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
  void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
  int
  main ()
--- 13379,13389 ----
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
! short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
! short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
  void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
! short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
! short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
  void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
  int
  main ()
***************
*** 12734,12740 ****
--- 13430,13438 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 12743,12759 ****
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  int
  main ()
  {
    /* Are we little or big endian?  From Harbison&Steele.  */
    union
    {
!     long l;
!     char c[sizeof (long)];
    } u;
    u.l = 1;
!   exit (u.c[sizeof (long) - 1] == 1);
  }
  _ACEOF
  rm -f conftest$ac_exeext
--- 13441,13462 ----
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
+ $ac_includes_default
  int
  main ()
  {
+ 
    /* Are we little or big endian?  From Harbison&Steele.  */
    union
    {
!     long int l;
!     char c[sizeof (long int)];
    } u;
    u.l = 1;
!   exit (u.c[sizeof (long int) - 1] == 1);
! 
!   ;
!   return 0;
  }
  _ACEOF
  rm -f conftest$ac_exeext
***************
*** 12776,12788 ****
  ( exit $ac_status )
  ac_cv_c_bigendian=yes
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
! echo "${ECHO_T}$ac_cv_c_bigendian" >&6
  case $ac_cv_c_bigendian in
    yes)
  
--- 13479,13494 ----
  ( exit $ac_status )
  ac_cv_c_bigendian=yes
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
! echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
  case $ac_cv_c_bigendian in
    yes)
  
***************
*** 12804,12811 ****
  
  
  
!   echo "$as_me:$LINENO: checking whether <limits.h> defines MIN and MAX" >&5
! echo $ECHO_N "checking whether <limits.h> defines MIN and MAX... $ECHO_C" >&6
  if test "${gl_cv_minmax_in_limits_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 13510,13517 ----
  
  
  
!   { echo "$as_me:$LINENO: checking whether <limits.h> defines MIN and MAX" >&5
! echo $ECHO_N "checking whether <limits.h> defines MIN and MAX... $ECHO_C" >&6; }
  if test "${gl_cv_minmax_in_limits_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 12852,12863 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gl_cv_minmax_in_limits_h=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gl_cv_minmax_in_limits_h" >&5
! echo "${ECHO_T}$gl_cv_minmax_in_limits_h" >&6
    if test $gl_cv_minmax_in_limits_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 13558,13570 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gl_cv_minmax_in_limits_h=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_minmax_in_limits_h" >&5
! echo "${ECHO_T}$gl_cv_minmax_in_limits_h" >&6; }
    if test $gl_cv_minmax_in_limits_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 12871,12878 ****
  
  
  
!   echo "$as_me:$LINENO: checking whether <sys/param.h> defines MIN and MAX" >&5
! echo $ECHO_N "checking whether <sys/param.h> defines MIN and MAX... $ECHO_C" >&6
  if test "${gl_cv_minmax_in_sys_param_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 13578,13585 ----
  
  
  
!   { echo "$as_me:$LINENO: checking whether <sys/param.h> defines MIN and MAX" >&5
! echo $ECHO_N "checking whether <sys/param.h> defines MIN and MAX... $ECHO_C" >&6; }
  if test "${gl_cv_minmax_in_sys_param_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 12919,12930 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gl_cv_minmax_in_sys_param_h=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gl_cv_minmax_in_sys_param_h" >&5
! echo "${ECHO_T}$gl_cv_minmax_in_sys_param_h" >&6
    if test $gl_cv_minmax_in_sys_param_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 13626,13638 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gl_cv_minmax_in_sys_param_h=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_minmax_in_sys_param_h" >&5
! echo "${ECHO_T}$gl_cv_minmax_in_sys_param_h" >&6; }
    if test $gl_cv_minmax_in_sys_param_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 12943,12950 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether getenv is declared" >&5
! echo $ECHO_N "checking whether getenv is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_getenv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 13651,13658 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether getenv is declared" >&5
! echo $ECHO_N "checking whether getenv is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_getenv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 12993,13004 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_getenv=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_getenv" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getenv" >&6
  if test $ac_cv_have_decl_getenv = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 13701,13713 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_getenv=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_getenv" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getenv" >&6; }
  if test $ac_cv_have_decl_getenv = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 13017,13024 ****
  
  
  
!   echo "$as_me:$LINENO: checking for inttypes.h" >&5
! echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
  if test "${gl_cv_header_inttypes_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 13726,13733 ----
  
  
  
!   { echo "$as_me:$LINENO: checking for inttypes.h" >&5
! echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; }
  if test "${gl_cv_header_inttypes_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 13065,13076 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gl_cv_header_inttypes_h=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5
! echo "${ECHO_T}$gl_cv_header_inttypes_h" >&6
    if test $gl_cv_header_inttypes_h = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 13774,13786 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gl_cv_header_inttypes_h=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_header_inttypes_h" >&5
! echo "${ECHO_T}$gl_cv_header_inttypes_h" >&6; }
    if test $gl_cv_header_inttypes_h = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 13080,13087 ****
    fi
  
  
!   echo "$as_me:$LINENO: checking for stdint.h" >&5
! echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6
  if test "${gl_cv_header_stdint_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 13790,13797 ----
    fi
  
  
!   { echo "$as_me:$LINENO: checking for stdint.h" >&5
! echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; }
  if test "${gl_cv_header_stdint_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 13128,13139 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gl_cv_header_stdint_h=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5
! echo "${ECHO_T}$gl_cv_header_stdint_h" >&6
    if test $gl_cv_header_stdint_h = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 13838,13850 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gl_cv_header_stdint_h=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5
! echo "${ECHO_T}$gl_cv_header_stdint_h" >&6; }
    if test $gl_cv_header_stdint_h = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 13143,13150 ****
    fi
  
  
!   echo "$as_me:$LINENO: checking for unsigned long long" >&5
! echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6
  if test "${ac_cv_type_unsigned_long_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 13854,13861 ----
    fi
  
  
!   { echo "$as_me:$LINENO: checking for unsigned long long" >&5
! echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6; }
  if test "${ac_cv_type_unsigned_long_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 13191,13203 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_unsigned_long_long=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5
! echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6
    if test $ac_cv_type_unsigned_long_long = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 13902,13915 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_unsigned_long_long=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5
! echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6; }
    if test $ac_cv_type_unsigned_long_long = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 13233,13250 ****
  for ac_header in stdlib.h sys/time.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 13945,13963 ----
  for ac_header in stdlib.h sys/time.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 13281,13295 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 13994,14009 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 13323,13331 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 14037,14046 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 13359,13373 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 14074,14089 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 13383,13391 ****
  for ac_func in alarm
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 14099,14107 ----
  for ac_func in alarm
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 13411,13440 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 14127,14150 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 13466,13478 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 14176,14190 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 13481,13488 ****
  fi
  done
  
! echo "$as_me:$LINENO: checking for working mktime" >&5
! echo $ECHO_N "checking for working mktime... $ECHO_C" >&6
  if test "${ac_cv_func_working_mktime+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 14193,14200 ----
  fi
  done
  
! { echo "$as_me:$LINENO: checking for working mktime" >&5
! echo $ECHO_N "checking for working mktime... $ECHO_C" >&6; }
  if test "${ac_cv_func_working_mktime+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 13676,13693 ****
  ( exit $ac_status )
  ac_cv_func_working_mktime=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_func_working_mktime" >&5
! echo "${ECHO_T}$ac_cv_func_working_mktime" >&6
  if test $ac_cv_func_working_mktime = no; then
    case $LIBOBJS in
      "mktime.$ac_objext"   | \
    *" mktime.$ac_objext"   | \
      "mktime.$ac_objext "* | \
    *" mktime.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS mktime.$ac_objext" ;;
  esac
  
  fi
--- 14388,14408 ----
  ( exit $ac_status )
  ac_cv_func_working_mktime=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_func_working_mktime" >&5
! echo "${ECHO_T}$ac_cv_func_working_mktime" >&6; }
  if test $ac_cv_func_working_mktime = no; then
    case $LIBOBJS in
      "mktime.$ac_objext"   | \
    *" mktime.$ac_objext"   | \
      "mktime.$ac_objext "* | \
    *" mktime.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS mktime.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 13710,13727 ****
  for ac_header in stdlib.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 14425,14443 ----
  for ac_header in stdlib.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 13758,13772 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 14474,14489 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 13800,13808 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 14517,14526 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 13836,13850 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 14554,14569 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 13860,13868 ****
  for ac_func in getpagesize
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 14579,14587 ----
  for ac_func in getpagesize
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 13888,13917 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 14607,14630 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 13943,13955 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 14656,14670 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 13958,13965 ****
  fi
  done
  
! echo "$as_me:$LINENO: checking for working mmap" >&5
! echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
  if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 14673,14680 ----
  fi
  done
  
! { echo "$as_me:$LINENO: checking for working mmap" >&5
! echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; }
  if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 14074,14080 ****
    data2 = (char *) malloc (2 * pagesize);
    if (!data2)
      exit (1);
!   data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);
    if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
  		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
      exit (1);
--- 14789,14795 ----
    data2 = (char *) malloc (2 * pagesize);
    if (!data2)
      exit (1);
!   data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
    if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
  		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
      exit (1);
***************
*** 14119,14129 ****
  ( exit $ac_status )
  ac_cv_func_mmap_fixed_mapped=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
! echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
  if test $ac_cv_func_mmap_fixed_mapped = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 14834,14846 ----
  ( exit $ac_status )
  ac_cv_func_mmap_fixed_mapped=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
! echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; }
  if test $ac_cv_func_mmap_fixed_mapped = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 14137,14144 ****
    # Try to allow MAP_ANONYMOUS.
    gl_have_mmap_anonymous=no
    if test $ac_cv_func_mmap_fixed_mapped = yes; then
!     echo "$as_me:$LINENO: checking for MAP_ANONYMOUS" >&5
! echo $ECHO_N "checking for MAP_ANONYMOUS... $ECHO_C" >&6
      cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 14854,14861 ----
    # Try to allow MAP_ANONYMOUS.
    gl_have_mmap_anonymous=no
    if test $ac_cv_func_mmap_fixed_mapped = yes; then
!     { echo "$as_me:$LINENO: checking for MAP_ANONYMOUS" >&5
! echo $ECHO_N "checking for MAP_ANONYMOUS... $ECHO_C" >&6; }
      cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 14184,14191 ****
  rm -f conftest*
  
      fi
!     echo "$as_me:$LINENO: result: $gl_have_mmap_anonymous" >&5
! echo "${ECHO_T}$gl_have_mmap_anonymous" >&6
      if test $gl_have_mmap_anonymous = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 14901,14908 ----
  rm -f conftest*
  
      fi
!     { echo "$as_me:$LINENO: result: $gl_have_mmap_anonymous" >&5
! echo "${ECHO_T}$gl_have_mmap_anonymous" >&6; }
      if test $gl_have_mmap_anonymous = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 14214,14221 ****
  
  
  
!   echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
! echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
  if test "${am_cv_langinfo_codeset+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 14931,14938 ----
  
  
  
!   { echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
! echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; }
  if test "${am_cv_langinfo_codeset+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 14261,14274 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! am_cv_langinfo_codeset=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  
  fi
! echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
! echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
    if test $am_cv_langinfo_codeset = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 14978,14992 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	am_cv_langinfo_codeset=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  
  fi
! { echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
! echo "${ECHO_T}$am_cv_langinfo_codeset" >&6; }
    if test $am_cv_langinfo_codeset = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 14308,14315 ****
  
  
  
!   echo "$as_me:$LINENO: checking for inttypes.h" >&5
! echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
  if test "${gt_cv_header_inttypes_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 15026,15033 ----
  
  
  
!   { echo "$as_me:$LINENO: checking for inttypes.h" >&5
! echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6; }
  if test "${gt_cv_header_inttypes_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 14357,14369 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gt_cv_header_inttypes_h=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
! echo "$as_me:$LINENO: result: $gt_cv_header_inttypes_h" >&5
! echo "${ECHO_T}$gt_cv_header_inttypes_h" >&6
    if test $gt_cv_header_inttypes_h = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 15075,15088 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gt_cv_header_inttypes_h=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
! { echo "$as_me:$LINENO: result: $gt_cv_header_inttypes_h" >&5
! echo "${ECHO_T}$gt_cv_header_inttypes_h" >&6; }
    if test $gt_cv_header_inttypes_h = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 14373,14380 ****
    fi
  
  
!       echo "$as_me:$LINENO: checking whether strdup is declared" >&5
! echo $ECHO_N "checking whether strdup is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_strdup+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 15092,15099 ----
    fi
  
  
!       { echo "$as_me:$LINENO: checking whether strdup is declared" >&5
! echo $ECHO_N "checking whether strdup is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_strdup+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 14423,14434 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_strdup=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_strdup" >&5
! echo "${ECHO_T}$ac_cv_have_decl_strdup" >&6
  if test $ac_cv_have_decl_strdup = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 15142,15154 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_strdup=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_strdup" >&5
! echo "${ECHO_T}$ac_cv_have_decl_strdup" >&6; }
  if test $ac_cv_have_decl_strdup = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 14450,14458 ****
  for ac_func in strftime
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 15170,15178 ----
  for ac_func in strftime
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 14478,14507 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 15198,15221 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 14533,14545 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 15247,15261 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 14547,14554 ****
  
  else
    # strftime is in -lintl on SCO UNIX.
! echo "$as_me:$LINENO: checking for strftime in -lintl" >&5
! echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6
  if test "${ac_cv_lib_intl_strftime+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 15263,15270 ----
  
  else
    # strftime is in -lintl on SCO UNIX.
! { echo "$as_me:$LINENO: checking for strftime in -lintl" >&5
! echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6; }
  if test "${ac_cv_lib_intl_strftime+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 14561,14577 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char strftime ();
  int
  main ()
  {
! strftime ();
    ;
    return 0;
  }
--- 15277,15293 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char strftime ();
  int
  main ()
  {
! return strftime ();
    ;
    return 0;
  }
***************
*** 14603,14616 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_lib_intl_strftime=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5
! echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6
  if test $ac_cv_lib_intl_strftime = yes; then
    cat >>confdefs.h <<\_ACEOF
  #define HAVE_STRFTIME 1
--- 15319,15333 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_lib_intl_strftime=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5
! echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6; }
  if test $ac_cv_lib_intl_strftime = yes; then
    cat >>confdefs.h <<\_ACEOF
  #define HAVE_STRFTIME 1
***************
*** 14647,14653 ****
    *" strftime.$ac_objext"   | \
      "strftime.$ac_objext "* | \
    *" strftime.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS strftime.$ac_objext" ;;
  esac
  
  
--- 15364,15371 ----
    *" strftime.$ac_objext"   | \
      "strftime.$ac_objext "* | \
    *" strftime.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS strftime.$ac_objext"
!  ;;
  esac
  
  
***************
*** 14695,14702 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether clearerr_unlocked is declared" >&5
! echo $ECHO_N "checking whether clearerr_unlocked is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_clearerr_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 15413,15420 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether clearerr_unlocked is declared" >&5
! echo $ECHO_N "checking whether clearerr_unlocked is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_clearerr_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 14745,14756 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_clearerr_unlocked=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_clearerr_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_clearerr_unlocked" >&6
  if test $ac_cv_have_decl_clearerr_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 15463,15475 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_clearerr_unlocked=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_clearerr_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_clearerr_unlocked" >&6; }
  if test $ac_cv_have_decl_clearerr_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 14769,14776 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether feof_unlocked is declared" >&5
! echo $ECHO_N "checking whether feof_unlocked is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 15488,15495 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether feof_unlocked is declared" >&5
! echo $ECHO_N "checking whether feof_unlocked is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 14819,14830 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_feof_unlocked=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6
  if test $ac_cv_have_decl_feof_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 15538,15550 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_feof_unlocked=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6; }
  if test $ac_cv_have_decl_feof_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 14843,14850 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether ferror_unlocked is declared" >&5
! echo $ECHO_N "checking whether ferror_unlocked is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_ferror_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 15563,15570 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether ferror_unlocked is declared" >&5
! echo $ECHO_N "checking whether ferror_unlocked is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_ferror_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 14893,14904 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_ferror_unlocked=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_ferror_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_ferror_unlocked" >&6
  if test $ac_cv_have_decl_ferror_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 15613,15625 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_ferror_unlocked=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_ferror_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_ferror_unlocked" >&6; }
  if test $ac_cv_have_decl_ferror_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 14917,14924 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether fgets_unlocked is declared" >&5
! echo $ECHO_N "checking whether fgets_unlocked is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 15638,15645 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether fgets_unlocked is declared" >&5
! echo $ECHO_N "checking whether fgets_unlocked is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 14967,14978 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_fgets_unlocked=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_fgets_unlocked" >&6
  if test $ac_cv_have_decl_fgets_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 15688,15700 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_fgets_unlocked=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_fgets_unlocked" >&6; }
  if test $ac_cv_have_decl_fgets_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 14991,14998 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether fputc_unlocked is declared" >&5
! echo $ECHO_N "checking whether fputc_unlocked is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_fputc_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 15713,15720 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether fputc_unlocked is declared" >&5
! echo $ECHO_N "checking whether fputc_unlocked is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_fputc_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 15041,15052 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_fputc_unlocked=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_fputc_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_fputc_unlocked" >&6
  if test $ac_cv_have_decl_fputc_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 15763,15775 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_fputc_unlocked=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_fputc_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_fputc_unlocked" >&6; }
  if test $ac_cv_have_decl_fputc_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 15065,15072 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether fread_unlocked is declared" >&5
! echo $ECHO_N "checking whether fread_unlocked is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_fread_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 15788,15795 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether fread_unlocked is declared" >&5
! echo $ECHO_N "checking whether fread_unlocked is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_fread_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 15115,15126 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_fread_unlocked=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_fread_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_fread_unlocked" >&6
  if test $ac_cv_have_decl_fread_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 15838,15850 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_fread_unlocked=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_fread_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_fread_unlocked" >&6; }
  if test $ac_cv_have_decl_fread_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 15139,15146 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether fwrite_unlocked is declared" >&5
! echo $ECHO_N "checking whether fwrite_unlocked is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_fwrite_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 15863,15870 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether fwrite_unlocked is declared" >&5
! echo $ECHO_N "checking whether fwrite_unlocked is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_fwrite_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 15189,15200 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_fwrite_unlocked=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_fwrite_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_fwrite_unlocked" >&6
  if test $ac_cv_have_decl_fwrite_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 15913,15925 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_fwrite_unlocked=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_fwrite_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_fwrite_unlocked" >&6; }
  if test $ac_cv_have_decl_fwrite_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 15213,15220 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5
! echo $ECHO_N "checking whether getc_unlocked is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 15938,15945 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5
! echo $ECHO_N "checking whether getc_unlocked is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 15263,15274 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_getc_unlocked=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6
  if test $ac_cv_have_decl_getc_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 15988,16000 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_getc_unlocked=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6; }
  if test $ac_cv_have_decl_getc_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 15287,15294 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether getchar_unlocked is declared" >&5
! echo $ECHO_N "checking whether getchar_unlocked is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_getchar_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 16013,16020 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether getchar_unlocked is declared" >&5
! echo $ECHO_N "checking whether getchar_unlocked is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_getchar_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 15337,15348 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_getchar_unlocked=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_getchar_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getchar_unlocked" >&6
  if test $ac_cv_have_decl_getchar_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 16063,16075 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_getchar_unlocked=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_getchar_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getchar_unlocked" >&6; }
  if test $ac_cv_have_decl_getchar_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 15361,15368 ****
  
  
  
!       echo "$as_me:$LINENO: checking whether putchar_unlocked is declared" >&5
! echo $ECHO_N "checking whether putchar_unlocked is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_putchar_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 16088,16095 ----
  
  
  
!       { echo "$as_me:$LINENO: checking whether putchar_unlocked is declared" >&5
! echo $ECHO_N "checking whether putchar_unlocked is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_putchar_unlocked+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 15411,15422 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_putchar_unlocked=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_putchar_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_putchar_unlocked" >&6
  if test $ac_cv_have_decl_putchar_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 16138,16150 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_putchar_unlocked=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_putchar_unlocked" >&5
! echo "${ECHO_T}$ac_cv_have_decl_putchar_unlocked" >&6; }
  if test $ac_cv_have_decl_putchar_unlocked = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 15436,15443 ****
  
  
  
!   echo "$as_me:$LINENO: checking for EOVERFLOW" >&5
! echo $ECHO_N "checking for EOVERFLOW... $ECHO_C" >&6
  if test "${ac_cv_decl_EOVERFLOW+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 16164,16171 ----
  
  
  
!   { echo "$as_me:$LINENO: checking for EOVERFLOW" >&5
! echo $ECHO_N "checking for EOVERFLOW... $ECHO_C" >&6; }
  if test "${ac_cv_decl_EOVERFLOW+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 15584,15603 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr $ac_mid + 1`
! 		    if test $ac_lo -le $ac_mid; then
! 		      ac_lo= ac_hi=
! 		      break
! 		    fi
! 		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 16312,16332 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr $ac_mid + 1`
! 			if test $ac_lo -le $ac_mid; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 15694,15716 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_hi=`expr '(' $ac_mid ')' - 1`
! 		       if test $ac_mid -le $ac_hi; then
! 			 ac_lo= ac_hi=
! 			 break
! 		       fi
! 		       ac_mid=`expr 2 '*' $ac_mid`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo= ac_hi=
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
--- 16423,16448 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_hi=`expr '(' $ac_mid ')' - 1`
! 			if test $ac_mid -le $ac_hi; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo= ac_hi=
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
***************
*** 15765,15772 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
--- 16497,16505 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
***************
*** 15774,15786 ****
  '')  ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 16507,16512 ----
***************
*** 15794,15801 ****
  #include <stdio.h>
  #include <stdlib.h>
  
! long longval () { return EOVERFLOW; }
! unsigned long ulongval () { return EOVERFLOW; }
  #include <stdio.h>
  #include <stdlib.h>
  int
--- 16520,16527 ----
  #include <stdio.h>
  #include <stdlib.h>
  
! static long int longval () { return EOVERFLOW; }
! static unsigned long int ulongval () { return EOVERFLOW; }
  #include <stdio.h>
  #include <stdlib.h>
  int
***************
*** 15807,15820 ****
      exit (1);
    if ((EOVERFLOW) < 0)
      {
!       long i = longval ();
        if (i != (EOVERFLOW))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long i = ulongval ();
        if (i != (EOVERFLOW))
  	exit (1);
        fprintf (f, "%lu\n", i);
--- 16533,16546 ----
      exit (1);
    if ((EOVERFLOW) < 0)
      {
!       long int i = longval ();
        if (i != (EOVERFLOW))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long int i = ulongval ();
        if (i != (EOVERFLOW))
  	exit (1);
        fprintf (f, "%lu\n", i);
***************
*** 15843,15850 ****
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
! fi
  fi
  rm -f conftest.val
        else
--- 16569,16575 ----
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
        else
***************
*** 15853,15860 ****
      fi
  
  fi
! echo "$as_me:$LINENO: result: $ac_cv_decl_EOVERFLOW" >&5
! echo "${ECHO_T}$ac_cv_decl_EOVERFLOW" >&6
    if test "$ac_cv_decl_EOVERFLOW" != yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 16578,16585 ----
      fi
  
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_decl_EOVERFLOW" >&5
! echo "${ECHO_T}$ac_cv_decl_EOVERFLOW" >&6; }
    if test "$ac_cv_decl_EOVERFLOW" != yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 15866,15873 ****
    fi
  
  
!   echo "$as_me:$LINENO: checking for signed" >&5
! echo $ECHO_N "checking for signed... $ECHO_C" >&6
  if test "${bh_cv_c_signed+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 16591,16598 ----
    fi
  
  
!   { echo "$as_me:$LINENO: checking for signed" >&5
! echo $ECHO_N "checking for signed... $ECHO_C" >&6; }
  if test "${bh_cv_c_signed+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 15913,15924 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! bh_cv_c_signed=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $bh_cv_c_signed" >&5
! echo "${ECHO_T}$bh_cv_c_signed" >&6
    if test $bh_cv_c_signed = no; then
  
  cat >>confdefs.h <<\_ACEOF
--- 16638,16650 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	bh_cv_c_signed=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $bh_cv_c_signed" >&5
! echo "${ECHO_T}$bh_cv_c_signed" >&6; }
    if test $bh_cv_c_signed = no; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 15928,15935 ****
    fi
  
  
!   echo "$as_me:$LINENO: checking for wchar_t" >&5
! echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
  if test "${gt_cv_c_wchar_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 16654,16661 ----
    fi
  
  
!   { echo "$as_me:$LINENO: checking for wchar_t" >&5
! echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6; }
  if test "${gt_cv_c_wchar_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 15976,15987 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gt_cv_c_wchar_t=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5
! echo "${ECHO_T}$gt_cv_c_wchar_t" >&6
    if test $gt_cv_c_wchar_t = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 16702,16714 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gt_cv_c_wchar_t=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5
! echo "${ECHO_T}$gt_cv_c_wchar_t" >&6; }
    if test $gt_cv_c_wchar_t = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 15991,15998 ****
    fi
  
  
!   echo "$as_me:$LINENO: checking for wint_t" >&5
! echo $ECHO_N "checking for wint_t... $ECHO_C" >&6
  if test "${gt_cv_c_wint_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 16718,16725 ----
    fi
  
  
!   { echo "$as_me:$LINENO: checking for wint_t" >&5
! echo $ECHO_N "checking for wint_t... $ECHO_C" >&6; }
  if test "${gt_cv_c_wint_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 16039,16050 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gt_cv_c_wint_t=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5
! echo "${ECHO_T}$gt_cv_c_wint_t" >&6
    if test $gt_cv_c_wint_t = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 16766,16778 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gt_cv_c_wint_t=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5
! echo "${ECHO_T}$gt_cv_c_wint_t" >&6; }
    if test $gt_cv_c_wint_t = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 16053,16060 ****
  
    fi
  
! echo "$as_me:$LINENO: 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" >&6
  else
--- 16781,16788 ----
  
    fi
  
! { echo "$as_me:$LINENO: 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" >&6
  else
***************
*** 16103,16120 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_size_t=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: 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 <<_ACEOF
! #define size_t unsigned
  _ACEOF
  
  fi
--- 16831,16849 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_size_t=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: 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 <<_ACEOF
! #define size_t unsigned int
  _ACEOF
  
  fi
***************
*** 16122,16129 ****
  
  
  
!   echo "$as_me:$LINENO: checking for intmax_t" >&5
! echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6
  if test "${gt_cv_c_intmax_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 16851,16858 ----
  
  
  
!   { echo "$as_me:$LINENO: checking for intmax_t" >&5
! echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6; }
  if test "${gt_cv_c_intmax_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 16178,16189 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gt_cv_c_intmax_t=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5
! echo "${ECHO_T}$gt_cv_c_intmax_t" >&6
    if test $gt_cv_c_intmax_t = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 16907,16919 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gt_cv_c_intmax_t=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5
! echo "${ECHO_T}$gt_cv_c_intmax_t" >&6; }
    if test $gt_cv_c_intmax_t = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 16261,16269 ****
  for ac_func in atexit
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 16991,16999 ----
  for ac_func in atexit
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 16289,16318 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 17019,17042 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 16344,16356 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 17068,17082 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 16362,16368 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 17088,17095 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 16382,16388 ****
    *" canon-host.$ac_objext"   | \
      "canon-host.$ac_objext "* | \
    *" canon-host.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS canon-host.$ac_objext" ;;
  esac
  
  
--- 17109,17116 ----
    *" canon-host.$ac_objext"   | \
      "canon-host.$ac_objext "* | \
    *" canon-host.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS canon-host.$ac_objext"
!  ;;
  esac
  
  
***************
*** 16396,16402 ****
    *" canonicalize.$ac_objext"   | \
      "canonicalize.$ac_objext "* | \
    *" canonicalize.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS canonicalize.$ac_objext" ;;
  esac
  
  
--- 17124,17131 ----
    *" canonicalize.$ac_objext"   | \
      "canonicalize.$ac_objext "* | \
    *" canonicalize.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS canonicalize.$ac_objext"
!  ;;
  esac
  
  
***************
*** 16406,16423 ****
  for ac_header in string.h sys/param.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 17135,17153 ----
  for ac_header in string.h sys/param.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 16454,16468 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 17184,17199 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 16496,16504 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 17227,17236 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 16532,16546 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 17264,17279 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 16557,16565 ****
  for ac_func in resolvepath canonicalize_file_name
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 17290,17298 ----
  for ac_func in resolvepath canonicalize_file_name
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 16585,16614 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 17318,17341 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 16640,16652 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 17367,17381 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 16658,16665 ****
  
  
  
!   echo "$as_me:$LINENO: checking whether this system has a definition of PATH_MAX" >&5
! echo $ECHO_N "checking whether this system has a definition of PATH_MAX... $ECHO_C" >&6
  if test "${gl_have_path_max_definition+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 17387,17394 ----
  
  
  
!   { echo "$as_me:$LINENO: checking whether this system has a definition of PATH_MAX" >&5
! echo $ECHO_N "checking whether this system has a definition of PATH_MAX... $ECHO_C" >&6; }
  if test "${gl_have_path_max_definition+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 16684,16691 ****
  rm -f conftest*
  
  fi
! echo "$as_me:$LINENO: result: $gl_have_path_max_definition" >&5
! echo "${ECHO_T}$gl_have_path_max_definition" >&6
  
    if test $gl_have_path_max_definition; then
      case $LIBOBJS in
--- 17413,17420 ----
  rm -f conftest*
  
  fi
! { echo "$as_me:$LINENO: result: $gl_have_path_max_definition" >&5
! echo "${ECHO_T}$gl_have_path_max_definition" >&6; }
  
    if test $gl_have_path_max_definition; then
      case $LIBOBJS in
***************
*** 16693,16699 ****
    *" chdir-long.$ac_objext"   | \
      "chdir-long.$ac_objext "* | \
    *" chdir-long.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS chdir-long.$ac_objext" ;;
  esac
  
  
--- 17422,17429 ----
    *" chdir-long.$ac_objext"   | \
      "chdir-long.$ac_objext "* | \
    *" chdir-long.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS chdir-long.$ac_objext"
!  ;;
  esac
  
  
***************
*** 16725,16733 ****
  for ac_func in mempcpy
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 17455,17463 ----
  for ac_func in mempcpy
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 16753,16782 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 17483,17506 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 16808,16820 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 17532,17546 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 16826,16832 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 17552,17559 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 16846,16854 ****
  for ac_func in openat
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 17573,17581 ----
  for ac_func in openat
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 16874,16903 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 17601,17624 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 16929,16941 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 17650,17664 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 16947,16953 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 17670,17677 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 16984,16992 ****
  for ac_func in memrchr
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 17708,17716 ----
  for ac_func in memrchr
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 17012,17041 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 17736,17759 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 17067,17079 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 17785,17799 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 17085,17091 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 17805,17812 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 17106,17112 ****
    *" closeout.$ac_objext"   | \
      "closeout.$ac_objext "* | \
    *" closeout.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS closeout.$ac_objext" ;;
  esac
  
  
--- 17827,17834 ----
    *" closeout.$ac_objext"   | \
      "closeout.$ac_objext "* | \
    *" closeout.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS closeout.$ac_objext"
!  ;;
  esac
  
  
***************
*** 17119,17125 ****
    *" dirname.$ac_objext"   | \
      "dirname.$ac_objext "* | \
    *" dirname.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS dirname.$ac_objext" ;;
  esac
  
  
--- 17841,17848 ----
    *" dirname.$ac_objext"   | \
      "dirname.$ac_objext "* | \
    *" dirname.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS dirname.$ac_objext"
!  ;;
  esac
  
  
***************
*** 17131,17139 ****
  for ac_func in dup2
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 17854,17862 ----
  for ac_func in dup2
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 17159,17188 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 17882,17905 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 17214,17226 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 17931,17945 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 17232,17238 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 17951,17958 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 17264,17270 ****
    *" exitfail.$ac_objext"   | \
      "exitfail.$ac_objext "* | \
    *" exitfail.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS exitfail.$ac_objext" ;;
  esac
  
  
--- 17984,17991 ----
    *" exitfail.$ac_objext"   | \
      "exitfail.$ac_objext "* | \
    *" exitfail.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS exitfail.$ac_objext"
!  ;;
  esac
  
  
***************
*** 17277,17283 ****
    *" filenamecat.$ac_objext"   | \
      "filenamecat.$ac_objext "* | \
    *" filenamecat.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS filenamecat.$ac_objext" ;;
  esac
  
  
--- 17998,18005 ----
    *" filenamecat.$ac_objext"   | \
      "filenamecat.$ac_objext "* | \
    *" filenamecat.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS filenamecat.$ac_objext"
!  ;;
  esac
  
  
***************
*** 17292,17299 ****
    # No macro. You should also use one of fnmatch-posix or fnmatch-gnu.
  
    FNMATCH_H=
!   echo "$as_me:$LINENO: checking for working POSIX fnmatch" >&5
! echo $ECHO_N "checking for working POSIX fnmatch... $ECHO_C" >&6
  if test "${ac_cv_func_fnmatch_posix+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 18014,18021 ----
    # No macro. You should also use one of fnmatch-posix or fnmatch-gnu.
  
    FNMATCH_H=
!   { echo "$as_me:$LINENO: checking for working POSIX fnmatch" >&5
! echo $ECHO_N "checking for working POSIX fnmatch... $ECHO_C" >&6; }
  if test "${ac_cv_func_fnmatch_posix+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 17347,17362 ****
  ( exit $ac_status )
  ac_cv_func_fnmatch_posix=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_func_fnmatch_posix" >&5
! echo "${ECHO_T}$ac_cv_func_fnmatch_posix" >&6
  if test $ac_cv_func_fnmatch_posix = yes; then
    rm -f lib/fnmatch.h
  else
!   echo "$as_me:$LINENO: checking whether getenv is declared" >&5
! echo $ECHO_N "checking whether getenv is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_getenv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 18069,18086 ----
  ( exit $ac_status )
  ac_cv_func_fnmatch_posix=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_func_fnmatch_posix" >&5
! echo "${ECHO_T}$ac_cv_func_fnmatch_posix" >&6; }
  if test $ac_cv_func_fnmatch_posix = yes; then
    rm -f lib/fnmatch.h
  else
!   { echo "$as_me:$LINENO: checking whether getenv is declared" >&5
! echo $ECHO_N "checking whether getenv is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_getenv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 17405,17416 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_getenv=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_getenv" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getenv" >&6
  if test $ac_cv_have_decl_getenv = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 18129,18141 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_getenv=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_getenv" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getenv" >&6; }
  if test $ac_cv_have_decl_getenv = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 17436,17444 ****
  for ac_func in btowc mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 18161,18169 ----
  for ac_func in btowc mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 17464,17493 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 18189,18212 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 17519,17531 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 18238,18252 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 17539,17556 ****
  for ac_header in wchar.h wctype.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 18260,18278 ----
  for ac_header in wchar.h wctype.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 17587,17601 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 18309,18324 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 17629,17637 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 18352,18361 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 17665,17679 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 18389,18404 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 17690,17696 ****
    *" fnmatch.$ac_objext"   | \
      "fnmatch.$ac_objext "* | \
    *" fnmatch.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS fnmatch.$ac_objext" ;;
  esac
  
  FNMATCH_H=fnmatch.h
--- 18415,18422 ----
    *" fnmatch.$ac_objext"   | \
      "fnmatch.$ac_objext "* | \
    *" fnmatch.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS fnmatch.$ac_objext"
!  ;;
  esac
  
  FNMATCH_H=fnmatch.h
***************
*** 17714,17731 ****
  for ac_header in stdio_ext.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 18440,18458 ----
  for ac_header in stdio_ext.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 17762,17776 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 18489,18504 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 17804,17812 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 18532,18541 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 17840,17854 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 18569,18584 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 17864,17872 ****
  for ac_func in __fpending
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 18594,18602 ----
  for ac_func in __fpending
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 17892,17921 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 18622,18645 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 17947,17959 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 18671,18685 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 17965,17971 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 18691,18698 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 17977,17984 ****
  #      include <stdio_ext.h>
  #     endif
  '
!   echo "$as_me:$LINENO: checking whether __fpending is declared" >&5
! echo $ECHO_N "checking whether __fpending is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl___fpending+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 18704,18711 ----
  #      include <stdio_ext.h>
  #     endif
  '
!   { echo "$as_me:$LINENO: checking whether __fpending is declared" >&5
! echo $ECHO_N "checking whether __fpending is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl___fpending+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 18028,18039 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl___fpending=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl___fpending" >&5
! echo "${ECHO_T}$ac_cv_have_decl___fpending" >&6
  if test $ac_cv_have_decl___fpending = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 18755,18767 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl___fpending=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl___fpending" >&5
! echo "${ECHO_T}$ac_cv_have_decl___fpending" >&6; }
  if test $ac_cv_have_decl___fpending = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 18051,18058 ****
  
  
    if test $ac_cv_func___fpending = no; then
!     echo "$as_me:$LINENO: checking how to determine the number of pending output bytes on a stream" >&5
! echo $ECHO_N "checking how to determine the number of pending output bytes on a stream... $ECHO_C" >&6
  if test "${ac_cv_sys_pending_output_n_bytes+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 18779,18786 ----
  
  
    if test $ac_cv_func___fpending = no; then
!     { echo "$as_me:$LINENO: checking how to determine the number of pending output bytes on a stream" >&5
! echo $ECHO_N "checking how to determine the number of pending output bytes on a stream... $ECHO_C" >&6; }
  if test "${ac_cv_sys_pending_output_n_bytes+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 18131,18137 ****
--- 18859,18867 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  	  test "$fp_done" = yes && break
  	done
***************
*** 18140,18147 ****
  
  
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sys_pending_output_n_bytes" >&5
! echo "${ECHO_T}$ac_cv_sys_pending_output_n_bytes" >&6
  
  cat >>confdefs.h <<_ACEOF
  #define PENDING_OUTPUT_N_BYTES $ac_cv_sys_pending_output_n_bytes
--- 18870,18877 ----
  
  
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sys_pending_output_n_bytes" >&5
! echo "${ECHO_T}$ac_cv_sys_pending_output_n_bytes" >&6; }
  
  cat >>confdefs.h <<_ACEOF
  #define PENDING_OUTPUT_N_BYTES $ac_cv_sys_pending_output_n_bytes
***************
*** 18154,18162 ****
  for ac_func in ftruncate
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 18884,18892 ----
  for ac_func in ftruncate
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 18182,18211 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 18912,18935 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 18237,18249 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 18961,18975 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 18255,18261 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 18981,18988 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 18275,18283 ****
  for ac_func in chsize
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 19002,19010 ----
  for ac_func in chsize
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 18303,18332 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 19030,19053 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 18358,18370 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 19079,19093 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 18377,18389 ****
    fi
  
  
!   echo "$as_me:$LINENO: checking for library containing getaddrinfo" >&5
! echo $ECHO_N "checking for library containing getaddrinfo... $ECHO_C" >&6
  if test "${ac_cv_search_getaddrinfo+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
- ac_cv_search_getaddrinfo=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 19100,19111 ----
    fi
  
  
!   { echo "$as_me:$LINENO: checking for library containing getaddrinfo" >&5
! echo $ECHO_N "checking for library containing getaddrinfo... $ECHO_C" >&6; }
  if test "${ac_cv_search_getaddrinfo+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 18391,18467 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
- char getaddrinfo ();
- int
- main ()
- {
- getaddrinfo ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
- 	 { ac_try='test -z "$ac_c_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_search_getaddrinfo="none required"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_getaddrinfo" = no; then
-   for ac_lib in nsl socket; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char getaddrinfo ();
  int
  main ()
  {
! getaddrinfo ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 19113,19141 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
     builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char getaddrinfo ();
  int
  main ()
  {
! return getaddrinfo ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' nsl socket; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 18483,18505 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_getaddrinfo="-l$ac_lib"
! break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_getaddrinfo" >&5
! echo "${ECHO_T}$ac_cv_search_getaddrinfo" >&6
! if test "$ac_cv_search_getaddrinfo" != no; then
!   test "$ac_cv_search_getaddrinfo" = "none required" || LIBS="$ac_cv_search_getaddrinfo $LIBS"
  
  fi
  
--- 19157,19189 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_getaddrinfo=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_getaddrinfo+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search_getaddrinfo+set}" = set; then
!   :
! else
!   ac_cv_search_getaddrinfo=no
  fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_getaddrinfo" >&5
! echo "${ECHO_T}$ac_cv_search_getaddrinfo" >&6; }
! ac_res=$ac_cv_search_getaddrinfo
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
  
***************
*** 18508,18516 ****
  for ac_func in getaddrinfo gai_strerror
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 19192,19200 ----
  for ac_func in getaddrinfo gai_strerror
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 18536,18565 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 19220,19243 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 18591,18603 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 19269,19283 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 18609,18615 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 19289,19296 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 18635,18642 ****
  
  
  
!   echo "$as_me:$LINENO: checking whether getcwd handles long file names properly" >&5
! echo $ECHO_N "checking whether getcwd handles long file names properly... $ECHO_C" >&6
  if test "${gl_cv_func_getcwd_path_max+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 19316,19323 ----
  
  
  
!   { echo "$as_me:$LINENO: checking whether getcwd handles long file names properly" >&5
! echo $ECHO_N "checking whether getcwd handles long file names properly... $ECHO_C" >&6; }
  if test "${gl_cv_func_getcwd_path_max+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 18823,18834 ****
       *) gl_cv_func_getcwd_path_max=no;;
       esac
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  fi
! echo "$as_me:$LINENO: result: $gl_cv_func_getcwd_path_max" >&5
! echo "${ECHO_T}$gl_cv_func_getcwd_path_max" >&6
    case $gl_cv_func_getcwd_path_max in
    no,*)
  
--- 19504,19517 ----
       *) gl_cv_func_getcwd_path_max=no;;
       esac
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_func_getcwd_path_max" >&5
! echo "${ECHO_T}$gl_cv_func_getcwd_path_max" >&6; }
    case $gl_cv_func_getcwd_path_max in
    no,*)
  
***************
*** 18848,18854 ****
    *" getcwd.$ac_objext"   | \
      "getcwd.$ac_objext "* | \
    *" getcwd.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS getcwd.$ac_objext" ;;
  esac
  
  
--- 19531,19538 ----
    *" getcwd.$ac_objext"   | \
      "getcwd.$ac_objext "* | \
    *" getcwd.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS getcwd.$ac_objext"
!  ;;
  esac
  
  
***************
*** 18871,18877 ****
    *" getdate.$ac_objext"   | \
      "getdate.$ac_objext "* | \
    *" getdate.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS getdate.$ac_objext" ;;
  esac
  
  
--- 19555,19562 ----
    *" getdate.$ac_objext"   | \
      "getdate.$ac_objext "* | \
    *" getdate.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS getdate.$ac_objext"
!  ;;
  esac
  
  
***************
*** 18887,18894 ****
  
  
  
!   echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
! echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6
  if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 19572,19579 ----
  
  
  
!   { echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
! echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6; }
  if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 18939,18945 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 19624,19630 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 18986,18999 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_member_struct_tm_tm_zone=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
! echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6
  if test $ac_cv_member_struct_tm_tm_zone = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 19671,19686 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_member_struct_tm_tm_zone=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
! echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6; }
  if test $ac_cv_member_struct_tm_tm_zone = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 19010,19017 ****
  _ACEOF
  
  else
!   echo "$as_me:$LINENO: checking for tzname" >&5
! echo $ECHO_N "checking for tzname... $ECHO_C" >&6
  if test "${ac_cv_var_tzname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 19697,19778 ----
  _ACEOF
  
  else
!   { echo "$as_me:$LINENO: checking whether tzname is declared" >&5
! echo $ECHO_N "checking whether tzname is declared... $ECHO_C" >&6; }
! if test "${ac_cv_have_decl_tzname+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! #include <time.h>
! 
! int
! main ()
! {
! #ifndef tzname
!   char *p = (char *) tzname;
! #endif
! 
!   ;
!   return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext
! if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
!   (eval $ac_compile) 2>conftest.er1
!   ac_status=$?
!   grep -v '^ *+' conftest.er1 >conftest.err
!   rm -f conftest.er1
!   cat conftest.err >&5
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"
! 			 || test ! -s conftest.err'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; } &&
! 	 { ac_try='test -s conftest.$ac_objext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
!   ac_cv_have_decl_tzname=yes
! else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! 	ac_cv_have_decl_tzname=no
! fi
! 
! rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5
! echo "${ECHO_T}$ac_cv_have_decl_tzname" >&6; }
! if test $ac_cv_have_decl_tzname = yes; then
! 
! cat >>confdefs.h <<_ACEOF
! #define HAVE_DECL_TZNAME 1
! _ACEOF
! 
! 
! else
!   cat >>confdefs.h <<_ACEOF
! #define HAVE_DECL_TZNAME 0
! _ACEOF
! 
! 
! fi
! 
! 
!   { echo "$as_me:$LINENO: checking for tzname" >&5
! echo $ECHO_N "checking for tzname... $ECHO_C" >&6; }
  if test "${ac_cv_var_tzname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 19022,19035 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <time.h>
! #ifndef tzname /* For SGI.  */
! extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
  #endif
  
  int
  main ()
  {
! atoi(*tzname);
    ;
    return 0;
  }
--- 19783,19796 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <time.h>
! #if !HAVE_DECL_TZNAME
! extern char *tzname[];
  #endif
  
  int
  main ()
  {
! return tzname[0][0];
    ;
    return 0;
  }
***************
*** 19061,19073 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_var_tzname=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
! echo "${ECHO_T}$ac_cv_var_tzname" >&6
    if test $ac_cv_var_tzname = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 19822,19835 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_var_tzname=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
! echo "${ECHO_T}$ac_cv_var_tzname" >&6; }
    if test $ac_cv_var_tzname = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 19089,19097 ****
  for ac_func in getdelim
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 19851,19859 ----
  for ac_func in getdelim
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 19117,19146 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 19879,19902 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 19172,19184 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 19928,19942 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 19190,19196 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 19948,19955 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 19212,19220 ****
  for ac_func in flockfile funlockfile
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 19971,19979 ----
  for ac_func in flockfile funlockfile
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 19240,19269 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 19999,20022 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 19295,19307 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 20048,20062 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 19318,19326 ****
  for ac_func in gethostname
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 20073,20081 ----
  for ac_func in gethostname
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 19346,19375 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 20101,20124 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 19401,19413 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 20150,20164 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 19419,19425 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 20170,20177 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 19432,19440 ****
  for ac_func in uname
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 20184,20192 ----
  for ac_func in uname
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 19460,19489 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 20212,20235 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 19515,19527 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 20261,20275 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 19538,19545 ****
  
  
  
!   echo "$as_me:$LINENO: checking whether getline is declared" >&5
! echo $ECHO_N "checking whether getline is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_getline+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 20286,20293 ----
  
  
  
!   { echo "$as_me:$LINENO: checking whether getline is declared" >&5
! echo $ECHO_N "checking whether getline is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_getline+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 19588,19599 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_getline=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_getline" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getline" >&6
  if test $ac_cv_have_decl_getline = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 20336,20348 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_getline=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_getline" >&5
! echo "${ECHO_T}$ac_cv_have_decl_getline" >&6; }
  if test $ac_cv_have_decl_getline = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 19612,19619 ****
  
  
    gl_getline_needs_run_time_check=no
!   echo "$as_me:$LINENO: checking for getline" >&5
! echo $ECHO_N "checking for getline... $ECHO_C" >&6
  if test "${ac_cv_func_getline+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 20361,20368 ----
  
  
    gl_getline_needs_run_time_check=no
!   { echo "$as_me:$LINENO: checking for getline" >&5
! echo $ECHO_N "checking for getline... $ECHO_C" >&6; }
  if test "${ac_cv_func_getline+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 19640,19669 ****
  
  #undef getline
  
! /* 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 getline ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_getline) || defined (__stub___getline)
  choke me
- #else
- char (*f) () = getline;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != getline;
    ;
    return 0;
  }
--- 20389,20412 ----
  
  #undef getline
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char getline ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_getline) || defined (__stub___getline)
  choke me
  #endif
  
  int
  main ()
  {
! return getline ();
    ;
    return 0;
  }
***************
*** 19695,19707 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_func_getline=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_func_getline" >&5
! echo "${ECHO_T}$ac_cv_func_getline" >&6
  if test $ac_cv_func_getline = yes; then
    		gl_getline_needs_run_time_check=yes
  else
--- 20438,20451 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_func_getline=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_func_getline" >&5
! echo "${ECHO_T}$ac_cv_func_getline" >&6; }
  if test $ac_cv_func_getline = yes; then
    		gl_getline_needs_run_time_check=yes
  else
***************
*** 19709,19716 ****
  fi
  
    if test $gl_getline_needs_run_time_check = yes; then
!     echo "$as_me:$LINENO: checking for working getline function" >&5
! echo $ECHO_N "checking for working getline function... $ECHO_C" >&6
  if test "${am_cv_func_working_getline+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 20453,20460 ----
  fi
  
    if test $gl_getline_needs_run_time_check = yes; then
!     { echo "$as_me:$LINENO: checking for working getline function" >&5
! echo $ECHO_N "checking for working getline function... $ECHO_C" >&6; }
  if test "${am_cv_func_working_getline+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 19761,19771 ****
  ( exit $ac_status )
  am_cv_func_working_getline=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
! echo "$as_me:$LINENO: result: $am_cv_func_working_getline" >&5
! echo "${ECHO_T}$am_cv_func_working_getline" >&6
    fi
  
    if test $am_cv_func_working_getline = no; then
--- 20505,20517 ----
  ( exit $ac_status )
  am_cv_func_working_getline=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $am_cv_func_working_getline" >&5
! echo "${ECHO_T}$am_cv_func_working_getline" >&6; }
    fi
  
    if test $am_cv_func_working_getline = no; then
***************
*** 19779,19785 ****
    *" getline.$ac_objext"   | \
      "getline.$ac_objext "* | \
    *" getline.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS getline.$ac_objext" ;;
  esac
  
  
--- 20525,20532 ----
    *" getline.$ac_objext"   | \
      "getline.$ac_objext "* | \
    *" getline.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS getline.$ac_objext"
!  ;;
  esac
  
  
***************
*** 19793,19801 ****
  for ac_func in getdelim
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 20540,20548 ----
  for ac_func in getdelim
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 19821,19850 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 20568,20591 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 19876,19888 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 20617,20631 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 19894,19900 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 20637,20644 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 19916,19924 ****
  for ac_func in flockfile funlockfile
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 20660,20668 ----
  for ac_func in flockfile funlockfile
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 19944,19973 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 20688,20711 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 19999,20011 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 20737,20751 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 20025,20033 ****
  for ac_func in getlogin_r
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 20765,20773 ----
  for ac_func in getlogin_r
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 20053,20082 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 20793,20816 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 20108,20120 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 20842,20856 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 20126,20132 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 20862,20869 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 20160,20166 ****
    *" getlogin_r.$ac_objext"   | \
      "getlogin_r.$ac_objext "* | \
    *" getlogin_r.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS getlogin_r.$ac_objext" ;;
  esac
  
  
--- 20897,20904 ----
    *" getlogin_r.$ac_objext"   | \
      "getlogin_r.$ac_objext "* | \
    *" getlogin_r.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS getlogin_r.$ac_objext"
!  ;;
  esac
  
  
***************
*** 20176,20182 ****
    *" getndelim2.$ac_objext"   | \
      "getndelim2.$ac_objext "* | \
    *" getndelim2.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS getndelim2.$ac_objext" ;;
  esac
  ;;
    esac
--- 20914,20921 ----
    *" getndelim2.$ac_objext"   | \
      "getndelim2.$ac_objext "* | \
    *" getndelim2.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS getndelim2.$ac_objext"
!  ;;
  esac
  ;;
    esac
***************
*** 20198,20204 ****
    *" getopt.$ac_objext"   | \
      "getopt.$ac_objext "* | \
    *" getopt.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS getopt.$ac_objext" ;;
  esac
  
    case $LIBOBJS in
--- 20937,20944 ----
    *" getopt.$ac_objext"   | \
      "getopt.$ac_objext "* | \
    *" getopt.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS getopt.$ac_objext"
!  ;;
  esac
  
    case $LIBOBJS in
***************
*** 20206,20212 ****
    *" getopt1.$ac_objext"   | \
      "getopt1.$ac_objext "* | \
    *" getopt1.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS getopt1.$ac_objext" ;;
  esac
  
  
--- 20946,20953 ----
    *" getopt1.$ac_objext"   | \
      "getopt1.$ac_objext "* | \
    *" getopt1.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS getopt1.$ac_objext"
!  ;;
  esac
  
  
***************
*** 20240,20257 ****
  for ac_header in OS.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 20981,20999 ----
  for ac_header in OS.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 20288,20302 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 21030,21045 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 20330,20338 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 21073,21082 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 20366,20380 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 21110,21125 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 20390,20398 ****
  for ac_func in getpagesize
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 21135,21143 ----
  for ac_func in getpagesize
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 20418,20447 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 21163,21186 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 20473,20485 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 21212,21226 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 20504,20510 ****
    *" getpass.$ac_objext"   | \
      "getpass.$ac_objext "* | \
    *" getpass.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS getpass.$ac_objext" ;;
  esac
  
  
--- 21245,21252 ----
    *" getpass.$ac_objext"   | \
      "getpass.$ac_objext "* | \
    *" getpass.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS getpass.$ac_objext"
!  ;;
  esac
  
  
***************
*** 20564,20570 ****
    *" gettime.$ac_objext"   | \
      "gettime.$ac_objext "* | \
    *" gettime.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS gettime.$ac_objext" ;;
  esac
  
  
--- 21306,21313 ----
    *" gettime.$ac_objext"   | \
      "gettime.$ac_objext "* | \
    *" gettime.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS gettime.$ac_objext"
!  ;;
  esac
  
  
***************
*** 20583,20590 ****
  
  
  
!  echo "$as_me:$LINENO: checking whether gettimeofday clobbers localtime buffer" >&5
! echo $ECHO_N "checking whether gettimeofday clobbers localtime buffer... $ECHO_C" >&6
  if test "${jm_cv_func_gettimeofday_clobber+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 21326,21333 ----
  
  
  
!  { echo "$as_me:$LINENO: checking whether gettimeofday clobbers localtime buffer" >&5
! echo $ECHO_N "checking whether gettimeofday clobbers localtime buffer... $ECHO_C" >&6; }
  if test "${jm_cv_func_gettimeofday_clobber+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 20651,20662 ****
  ( exit $ac_status )
  jm_cv_func_gettimeofday_clobber=yes
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  fi
! echo "$as_me:$LINENO: result: $jm_cv_func_gettimeofday_clobber" >&5
! echo "${ECHO_T}$jm_cv_func_gettimeofday_clobber" >&6
    if test $jm_cv_func_gettimeofday_clobber = yes; then
  
    case $LIBOBJS in
--- 21394,21407 ----
  ( exit $ac_status )
  jm_cv_func_gettimeofday_clobber=yes
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $jm_cv_func_gettimeofday_clobber" >&5
! echo "${ECHO_T}$jm_cv_func_gettimeofday_clobber" >&6; }
    if test $jm_cv_func_gettimeofday_clobber = yes; then
  
    case $LIBOBJS in
***************
*** 20664,20670 ****
    *" gettimeofday.$ac_objext"   | \
      "gettimeofday.$ac_objext "* | \
    *" gettimeofday.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS gettimeofday.$ac_objext" ;;
  esac
  
  
--- 21409,21416 ----
    *" gettimeofday.$ac_objext"   | \
      "gettimeofday.$ac_objext "* | \
    *" gettimeofday.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS gettimeofday.$ac_objext"
!  ;;
  esac
  
  
***************
*** 20694,20711 ****
  for ac_header in glob.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 21440,21458 ----
  for ac_header in glob.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 20742,20756 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 21489,21504 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 20784,20792 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 21532,21541 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 20820,20834 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 21569,21584 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 20844,20851 ****
  
  
    if test -z "$GLOB_H"; then
!     echo "$as_me:$LINENO: checking for GNU glob interface version 1" >&5
! echo $ECHO_N "checking for GNU glob interface version 1... $ECHO_C" >&6
  if test "${gl_cv_gnu_glob_interface_version_1+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 21594,21601 ----
  
  
    if test -z "$GLOB_H"; then
!     { echo "$as_me:$LINENO: checking for GNU glob interface version 1" >&5
! echo $ECHO_N "checking for GNU glob interface version 1... $ECHO_C" >&6; }
  if test "${gl_cv_gnu_glob_interface_version_1+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 20880,20891 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gl_cv_gnu_glob_interface_version_1=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gl_cv_gnu_glob_interface_version_1" >&5
! echo "${ECHO_T}$gl_cv_gnu_glob_interface_version_1" >&6
  
      if test "$gl_cv_gnu_glob_interface_version_1" = "no"; then
        GLOB_H=glob.h
--- 21630,21642 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gl_cv_gnu_glob_interface_version_1=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_gnu_glob_interface_version_1" >&5
! echo "${ECHO_T}$gl_cv_gnu_glob_interface_version_1" >&6; }
  
      if test "$gl_cv_gnu_glob_interface_version_1" = "no"; then
        GLOB_H=glob.h
***************
*** 20893,20900 ****
    fi
  
    if test -z "$GLOB_H"; then
!     echo "$as_me:$LINENO: checking whether glob lists broken symlinks" >&5
! echo $ECHO_N "checking whether glob lists broken symlinks... $ECHO_C" >&6
  if test "${gl_cv_glob_lists_symlinks+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 21644,21651 ----
    fi
  
    if test -z "$GLOB_H"; then
!     { echo "$as_me:$LINENO: checking whether glob lists broken symlinks" >&5
! echo $ECHO_N "checking whether glob lists broken symlinks... $ECHO_C" >&6; }
  if test "${gl_cv_glob_lists_symlinks+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 20947,20958 ****
  ( exit $ac_status )
  gl_cv_glob_lists_symlinks=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
        fi
  fi
! echo "$as_me:$LINENO: result: $gl_cv_glob_lists_symlinks" >&5
! echo "${ECHO_T}$gl_cv_glob_lists_symlinks" >&6
  
      if test $gl_cv_glob_lists_symlinks = no; then
        GLOB_H=glob.h
--- 21698,21711 ----
  ( exit $ac_status )
  gl_cv_glob_lists_symlinks=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
        fi
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_glob_lists_symlinks" >&5
! echo "${ECHO_T}$gl_cv_glob_lists_symlinks" >&6; }
  
      if test $gl_cv_glob_lists_symlinks = no; then
        GLOB_H=glob.h
***************
*** 20990,20996 ****
    *" glob.$ac_objext"   | \
      "glob.$ac_objext "* | \
    *" glob.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS glob.$ac_objext" ;;
  esac
  
  
--- 21743,21750 ----
    *" glob.$ac_objext"   | \
      "glob.$ac_objext "* | \
    *" glob.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS glob.$ac_objext"
!  ;;
  esac
  
  
***************
*** 21007,21024 ****
  for ac_header in stdlib.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 21761,21779 ----
  for ac_header in stdlib.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 21055,21069 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 21810,21825 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 21097,21105 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 21853,21862 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 21133,21147 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 21890,21905 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 21153,21160 ****
  
  done
  
! echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
! echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6
  if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 21911,21918 ----
  
  done
  
! { echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
! echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6; }
  if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 21201,21211 ****
  ( exit $ac_status )
  ac_cv_func_malloc_0_nonnull=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
! echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6
  if test $ac_cv_func_malloc_0_nonnull = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 21959,21971 ----
  ( exit $ac_status )
  ac_cv_func_malloc_0_nonnull=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
! echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6; }
  if test $ac_cv_func_malloc_0_nonnull = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 21222,21228 ****
    *" malloc.$ac_objext"   | \
      "malloc.$ac_objext "* | \
    *" malloc.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS malloc.$ac_objext" ;;
  esac
  
  
--- 21982,21989 ----
    *" malloc.$ac_objext"   | \
      "malloc.$ac_objext "* | \
    *" malloc.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
!  ;;
  esac
  
  
***************
*** 21253,21259 ****
    *" mbchar.$ac_objext"   | \
      "mbchar.$ac_objext "* | \
    *" mbchar.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS mbchar.$ac_objext" ;;
  esac
  
    fi
--- 22014,22021 ----
    *" mbchar.$ac_objext"   | \
      "mbchar.$ac_objext "* | \
    *" mbchar.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS mbchar.$ac_objext"
!  ;;
  esac
  
    fi
***************
*** 21272,21278 ****
    *" md5.$ac_objext"   | \
      "md5.$ac_objext "* | \
    *" md5.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS md5.$ac_objext" ;;
  esac
  
  
--- 22034,22041 ----
    *" md5.$ac_objext"   | \
      "md5.$ac_objext "* | \
    *" md5.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS md5.$ac_objext"
!  ;;
  esac
  
  
***************
*** 21286,21294 ****
  for ac_func in memchr
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 22049,22057 ----
  for ac_func in memchr
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 21314,21343 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 22077,22100 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 21369,21381 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 22126,22140 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 21387,21393 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 22146,22153 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 21400,21417 ****
  for ac_header in bp-sym.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 22160,22178 ----
  for ac_header in bp-sym.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 21448,21462 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 22209,22224 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 21490,21498 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 22252,22261 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 21526,21540 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 22289,22304 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 21554,21562 ****
  for ac_func in memmove
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 22318,22326 ----
  for ac_func in memmove
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 21582,21611 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 22346,22369 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 21637,21649 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 22395,22409 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 21655,21661 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 22415,22422 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 21677,21685 ****
  for ac_func in mempcpy
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 22438,22446 ----
  for ac_func in mempcpy
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 21705,21734 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 22466,22489 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 21760,21772 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 22515,22529 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 21778,21784 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 22535,22542 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 21808,21816 ****
  for ac_func in memrchr
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 22566,22574 ----
  for ac_func in memrchr
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 21836,21865 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 22594,22617 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 21891,21903 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 22643,22657 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 21909,21915 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 22663,22670 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 21923,21930 ****
  
  
  
!     echo "$as_me:$LINENO: checking whether mkdir fails due to a trailing slash" >&5
! echo $ECHO_N "checking whether mkdir fails due to a trailing slash... $ECHO_C" >&6
  if test "${gl_cv_func_mkdir_trailing_slash_bug+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 22678,22685 ----
  
  
  
!     { echo "$as_me:$LINENO: checking whether mkdir fails due to a trailing slash" >&5
! echo $ECHO_N "checking whether mkdir fails due to a trailing slash... $ECHO_C" >&6; }
  if test "${gl_cv_func_mkdir_trailing_slash_bug+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 21972,21984 ****
  ( exit $ac_status )
  gl_cv_func_mkdir_trailing_slash_bug=yes
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  
  fi
! echo "$as_me:$LINENO: result: $gl_cv_func_mkdir_trailing_slash_bug" >&5
! echo "${ECHO_T}$gl_cv_func_mkdir_trailing_slash_bug" >&6
  
    if test $gl_cv_func_mkdir_trailing_slash_bug = yes; then
      case $LIBOBJS in
--- 22727,22741 ----
  ( exit $ac_status )
  gl_cv_func_mkdir_trailing_slash_bug=yes
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_func_mkdir_trailing_slash_bug" >&5
! echo "${ECHO_T}$gl_cv_func_mkdir_trailing_slash_bug" >&6; }
  
    if test $gl_cv_func_mkdir_trailing_slash_bug = yes; then
      case $LIBOBJS in
***************
*** 21986,21992 ****
    *" mkdir.$ac_objext"   | \
      "mkdir.$ac_objext "* | \
    *" mkdir.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS mkdir.$ac_objext" ;;
  esac
  
  
--- 22743,22750 ----
    *" mkdir.$ac_objext"   | \
      "mkdir.$ac_objext "* | \
    *" mkdir.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS mkdir.$ac_objext"
!  ;;
  esac
  
  
***************
*** 22001,22009 ****
  for ac_func in mkstemp
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 22759,22767 ----
  for ac_func in mkstemp
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 22029,22058 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 22787,22810 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 22084,22096 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 22836,22850 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 22102,22108 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 22856,22863 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 22112,22119 ****
    if test $ac_cv_func_mkstemp = no; then
      gl_cv_func_mkstemp_limitations=yes
    else
!     echo "$as_me:$LINENO: checking for mkstemp limitations" >&5
! echo $ECHO_N "checking for mkstemp limitations... $ECHO_C" >&6
  if test "${gl_cv_func_mkstemp_limitations+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 22867,22874 ----
    if test $ac_cv_func_mkstemp = no; then
      gl_cv_func_mkstemp_limitations=yes
    else
!     { echo "$as_me:$LINENO: checking for mkstemp limitations" >&5
! echo $ECHO_N "checking for mkstemp limitations... $ECHO_C" >&6; }
  if test "${gl_cv_func_mkstemp_limitations+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 22167,22180 ****
  ( exit $ac_status )
  gl_cv_func_mkstemp_limitations=yes
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
          rm -rf conftest.mkstemp
  
  
  fi
! echo "$as_me:$LINENO: result: $gl_cv_func_mkstemp_limitations" >&5
! echo "${ECHO_T}$gl_cv_func_mkstemp_limitations" >&6
    fi
  
    if test $gl_cv_func_mkstemp_limitations = yes; then
--- 22922,22937 ----
  ( exit $ac_status )
  gl_cv_func_mkstemp_limitations=yes
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
          rm -rf conftest.mkstemp
  
  
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_func_mkstemp_limitations" >&5
! echo "${ECHO_T}$gl_cv_func_mkstemp_limitations" >&6; }
    fi
  
    if test $gl_cv_func_mkstemp_limitations = yes; then
***************
*** 22183,22189 ****
    *" mkstemp.$ac_objext"   | \
      "mkstemp.$ac_objext "* | \
    *" mkstemp.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext" ;;
  esac
  
      case $LIBOBJS in
--- 22940,22947 ----
    *" mkstemp.$ac_objext"   | \
      "mkstemp.$ac_objext "* | \
    *" mkstemp.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext"
!  ;;
  esac
  
      case $LIBOBJS in
***************
*** 22191,22197 ****
    *" tempname.$ac_objext"   | \
      "tempname.$ac_objext "* | \
    *" tempname.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS tempname.$ac_objext" ;;
  esac
  
  
--- 22949,22956 ----
    *" tempname.$ac_objext"   | \
      "tempname.$ac_objext "* | \
    *" tempname.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS tempname.$ac_objext"
!  ;;
  esac
  
  
***************
*** 22220,22228 ****
  for ac_func in __secure_getenv gettimeofday
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 22979,22987 ----
  for ac_func in __secure_getenv gettimeofday
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 22248,22277 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 23007,23030 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 22303,22315 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 23056,23070 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 22347,22359 ****
  
   # Solaris 2.5.1 needs -lposix4 to get the nanosleep function.
   # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4.
!  echo "$as_me:$LINENO: checking for library containing nanosleep" >&5
! echo $ECHO_N "checking for library containing nanosleep... $ECHO_C" >&6
  if test "${ac_cv_search_nanosleep+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
- ac_cv_search_nanosleep=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 23102,23113 ----
  
   # Solaris 2.5.1 needs -lposix4 to get the nanosleep function.
   # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4.
!  { echo "$as_me:$LINENO: checking for library containing nanosleep" >&5
! echo $ECHO_N "checking for library containing nanosleep... $ECHO_C" >&6; }
  if test "${ac_cv_search_nanosleep+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 22361,22437 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
- char nanosleep ();
- int
- main ()
- {
- nanosleep ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
- 	 { ac_try='test -z "$ac_c_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_search_nanosleep="none required"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_nanosleep" = no; then
-   for ac_lib in rt posix4; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char nanosleep ();
  int
  main ()
  {
! nanosleep ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 23115,23143 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
     builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char nanosleep ();
  int
  main ()
  {
! return nanosleep ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' rt posix4; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 22453,22483 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_nanosleep="-l$ac_lib"
! break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_nanosleep" >&5
! echo "${ECHO_T}$ac_cv_search_nanosleep" >&6
! if test "$ac_cv_search_nanosleep" != no; then
!   test "$ac_cv_search_nanosleep" = "none required" || LIBS="$ac_cv_search_nanosleep $LIBS"
    test "$ac_cv_search_nanosleep" = "none required" ||
  	         LIB_NANOSLEEP=$ac_cv_search_nanosleep
  fi
  
  
  
!  echo "$as_me:$LINENO: checking whether nanosleep works" >&5
! echo $ECHO_N "checking whether nanosleep works... $ECHO_C" >&6
  if test "${jm_cv_func_nanosleep_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 23159,23199 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_nanosleep=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_nanosleep+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search_nanosleep+set}" = set; then
!   :
! else
!   ac_cv_search_nanosleep=no
  fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_nanosleep" >&5
! echo "${ECHO_T}$ac_cv_search_nanosleep" >&6; }
! ac_res=$ac_cv_search_nanosleep
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
    test "$ac_cv_search_nanosleep" = "none required" ||
  	         LIB_NANOSLEEP=$ac_cv_search_nanosleep
  fi
  
  
  
!  { echo "$as_me:$LINENO: checking whether nanosleep works" >&5
! echo $ECHO_N "checking whether nanosleep works... $ECHO_C" >&6; }
  if test "${jm_cv_func_nanosleep_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 22541,22559 ****
  ( exit $ac_status )
  jm_cv_func_nanosleep_works=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
  fi
! echo "$as_me:$LINENO: result: $jm_cv_func_nanosleep_works" >&5
! echo "${ECHO_T}$jm_cv_func_nanosleep_works" >&6
    if test $jm_cv_func_nanosleep_works = no; then
      case $LIBOBJS in
      "nanosleep.$ac_objext"   | \
    *" nanosleep.$ac_objext"   | \
      "nanosleep.$ac_objext "* | \
    *" nanosleep.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS nanosleep.$ac_objext" ;;
  esac
  
  
--- 23257,23278 ----
  ( exit $ac_status )
  jm_cv_func_nanosleep_works=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $jm_cv_func_nanosleep_works" >&5
! echo "${ECHO_T}$jm_cv_func_nanosleep_works" >&6; }
    if test $jm_cv_func_nanosleep_works = no; then
      case $LIBOBJS in
      "nanosleep.$ac_objext"   | \
    *" nanosleep.$ac_objext"   | \
      "nanosleep.$ac_objext "* | \
    *" nanosleep.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS nanosleep.$ac_objext"
!  ;;
  esac
  
  
***************
*** 22588,22596 ****
  for ac_func in openat
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 23307,23315 ----
  for ac_func in openat
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 22616,22645 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 23335,23358 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 22671,22683 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 23384,23398 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 22689,22695 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 23404,23411 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 22718,22724 ****
    *" pagealign_alloc.$ac_objext"   | \
      "pagealign_alloc.$ac_objext "* | \
    *" pagealign_alloc.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS pagealign_alloc.$ac_objext" ;;
  esac
  
  
--- 23434,23441 ----
    *" pagealign_alloc.$ac_objext"   | \
      "pagealign_alloc.$ac_objext "* | \
    *" pagealign_alloc.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS pagealign_alloc.$ac_objext"
!  ;;
  esac
  
  
***************
*** 22761,22767 ****
    *" quotearg.$ac_objext"   | \
      "quotearg.$ac_objext "* | \
    *" quotearg.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS quotearg.$ac_objext" ;;
  esac
  
  
--- 23478,23485 ----
    *" quotearg.$ac_objext"   | \
      "quotearg.$ac_objext "* | \
    *" quotearg.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS quotearg.$ac_objext"
!  ;;
  esac
  
  
***************
*** 22785,22792 ****
  
  
  
!   echo "$as_me:$LINENO: checking for mbstate_t" >&5
! echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6
  if test "${ac_cv_type_mbstate_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 23503,23510 ----
  
  
  
!   { echo "$as_me:$LINENO: checking for mbstate_t" >&5
! echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_mbstate_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 22833,22844 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_mbstate_t=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5
! echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6
     if test $ac_cv_type_mbstate_t = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 23551,23563 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_mbstate_t=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5
! echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6; }
     if test $ac_cv_type_mbstate_t = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 22853,22860 ****
  
     fi
  
!     echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5
! echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6
  if test "${gl_cv_func_mbrtowc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 23572,23579 ----
  
     fi
  
!     { echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5
! echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6; }
  if test "${gl_cv_func_mbrtowc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 22904,22916 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gl_cv_func_mbrtowc=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc" >&5
! echo "${ECHO_T}$gl_cv_func_mbrtowc" >&6
    if test $gl_cv_func_mbrtowc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 23623,23636 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gl_cv_func_mbrtowc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc" >&5
! echo "${ECHO_T}$gl_cv_func_mbrtowc" >&6; }
    if test $gl_cv_func_mbrtowc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 22925,22933 ****
  for ac_func in readlink
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 23645,23653 ----
  for ac_func in readlink
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 22953,22982 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 23673,23696 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 23008,23020 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 23722,23736 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 23029,23035 ****
    *" readlink.$ac_objext"   | \
      "readlink.$ac_objext "* | \
    *" readlink.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS readlink.$ac_objext" ;;
  esac
  
  
--- 23745,23752 ----
    *" readlink.$ac_objext"   | \
      "readlink.$ac_objext "* | \
    *" readlink.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS readlink.$ac_objext"
!  ;;
  esac
  
  
***************
*** 23041,23058 ****
  for ac_header in stdlib.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 23758,23776 ----
  for ac_header in stdlib.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 23089,23103 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 23807,23822 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 23131,23139 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 23850,23859 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 23167,23181 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 23887,23902 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 23187,23194 ****
  
  done
  
! echo "$as_me:$LINENO: checking for GNU libc compatible realloc" >&5
! echo $ECHO_N "checking for GNU libc compatible realloc... $ECHO_C" >&6
  if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 23908,23915 ----
  
  done
  
! { echo "$as_me:$LINENO: checking for GNU libc compatible realloc" >&5
! echo $ECHO_N "checking for GNU libc compatible realloc... $ECHO_C" >&6; }
  if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 23235,23245 ****
  ( exit $ac_status )
  ac_cv_func_realloc_0_nonnull=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_func_realloc_0_nonnull" >&5
! echo "${ECHO_T}$ac_cv_func_realloc_0_nonnull" >&6
  if test $ac_cv_func_realloc_0_nonnull = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 23956,23968 ----
  ( exit $ac_status )
  ac_cv_func_realloc_0_nonnull=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_func_realloc_0_nonnull" >&5
! echo "${ECHO_T}$ac_cv_func_realloc_0_nonnull" >&6; }
  if test $ac_cv_func_realloc_0_nonnull = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 23256,23262 ****
    *" realloc.$ac_objext"   | \
      "realloc.$ac_objext "* | \
    *" realloc.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS realloc.$ac_objext" ;;
  esac
  
  
--- 23979,23986 ----
    *" realloc.$ac_objext"   | \
      "realloc.$ac_objext "* | \
    *" realloc.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS realloc.$ac_objext"
!  ;;
  esac
  
  
***************
*** 23278,23288 ****
  
  
  
! # Check whether --with-included-regex or --without-included-regex was given.
  if test "${with_included_regex+set}" = set; then
!   withval="$with_included_regex"
  
- fi;
  
    case $with_included_regex in
    yes|no) ac_use_included_regex=$with_included_regex
--- 24002,24012 ----
  
  
  
! # Check whether --with-included-regex was given.
  if test "${with_included_regex+set}" = set; then
!   withval=$with_included_regex;
! fi
  
  
    case $with_included_regex in
    yes|no) ac_use_included_regex=$with_included_regex
***************
*** 23293,23300 ****
      # If cross compiling, assume the test would fail and use the included
      # regex.c.  The first failing regular expression is from `Spencer ere
      # test #75' in grep-2.3.
!     echo "$as_me:$LINENO: checking for working re_compile_pattern" >&5
! echo $ECHO_N "checking for working re_compile_pattern... $ECHO_C" >&6
  if test "${gl_cv_func_re_compile_pattern_broken+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 24017,24024 ----
      # If cross compiling, assume the test would fail and use the included
      # regex.c.  The first failing regular expression is from `Spencer ere
      # test #75' in grep-2.3.
!     { echo "$as_me:$LINENO: checking for working re_compile_pattern" >&5
! echo $ECHO_N "checking for working re_compile_pattern... $ECHO_C" >&6; }
  if test "${gl_cv_func_re_compile_pattern_broken+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 23402,23412 ****
  ( exit $ac_status )
  gl_cv_func_re_compile_pattern_broken=yes
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
! echo "$as_me:$LINENO: result: $gl_cv_func_re_compile_pattern_broken" >&5
! echo "${ECHO_T}$gl_cv_func_re_compile_pattern_broken" >&6
      ac_use_included_regex=$gl_cv_func_re_compile_pattern_broken
      ;;
    *) { { echo "$as_me:$LINENO: error: Invalid value for --with-included-regex: $with_included_regex" >&5
--- 24126,24138 ----
  ( exit $ac_status )
  gl_cv_func_re_compile_pattern_broken=yes
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_func_re_compile_pattern_broken" >&5
! echo "${ECHO_T}$gl_cv_func_re_compile_pattern_broken" >&6; }
      ac_use_included_regex=$gl_cv_func_re_compile_pattern_broken
      ;;
    *) { { echo "$as_me:$LINENO: error: Invalid value for --with-included-regex: $with_included_regex" >&5
***************
*** 23421,23427 ****
    *" regex.$ac_objext"   | \
      "regex.$ac_objext "* | \
    *" regex.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS regex.$ac_objext" ;;
  esac
  
  
--- 24147,24154 ----
    *" regex.$ac_objext"   | \
      "regex.$ac_objext "* | \
    *" regex.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS regex.$ac_objext"
!  ;;
  esac
  
  
***************
*** 23464,23471 ****
    fi
  
  
!  echo "$as_me:$LINENO: checking whether rename is broken" >&5
! echo $ECHO_N "checking whether rename is broken... $ECHO_C" >&6
  if test "${vb_cv_func_rename_trailing_slash_bug+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 24191,24198 ----
    fi
  
  
!  { echo "$as_me:$LINENO: checking whether rename is broken" >&5
! echo $ECHO_N "checking whether rename is broken... $ECHO_C" >&6; }
  if test "${vb_cv_func_rename_trailing_slash_bug+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 23513,23533 ****
  ( exit $ac_status )
  vb_cv_func_rename_trailing_slash_bug=yes
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
        rm -rf conftest.d1 conftest.d2
  
  fi
! echo "$as_me:$LINENO: result: $vb_cv_func_rename_trailing_slash_bug" >&5
! echo "${ECHO_T}$vb_cv_func_rename_trailing_slash_bug" >&6
    if test $vb_cv_func_rename_trailing_slash_bug = yes; then
      case $LIBOBJS in
      "rename.$ac_objext"   | \
    *" rename.$ac_objext"   | \
      "rename.$ac_objext "* | \
    *" rename.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS rename.$ac_objext" ;;
  esac
  
  
--- 24240,24263 ----
  ( exit $ac_status )
  vb_cv_func_rename_trailing_slash_bug=yes
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
+ 
+ 
        rm -rf conftest.d1 conftest.d2
  
  fi
! { echo "$as_me:$LINENO: result: $vb_cv_func_rename_trailing_slash_bug" >&5
! echo "${ECHO_T}$vb_cv_func_rename_trailing_slash_bug" >&6; }
    if test $vb_cv_func_rename_trailing_slash_bug = yes; then
      case $LIBOBJS in
      "rename.$ac_objext"   | \
    *" rename.$ac_objext"   | \
      "rename.$ac_objext "* | \
    *" rename.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS rename.$ac_objext"
!  ;;
  esac
  
  
***************
*** 23543,23550 ****
      :
    fi
  
!   echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5
! echo $ECHO_N "checking for C/C++ restrict keyword... $ECHO_C" >&6
  if test "${gl_cv_c_restrict+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 24273,24280 ----
      :
    fi
  
!   { echo "$as_me:$LINENO: checking for C/C++ restrict keyword" >&5
! echo $ECHO_N "checking for C/C++ restrict keyword... $ECHO_C" >&6; }
  if test "${gl_cv_c_restrict+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 23587,23599 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     done
  
  fi
! echo "$as_me:$LINENO: result: $gl_cv_c_restrict" >&5
! echo "${ECHO_T}$gl_cv_c_restrict" >&6
   case $gl_cv_c_restrict in
     restrict) ;;
     no)
--- 24317,24331 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     done
  
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_c_restrict" >&5
! echo "${ECHO_T}$gl_cv_c_restrict" >&6; }
   case $gl_cv_c_restrict in
     restrict) ;;
     no)
***************
*** 23612,23620 ****
  for ac_func in rpmatch
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 24344,24352 ----
  for ac_func in rpmatch
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 23640,23669 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 24372,24395 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 23695,23707 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 24421,24435 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 23713,23719 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 24441,24448 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 23731,23737 ****
    *" save-cwd.$ac_objext"   | \
      "save-cwd.$ac_objext "* | \
    *" save-cwd.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS save-cwd.$ac_objext" ;;
  esac
  
  
--- 24460,24467 ----
    *" save-cwd.$ac_objext"   | \
      "save-cwd.$ac_objext "* | \
    *" save-cwd.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS save-cwd.$ac_objext"
!  ;;
  esac
  
  
***************
*** 23755,23763 ****
  for ac_func in setenv unsetenv
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 24485,24493 ----
  for ac_func in setenv unsetenv
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 23783,23812 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 24513,24536 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 23838,23850 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 24562,24576 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 23856,23862 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 24582,24589 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 23877,23894 ****
  for ac_header in search.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 24604,24622 ----
  for ac_header in search.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 23925,23939 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 24653,24668 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 23967,23975 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 24696,24705 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 24003,24017 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 24733,24748 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 24027,24035 ****
  for ac_func in tsearch
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 24758,24766 ----
  for ac_func in tsearch
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 24055,24084 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 24786,24809 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 24110,24122 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 24835,24849 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 24127,24134 ****
  
  
  
!   echo "$as_me:$LINENO: checking if errno is properly declared" >&5
! echo $ECHO_N "checking if errno is properly declared... $ECHO_C" >&6
    if test "${gt_cv_var_errno_declaration+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 24854,24861 ----
  
  
  
!   { echo "$as_me:$LINENO: checking if errno is properly declared" >&5
! echo $ECHO_N "checking if errno is properly declared... $ECHO_C" >&6; }
    if test "${gt_cv_var_errno_declaration+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 24176,24188 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gt_cv_var_errno_declaration=yes
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
!   echo "$as_me:$LINENO: result: $gt_cv_var_errno_declaration" >&5
! echo "${ECHO_T}$gt_cv_var_errno_declaration" >&6
    if test $gt_cv_var_errno_declaration = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 24903,24916 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gt_cv_var_errno_declaration=yes
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
!   { echo "$as_me:$LINENO: result: $gt_cv_var_errno_declaration" >&5
! echo "${ECHO_T}$gt_cv_var_errno_declaration" >&6; }
    if test $gt_cv_var_errno_declaration = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 24193,24200 ****
  
  
  
!   echo "$as_me:$LINENO: checking if environ is properly declared" >&5
! echo $ECHO_N "checking if environ is properly declared... $ECHO_C" >&6
    if test "${gt_cv_var_environ_declaration+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 24921,24928 ----
  
  
  
!   { echo "$as_me:$LINENO: checking if environ is properly declared" >&5
! echo $ECHO_N "checking if environ is properly declared... $ECHO_C" >&6; }
    if test "${gt_cv_var_environ_declaration+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 24242,24254 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gt_cv_var_environ_declaration=yes
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
!   echo "$as_me:$LINENO: result: $gt_cv_var_environ_declaration" >&5
! echo "${ECHO_T}$gt_cv_var_environ_declaration" >&6
    if test $gt_cv_var_environ_declaration = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 24970,24983 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gt_cv_var_environ_declaration=yes
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
!   { echo "$as_me:$LINENO: result: $gt_cv_var_environ_declaration" >&5
! echo "${ECHO_T}$gt_cv_var_environ_declaration" >&6; }
    if test $gt_cv_var_environ_declaration = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 24270,24277 ****
  
  
  
!   echo "$as_me:$LINENO: checking if errno is properly declared" >&5
! echo $ECHO_N "checking if errno is properly declared... $ECHO_C" >&6
    if test "${gt_cv_var_errno_declaration+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 24999,25006 ----
  
  
  
!   { echo "$as_me:$LINENO: checking if errno is properly declared" >&5
! echo $ECHO_N "checking if errno is properly declared... $ECHO_C" >&6; }
    if test "${gt_cv_var_errno_declaration+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 24319,24331 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gt_cv_var_errno_declaration=yes
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
!   echo "$as_me:$LINENO: result: $gt_cv_var_errno_declaration" >&5
! echo "${ECHO_T}$gt_cv_var_errno_declaration" >&6
    if test $gt_cv_var_errno_declaration = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 25048,25061 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gt_cv_var_errno_declaration=yes
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
!   { echo "$as_me:$LINENO: result: $gt_cv_var_errno_declaration" >&5
! echo "${ECHO_T}$gt_cv_var_errno_declaration" >&6; }
    if test $gt_cv_var_errno_declaration = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 24336,24343 ****
  
  
  
!   echo "$as_me:$LINENO: checking if environ is properly declared" >&5
! echo $ECHO_N "checking if environ is properly declared... $ECHO_C" >&6
    if test "${gt_cv_var_environ_declaration+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 25066,25073 ----
  
  
  
!   { echo "$as_me:$LINENO: checking if environ is properly declared" >&5
! echo $ECHO_N "checking if environ is properly declared... $ECHO_C" >&6; }
    if test "${gt_cv_var_environ_declaration+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 24385,24397 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gt_cv_var_environ_declaration=yes
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
!   echo "$as_me:$LINENO: result: $gt_cv_var_environ_declaration" >&5
! echo "${ECHO_T}$gt_cv_var_environ_declaration" >&6
    if test $gt_cv_var_environ_declaration = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 25115,25128 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gt_cv_var_environ_declaration=yes
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
!   { echo "$as_me:$LINENO: result: $gt_cv_var_environ_declaration" >&5
! echo "${ECHO_T}$gt_cv_var_environ_declaration" >&6; }
    if test $gt_cv_var_environ_declaration = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 24402,24409 ****
  
  
    else
!     echo "$as_me:$LINENO: checking for unsetenv() return type" >&5
! echo $ECHO_N "checking for unsetenv() return type... $ECHO_C" >&6
  if test "${gt_cv_func_unsetenv_ret+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 25133,25140 ----
  
  
    else
!     { echo "$as_me:$LINENO: checking for unsetenv() return type" >&5
! echo $ECHO_N "checking for unsetenv() return type... $ECHO_C" >&6; }
  if test "${gt_cv_func_unsetenv_ret+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 24459,24470 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gt_cv_func_unsetenv_ret='void'
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gt_cv_func_unsetenv_ret" >&5
! echo "${ECHO_T}$gt_cv_func_unsetenv_ret" >&6
      if test $gt_cv_func_unsetenv_ret = 'void'; then
  
  cat >>confdefs.h <<\_ACEOF
--- 25190,25202 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gt_cv_func_unsetenv_ret='void'
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gt_cv_func_unsetenv_ret" >&5
! echo "${ECHO_T}$gt_cv_func_unsetenv_ret" >&6; }
      if test $gt_cv_func_unsetenv_ret = 'void'; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 24479,24496 ****
  for ac_header in stdint.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 25211,25229 ----
  for ac_header in stdint.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 24527,24541 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 25260,25275 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 24569,24577 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 25303,25312 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 24605,24619 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 25340,25355 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 24625,24632 ****
  
  done
  
!     echo "$as_me:$LINENO: checking for SIZE_MAX" >&5
! echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6
    result=
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
--- 25361,25368 ----
  
  done
  
!     { echo "$as_me:$LINENO: checking for SIZE_MAX" >&5
! echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6; }
    result=
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
***************
*** 24738,24757 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr $ac_mid + 1`
! 		    if test $ac_lo -le $ac_mid; then
! 		      ac_lo= ac_hi=
! 		      break
! 		    fi
! 		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 25474,25494 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr $ac_mid + 1`
! 			if test $ac_lo -le $ac_mid; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 24836,24858 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_hi=`expr '(' $ac_mid ')' - 1`
! 		       if test $ac_mid -le $ac_hi; then
! 			 ac_lo= ac_hi=
! 			 break
! 		       fi
! 		       ac_mid=`expr 2 '*' $ac_mid`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo= ac_hi=
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
--- 25573,25598 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_hi=`expr '(' $ac_mid ')' - 1`
! 			if test $ac_mid -le $ac_hi; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo= ac_hi=
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
***************
*** 24901,24908 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
--- 25641,25649 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
***************
*** 24910,24922 ****
  '') result=? ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 25651,25656 ----
***************
*** 24924,24931 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <stddef.h>
! long longval () { return (size_t)~(size_t)0 / 10; }
! unsigned long ulongval () { return (size_t)~(size_t)0 / 10; }
  #include <stdio.h>
  #include <stdlib.h>
  int
--- 25658,25665 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <stddef.h>
! static long int longval () { return (size_t)~(size_t)0 / 10; }
! static unsigned long int ulongval () { return (size_t)~(size_t)0 / 10; }
  #include <stdio.h>
  #include <stdlib.h>
  int
***************
*** 24937,24950 ****
      exit (1);
    if (((size_t)~(size_t)0 / 10) < 0)
      {
!       long i = longval ();
        if (i != ((size_t)~(size_t)0 / 10))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long i = ulongval ();
        if (i != ((size_t)~(size_t)0 / 10))
  	exit (1);
        fprintf (f, "%lu\n", i);
--- 25671,25684 ----
      exit (1);
    if (((size_t)~(size_t)0 / 10) < 0)
      {
!       long int i = longval ();
        if (i != ((size_t)~(size_t)0 / 10))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long int i = ulongval ();
        if (i != ((size_t)~(size_t)0 / 10))
  	exit (1);
        fprintf (f, "%lu\n", i);
***************
*** 24975,24982 ****
  ( exit $ac_status )
  result=?
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
! fi
  fi
  rm -f conftest.val
      if test "$cross_compiling" = yes; then
--- 25709,25715 ----
  ( exit $ac_status )
  result=?
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
      if test "$cross_compiling" = yes; then
***************
*** 25066,25085 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr $ac_mid + 1`
! 		    if test $ac_lo -le $ac_mid; then
! 		      ac_lo= ac_hi=
! 		      break
! 		    fi
! 		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 25799,25819 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr $ac_mid + 1`
! 			if test $ac_lo -le $ac_mid; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 25164,25186 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_hi=`expr '(' $ac_mid ')' - 1`
! 		       if test $ac_mid -le $ac_hi; then
! 			 ac_lo= ac_hi=
! 			 break
! 		       fi
! 		       ac_mid=`expr 2 '*' $ac_mid`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo= ac_hi=
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
--- 25898,25923 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_hi=`expr '(' $ac_mid ')' - 1`
! 			if test $ac_mid -le $ac_hi; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo= ac_hi=
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
***************
*** 25229,25236 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
--- 25966,25974 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
***************
*** 25238,25250 ****
  '') result=? ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 25976,25981 ----
***************
*** 25252,25259 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <stddef.h>
! long longval () { return (size_t)~(size_t)0 % 10; }
! unsigned long ulongval () { return (size_t)~(size_t)0 % 10; }
  #include <stdio.h>
  #include <stdlib.h>
  int
--- 25983,25990 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <stddef.h>
! static long int longval () { return (size_t)~(size_t)0 % 10; }
! static unsigned long int ulongval () { return (size_t)~(size_t)0 % 10; }
  #include <stdio.h>
  #include <stdlib.h>
  int
***************
*** 25265,25278 ****
      exit (1);
    if (((size_t)~(size_t)0 % 10) < 0)
      {
!       long i = longval ();
        if (i != ((size_t)~(size_t)0 % 10))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long i = ulongval ();
        if (i != ((size_t)~(size_t)0 % 10))
  	exit (1);
        fprintf (f, "%lu\n", i);
--- 25996,26009 ----
      exit (1);
    if (((size_t)~(size_t)0 % 10) < 0)
      {
!       long int i = longval ();
        if (i != ((size_t)~(size_t)0 % 10))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long int i = ulongval ();
        if (i != ((size_t)~(size_t)0 % 10))
  	exit (1);
        fprintf (f, "%lu\n", i);
***************
*** 25303,25310 ****
  ( exit $ac_status )
  result=?
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
! fi
  fi
  rm -f conftest.val
      if test "$cross_compiling" = yes; then
--- 26034,26040 ----
  ( exit $ac_status )
  result=?
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
      if test "$cross_compiling" = yes; then
***************
*** 25394,25413 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr $ac_mid + 1`
! 		    if test $ac_lo -le $ac_mid; then
! 		      ac_lo= ac_hi=
! 		      break
! 		    fi
! 		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 26124,26144 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr $ac_mid + 1`
! 			if test $ac_lo -le $ac_mid; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 25492,25514 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_hi=`expr '(' $ac_mid ')' - 1`
! 		       if test $ac_mid -le $ac_hi; then
! 			 ac_lo= ac_hi=
! 			 break
! 		       fi
! 		       ac_mid=`expr 2 '*' $ac_mid`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo= ac_hi=
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
--- 26223,26248 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_hi=`expr '(' $ac_mid ')' - 1`
! 			if test $ac_mid -le $ac_hi; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo= ac_hi=
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
***************
*** 25557,25564 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
--- 26291,26299 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
***************
*** 25566,25578 ****
  '') result=? ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 26301,26306 ----
***************
*** 25580,25587 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <stddef.h>
! long longval () { return sizeof (size_t) <= sizeof (unsigned int); }
! unsigned long ulongval () { return sizeof (size_t) <= sizeof (unsigned int); }
  #include <stdio.h>
  #include <stdlib.h>
  int
--- 26308,26315 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <stddef.h>
! static long int longval () { return sizeof (size_t) <= sizeof (unsigned int); }
! static unsigned long int ulongval () { return sizeof (size_t) <= sizeof (unsigned int); }
  #include <stdio.h>
  #include <stdlib.h>
  int
***************
*** 25593,25606 ****
      exit (1);
    if ((sizeof (size_t) <= sizeof (unsigned int)) < 0)
      {
!       long i = longval ();
        if (i != (sizeof (size_t) <= sizeof (unsigned int)))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long i = ulongval ();
        if (i != (sizeof (size_t) <= sizeof (unsigned int)))
  	exit (1);
        fprintf (f, "%lu\n", i);
--- 26321,26334 ----
      exit (1);
    if ((sizeof (size_t) <= sizeof (unsigned int)) < 0)
      {
!       long int i = longval ();
        if (i != (sizeof (size_t) <= sizeof (unsigned int)))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long int i = ulongval ();
        if (i != (sizeof (size_t) <= sizeof (unsigned int)))
  	exit (1);
        fprintf (f, "%lu\n", i);
***************
*** 25631,25638 ****
  ( exit $ac_status )
  result=?
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
! fi
  fi
  rm -f conftest.val
      if test "$fits_in_uint" = 1; then
--- 26359,26365 ----
  ( exit $ac_status )
  result=?
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
      if test "$fits_in_uint" = 1; then
***************
*** 25681,25687 ****
--- 26408,26416 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
      fi
      if test -z "$result"; then
***************
*** 25694,25701 ****
              result='((size_t)~(size_t)0)'
      fi
    fi
!   echo "$as_me:$LINENO: result: $result" >&5
! echo "${ECHO_T}$result" >&6
    if test "$result" != yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 26423,26430 ----
              result='((size_t)~(size_t)0)'
      fi
    fi
!   { echo "$as_me:$LINENO: result: $result" >&5
! echo "${ECHO_T}$result" >&6; }
    if test "$result" != yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 25705,25712 ****
    fi
  
  
!   echo "$as_me:$LINENO: checking for ssize_t" >&5
! echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
  if test "${gt_cv_ssize_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 26434,26441 ----
    fi
  
  
!   { echo "$as_me:$LINENO: checking for ssize_t" >&5
! echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
  if test "${gt_cv_ssize_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 25752,25763 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gt_cv_ssize_t=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gt_cv_ssize_t" >&5
! echo "${ECHO_T}$gt_cv_ssize_t" >&6
    if test $gt_cv_ssize_t = no; then
  
  cat >>confdefs.h <<\_ACEOF
--- 26481,26493 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gt_cv_ssize_t=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gt_cv_ssize_t" >&5
! echo "${ECHO_T}$gt_cv_ssize_t" >&6; }
    if test $gt_cv_ssize_t = no; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 25795,25812 ****
  for ac_header in sys/inttypes.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 26525,26543 ----
  for ac_header in sys/inttypes.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 25843,25857 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 26574,26589 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 25885,25893 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 26617,26626 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 25921,25935 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 26654,26669 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 25942,25949 ****
  done
  
  
! echo "$as_me:$LINENO: checking for stdint.h" >&5
! echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6
  if test "${gl_cv_header_stdint_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 26676,26683 ----
  done
  
  
! { echo "$as_me:$LINENO: checking for stdint.h" >&5
! echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6; }
  if test "${gl_cv_header_stdint_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 25990,26002 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gl_cv_header_stdint_h=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
! echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5
! echo "${ECHO_T}$gl_cv_header_stdint_h" >&6
  if test $gl_cv_header_stdint_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 26724,26737 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gl_cv_header_stdint_h=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
! { echo "$as_me:$LINENO: result: $gl_cv_header_stdint_h" >&5
! echo "${ECHO_T}$gl_cv_header_stdint_h" >&6; }
  if test $gl_cv_header_stdint_h = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 26007,26014 ****
  else
    STDINT_H='stdint.h'
  
!     echo "$as_me:$LINENO: checking whether 'long' is 64 bit wide" >&5
! echo $ECHO_N "checking whether 'long' is 64 bit wide... $ECHO_C" >&6
  if test "${gl_cv_long_bitsize_64+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 26742,26749 ----
  else
    STDINT_H='stdint.h'
  
!     { echo "$as_me:$LINENO: checking whether 'long' is 64 bit wide" >&5
! echo $ECHO_N "checking whether 'long' is 64 bit wide... $ECHO_C" >&6; }
  if test "${gl_cv_long_bitsize_64+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 26059,26070 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gl_cv_long_bitsize_64=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gl_cv_long_bitsize_64" >&5
! echo "${ECHO_T}$gl_cv_long_bitsize_64" >&6
    if test $gl_cv_long_bitsize_64 = yes; then
      HAVE_LONG_64BIT=1
    else
--- 26794,26806 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gl_cv_long_bitsize_64=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_long_bitsize_64" >&5
! echo "${ECHO_T}$gl_cv_long_bitsize_64" >&6; }
    if test $gl_cv_long_bitsize_64 = yes; then
      HAVE_LONG_64BIT=1
    else
***************
*** 26072,26079 ****
    fi
  
  
!     echo "$as_me:$LINENO: checking whether 'long long' is 64 bit wide" >&5
! echo $ECHO_N "checking whether 'long long' is 64 bit wide... $ECHO_C" >&6
  if test "${gl_cv_longlong_bitsize_64+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 26808,26815 ----
    fi
  
  
!     { echo "$as_me:$LINENO: checking whether 'long long' is 64 bit wide" >&5
! echo $ECHO_N "checking whether 'long long' is 64 bit wide... $ECHO_C" >&6; }
  if test "${gl_cv_longlong_bitsize_64+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 26124,26135 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gl_cv_longlong_bitsize_64=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gl_cv_longlong_bitsize_64" >&5
! echo "${ECHO_T}$gl_cv_longlong_bitsize_64" >&6
    if test $gl_cv_longlong_bitsize_64 = yes; then
      HAVE_LONG_LONG_64BIT=1
    else
--- 26860,26872 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gl_cv_longlong_bitsize_64=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_longlong_bitsize_64" >&5
! echo "${ECHO_T}$gl_cv_longlong_bitsize_64" >&6; }
    if test $gl_cv_longlong_bitsize_64 = yes; then
      HAVE_LONG_LONG_64BIT=1
    else
***************
*** 26147,26153 ****
    *" strcasecmp.$ac_objext"   | \
      "strcasecmp.$ac_objext "* | \
    *" strcasecmp.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext" ;;
  esac
  
  
--- 26884,26891 ----
    *" strcasecmp.$ac_objext"   | \
      "strcasecmp.$ac_objext "* | \
    *" strcasecmp.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS strcasecmp.$ac_objext"
!  ;;
  esac
  
  
***************
*** 26157,26164 ****
  
  
  
!     echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5
! echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6
  if test "${gl_cv_func_mbrtowc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 26895,26902 ----
  
  
  
!     { echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5
! echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6; }
  if test "${gl_cv_func_mbrtowc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 26208,26220 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gl_cv_func_mbrtowc=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc" >&5
! echo "${ECHO_T}$gl_cv_func_mbrtowc" >&6
    if test $gl_cv_func_mbrtowc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 26946,26959 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gl_cv_func_mbrtowc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc" >&5
! echo "${ECHO_T}$gl_cv_func_mbrtowc" >&6; }
    if test $gl_cv_func_mbrtowc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 26230,26238 ****
  for ac_func in strncasecmp
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 26969,26977 ----
  for ac_func in strncasecmp
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 26258,26287 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 26997,27020 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 26313,26325 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 27046,27060 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 26331,26337 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 27066,27073 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 26352,26360 ****
  for ac_func in strdup
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 27088,27096 ----
  for ac_func in strdup
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 26380,26409 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 27116,27139 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 26435,26447 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 27165,27179 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 26453,26459 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 27185,27192 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 26474,26482 ****
  for ac_func in strerror
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 27207,27215 ----
  for ac_func in strerror
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 26502,26531 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 27235,27258 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 26557,26569 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 27284,27298 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 26575,26581 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 27304,27311 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 26595,26607 ****
    *" strstr.$ac_objext"   | \
      "strstr.$ac_objext "* | \
    *" strstr.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS strstr.$ac_objext" ;;
  esac
  
  
  
!     echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5
! echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6
  if test "${gl_cv_func_mbrtowc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 27325,27338 ----
    *" strstr.$ac_objext"   | \
      "strstr.$ac_objext "* | \
    *" strstr.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS strstr.$ac_objext"
!  ;;
  esac
  
  
  
!     { echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5
! echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6; }
  if test "${gl_cv_func_mbrtowc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 26651,26663 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gl_cv_func_mbrtowc=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc" >&5
! echo "${ECHO_T}$gl_cv_func_mbrtowc" >&6
    if test $gl_cv_func_mbrtowc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 27382,27395 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gl_cv_func_mbrtowc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_func_mbrtowc" >&5
! echo "${ECHO_T}$gl_cv_func_mbrtowc" >&6; }
    if test $gl_cv_func_mbrtowc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 26673,26681 ****
  for ac_func in strtol
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 27405,27413 ----
  for ac_func in strtol
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 26701,26730 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 27433,27456 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 26756,26768 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 27482,27496 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 26774,26780 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 27502,27509 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 26799,26807 ****
  for ac_func in strtoul
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 27528,27536 ----
  for ac_func in strtoul
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 26827,26856 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 27556,27579 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 26882,26894 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 27605,27619 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 26900,26906 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 27625,27632 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 26926,26933 ****
  
  
  
!   echo "$as_me:$LINENO: checking whether localtime_r is compatible with its POSIX signature" >&5
! echo $ECHO_N "checking whether localtime_r is compatible with its POSIX signature... $ECHO_C" >&6
  if test "${gl_cv_time_r_posix+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 27652,27659 ----
  
  
  
!   { echo "$as_me:$LINENO: checking whether localtime_r is compatible with its POSIX signature" >&5
! echo $ECHO_N "checking whether localtime_r is compatible with its POSIX signature... $ECHO_C" >&6; }
  if test "${gl_cv_time_r_posix+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 26976,26987 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gl_cv_time_r_posix=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gl_cv_time_r_posix" >&5
! echo "${ECHO_T}$gl_cv_time_r_posix" >&6
    if test $gl_cv_time_r_posix = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 27702,27714 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gl_cv_time_r_posix=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_time_r_posix" >&5
! echo "${ECHO_T}$gl_cv_time_r_posix" >&6; }
    if test $gl_cv_time_r_posix = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 26994,27000 ****
    *" time_r.$ac_objext"   | \
      "time_r.$ac_objext "* | \
    *" time_r.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS time_r.$ac_objext" ;;
  esac
  
  
--- 27721,27728 ----
    *" time_r.$ac_objext"   | \
      "time_r.$ac_objext "* | \
    *" time_r.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS time_r.$ac_objext"
!  ;;
  esac
  
  
***************
*** 27025,27032 ****
  
  
  
!   echo "$as_me:$LINENO: checking for struct timespec" >&5
! echo $ECHO_N "checking for struct timespec... $ECHO_C" >&6
  if test "${fu_cv_sys_struct_timespec+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 27753,27760 ----
  
  
  
!   { echo "$as_me:$LINENO: checking for struct timespec" >&5
! echo $ECHO_N "checking for struct timespec... $ECHO_C" >&6; }
  if test "${fu_cv_sys_struct_timespec+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 27083,27095 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! fu_cv_sys_struct_timespec=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
! echo "$as_me:$LINENO: result: $fu_cv_sys_struct_timespec" >&5
! echo "${ECHO_T}$fu_cv_sys_struct_timespec" >&6
  
    if test $fu_cv_sys_struct_timespec = yes; then
  
--- 27811,27824 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	fu_cv_sys_struct_timespec=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
  fi
! { echo "$as_me:$LINENO: result: $fu_cv_sys_struct_timespec" >&5
! echo "${ECHO_T}$fu_cv_sys_struct_timespec" >&6; }
  
    if test $fu_cv_sys_struct_timespec = yes; then
  
***************
*** 27102,27109 ****
  
  
  
!   echo "$as_me:$LINENO: checking whether nanosleep is declared" >&5
! echo $ECHO_N "checking whether nanosleep is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_nanosleep+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 27831,27838 ----
  
  
  
!   { echo "$as_me:$LINENO: checking whether nanosleep is declared" >&5
! echo $ECHO_N "checking whether nanosleep is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_nanosleep+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 27153,27164 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_nanosleep=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_nanosleep" >&5
! echo "${ECHO_T}$ac_cv_have_decl_nanosleep" >&6
  if test $ac_cv_have_decl_nanosleep = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 27882,27894 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_nanosleep=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_nanosleep" >&5
! echo "${ECHO_T}$ac_cv_have_decl_nanosleep" >&6; }
  if test $ac_cv_have_decl_nanosleep = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 27178,27185 ****
  
  
  
!   echo "$as_me:$LINENO: checking whether tzset clobbers localtime buffer" >&5
! echo $ECHO_N "checking whether tzset clobbers localtime buffer... $ECHO_C" >&6
  if test "${gl_cv_func_tzset_clobber+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 27908,27915 ----
  
  
  
!   { echo "$as_me:$LINENO: checking whether tzset clobbers localtime buffer" >&5
! echo $ECHO_N "checking whether tzset clobbers localtime buffer... $ECHO_C" >&6; }
  if test "${gl_cv_func_tzset_clobber+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 27245,27255 ****
  ( exit $ac_status )
  gl_cv_func_tzset_clobber=yes
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
! echo "$as_me:$LINENO: result: $gl_cv_func_tzset_clobber" >&5
! echo "${ECHO_T}$gl_cv_func_tzset_clobber" >&6
  
  
  cat >>confdefs.h <<\_ACEOF
--- 27975,27987 ----
  ( exit $ac_status )
  gl_cv_func_tzset_clobber=yes
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_func_tzset_clobber" >&5
! echo "${ECHO_T}$gl_cv_func_tzset_clobber" >&6; }
  
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 27264,27270 ****
    *" gettimeofday.$ac_objext"   | \
      "gettimeofday.$ac_objext "* | \
    *" gettimeofday.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS gettimeofday.$ac_objext" ;;
  esac
  
  
--- 27996,28003 ----
    *" gettimeofday.$ac_objext"   | \
      "gettimeofday.$ac_objext "* | \
    *" gettimeofday.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS gettimeofday.$ac_objext"
!  ;;
  esac
  
  
***************
*** 27298,27304 ****
    *" dup-safer.$ac_objext"   | \
      "dup-safer.$ac_objext "* | \
    *" dup-safer.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS dup-safer.$ac_objext" ;;
  esac
  
    case $LIBOBJS in
--- 28031,28038 ----
    *" dup-safer.$ac_objext"   | \
      "dup-safer.$ac_objext "* | \
    *" dup-safer.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS dup-safer.$ac_objext"
!  ;;
  esac
  
    case $LIBOBJS in
***************
*** 27306,27312 ****
    *" fd-safer.$ac_objext"   | \
      "fd-safer.$ac_objext "* | \
    *" fd-safer.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS fd-safer.$ac_objext" ;;
  esac
  
    case $LIBOBJS in
--- 28040,28047 ----
    *" fd-safer.$ac_objext"   | \
      "fd-safer.$ac_objext "* | \
    *" fd-safer.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS fd-safer.$ac_objext"
!  ;;
  esac
  
    case $LIBOBJS in
***************
*** 27314,27320 ****
    *" pipe-safer.$ac_objext"   | \
      "pipe-safer.$ac_objext "* | \
    *" pipe-safer.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS pipe-safer.$ac_objext" ;;
  esac
  
  
--- 28049,28056 ----
    *" pipe-safer.$ac_objext"   | \
      "pipe-safer.$ac_objext "* | \
    *" pipe-safer.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS pipe-safer.$ac_objext"
!  ;;
  esac
  
  
***************
*** 27398,27406 ****
  for ac_func in vasnprintf
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 28134,28142 ----
  for ac_func in vasnprintf
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 27426,27455 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 28162,28185 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 27481,27493 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 28211,28225 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 27499,27505 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 28231,28238 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 27512,27518 ****
    *" printf-args.$ac_objext"   | \
      "printf-args.$ac_objext "* | \
    *" printf-args.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS printf-args.$ac_objext" ;;
  esac
  
      case $LIBOBJS in
--- 28245,28252 ----
    *" printf-args.$ac_objext"   | \
      "printf-args.$ac_objext "* | \
    *" printf-args.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS printf-args.$ac_objext"
!  ;;
  esac
  
      case $LIBOBJS in
***************
*** 27520,27526 ****
    *" printf-parse.$ac_objext"   | \
      "printf-parse.$ac_objext "* | \
    *" printf-parse.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS printf-parse.$ac_objext" ;;
  esac
  
      case $LIBOBJS in
--- 28254,28261 ----
    *" printf-parse.$ac_objext"   | \
      "printf-parse.$ac_objext "* | \
    *" printf-parse.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS printf-parse.$ac_objext"
!  ;;
  esac
  
      case $LIBOBJS in
***************
*** 27528,27534 ****
    *" asnprintf.$ac_objext"   | \
      "asnprintf.$ac_objext "* | \
    *" asnprintf.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS asnprintf.$ac_objext" ;;
  esac
  
  
--- 28263,28270 ----
    *" asnprintf.$ac_objext"   | \
      "asnprintf.$ac_objext "* | \
    *" asnprintf.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS asnprintf.$ac_objext"
!  ;;
  esac
  
  
***************
*** 27544,27551 ****
  
  
  
!   echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
! echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6
  if test "${ac_cv_type_ptrdiff_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 28280,28287 ----
  
  
  
!   { echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
! echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_ptrdiff_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 27594,27605 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_ptrdiff_t=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
! echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6
  if test $ac_cv_type_ptrdiff_t = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 28330,28342 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_ptrdiff_t=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
! echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6; }
  if test $ac_cv_type_ptrdiff_t = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 27622,27630 ****
  for ac_func in snprintf wcslen
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 28359,28367 ----
  for ac_func in snprintf wcslen
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 27650,27679 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 28387,28410 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 27705,27717 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 28436,28450 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 27730,27738 ****
  for ac_func in vasprintf
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 28463,28471 ----
  for ac_func in vasprintf
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 27758,27787 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 28491,28514 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 27813,27825 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 28540,28554 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 27831,27837 ****
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
  esac
  
  fi
--- 28560,28567 ----
    *" $ac_func.$ac_objext"   | \
      "$ac_func.$ac_objext "* | \
    *" $ac_func.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 27844,27850 ****
    *" asprintf.$ac_objext"   | \
      "asprintf.$ac_objext "* | \
    *" asprintf.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS asprintf.$ac_objext" ;;
  esac
  
  
--- 28574,28581 ----
    *" asprintf.$ac_objext"   | \
      "asprintf.$ac_objext "* | \
    *" asprintf.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS asprintf.$ac_objext"
!  ;;
  esac
  
  
***************
*** 27860,27866 ****
    *" xmalloc.$ac_objext"   | \
      "xmalloc.$ac_objext "* | \
    *" xmalloc.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS xmalloc.$ac_objext" ;;
  esac
  
  
--- 28591,28598 ----
    *" xmalloc.$ac_objext"   | \
      "xmalloc.$ac_objext "* | \
    *" xmalloc.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS xmalloc.$ac_objext"
!  ;;
  esac
  
  
***************
*** 27879,27885 ****
    *" xgetcwd.$ac_objext"   | \
      "xgetcwd.$ac_objext "* | \
    *" xgetcwd.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS xgetcwd.$ac_objext" ;;
  esac
  
  
--- 28611,28618 ----
    *" xgetcwd.$ac_objext"   | \
      "xgetcwd.$ac_objext "* | \
    *" xgetcwd.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS xgetcwd.$ac_objext"
!  ;;
  esac
  
  
***************
*** 27902,27919 ****
  for ac_header in stdint.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 28635,28653 ----
  for ac_header in stdint.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 27950,27964 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 28684,28699 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 27992,28000 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 28727,28736 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 28028,28042 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 28764,28779 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 28056,28062 ****
    *" yesno.$ac_objext"   | \
      "yesno.$ac_objext "* | \
    *" yesno.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS yesno.$ac_objext" ;;
  esac
  
  
--- 28793,28800 ----
    *" yesno.$ac_objext"   | \
      "yesno.$ac_objext "* | \
    *" yesno.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS yesno.$ac_objext"
!  ;;
  esac
  
  
***************
*** 28078,28094 ****
  
  
  
!   echo "$as_me:$LINENO: checking whether NLS is requested" >&5
! echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
!     # Check whether --enable-nls or --disable-nls was given.
  if test "${enable_nls+set}" = set; then
!   enableval="$enable_nls"
!   USE_NLS=$enableval
  else
    USE_NLS=yes
! fi;
!   echo "$as_me:$LINENO: result: $USE_NLS" >&5
! echo "${ECHO_T}$USE_NLS" >&6
  
  
  
--- 28816,28832 ----
  
  
  
!   { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
! echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
!     # Check whether --enable-nls was given.
  if test "${enable_nls+set}" = set; then
!   enableval=$enable_nls; USE_NLS=$enableval
  else
    USE_NLS=yes
! fi
! 
!   { echo "$as_me:$LINENO: result: $USE_NLS" >&5
! echo "${ECHO_T}$USE_NLS" >&6; }
  
  
  
***************
*** 28125,28132 ****
  
  # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 28863,28870 ----
  
  # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 28157,28173 ****
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test "$MSGFMT" != ":"; then
!   echo "$as_me:$LINENO: result: $MSGFMT" >&5
! echo "${ECHO_T}$MSGFMT" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
    # Extract the first word of "gmsgfmt", so it can be a program name with args.
  set dummy gmsgfmt; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 28895,28911 ----
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test "$MSGFMT" != ":"; then
!   { echo "$as_me:$LINENO: result: $MSGFMT" >&5
! echo "${ECHO_T}$MSGFMT" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
    # Extract the first word of "gmsgfmt", so it can be a program name with args.
  set dummy gmsgfmt; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 28182,28188 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 28920,28926 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 28194,28209 ****
    ;;
  esac
  fi
- GMSGFMT=$ac_cv_path_GMSGFMT
- 
  if test -n "$GMSGFMT"; then
!   echo "$as_me:$LINENO: result: $GMSGFMT" >&5
! echo "${ECHO_T}$GMSGFMT" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
  
  
  # Prepare PATH_SEPARATOR.
--- 28932,28947 ----
    ;;
  esac
  fi
  if test -n "$GMSGFMT"; then
!   { echo "$as_me:$LINENO: result: $GMSGFMT" >&5
! echo "${ECHO_T}$GMSGFMT" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ GMSGFMT=$ac_cv_path_GMSGFMT
+ 
  
  
  # Prepare PATH_SEPARATOR.
***************
*** 28236,28243 ****
  
  # Extract the first word of "xgettext", so it can be a program name with args.
  set dummy xgettext; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 28974,28981 ----
  
  # Extract the first word of "xgettext", so it can be a program name with args.
  set dummy xgettext; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 28268,28278 ****
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test "$XGETTEXT" != ":"; then
!   echo "$as_me:$LINENO: result: $XGETTEXT" >&5
! echo "${ECHO_T}$XGETTEXT" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
      rm -f messages.po
--- 29006,29016 ----
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test "$XGETTEXT" != ":"; then
!   { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
! echo "${ECHO_T}$XGETTEXT" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
      rm -f messages.po
***************
*** 28308,28315 ****
  
  # Extract the first word of "msgmerge", so it can be a program name with args.
  set dummy msgmerge; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_path_MSGMERGE+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 29046,29053 ----
  
  # Extract the first word of "msgmerge", so it can be a program name with args.
  set dummy msgmerge; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_path_MSGMERGE+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 28339,28349 ****
  fi
  MSGMERGE="$ac_cv_path_MSGMERGE"
  if test "$MSGMERGE" != ":"; then
!   echo "$as_me:$LINENO: result: $MSGMERGE" >&5
! echo "${ECHO_T}$MSGMERGE" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
  
--- 29077,29087 ----
  fi
  MSGMERGE="$ac_cv_path_MSGMERGE"
  if test "$MSGMERGE" != ":"; then
!   { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
! echo "${ECHO_T}$MSGMERGE" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
  
***************
*** 28353,28360 ****
        : ;
      else
        GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
!       echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
! echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
        GMSGFMT=":"
      fi
    fi
--- 29091,29098 ----
        : ;
      else
        GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
!       { echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
! echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
        GMSGFMT=":"
      fi
    fi
***************
*** 28364,28377 ****
         (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
        : ;
      else
!       echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
! echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
        XGETTEXT=":"
      fi
          rm -f messages.po
    fi
  
!             ac_config_commands="$ac_config_commands default-1"
  
  
  
--- 29102,29115 ----
         (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
        : ;
      else
!       { echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
! echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6; }
        XGETTEXT=":"
      fi
          rm -f messages.po
    fi
  
!   ac_config_commands="$ac_config_commands default-1"
  
  
  
***************
*** 28396,28457 ****
  echo "$as_me: error: cannot run $ac_config_sub" >&2;}
     { (exit 1); exit 1; }; }
  
! echo "$as_me:$LINENO: checking build system type" >&5
! echo $ECHO_N "checking build system type... $ECHO_C" >&6
  if test "${ac_cv_build+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!   ac_cv_build_alias=$build_alias
! test -z "$ac_cv_build_alias" &&
!   ac_cv_build_alias=`$ac_config_guess`
! test -z "$ac_cv_build_alias" &&
    { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
  echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
     { (exit 1); exit 1; }; }
! ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
!   { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
! echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
     { (exit 1); exit 1; }; }
  
  fi
! echo "$as_me:$LINENO: result: $ac_cv_build" >&5
! echo "${ECHO_T}$ac_cv_build" >&6
  build=$ac_cv_build
! build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
! build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
! build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
  
  
! echo "$as_me:$LINENO: checking host system type" >&5
! echo $ECHO_N "checking host system type... $ECHO_C" >&6
  if test "${ac_cv_host+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!   ac_cv_host_alias=$host_alias
! test -z "$ac_cv_host_alias" &&
!   ac_cv_host_alias=$ac_cv_build_alias
! ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
!   { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
! echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
     { (exit 1); exit 1; }; }
  
  fi
! echo "$as_me:$LINENO: result: $ac_cv_host" >&5
! echo "${ECHO_T}$ac_cv_host" >&6
  host=$ac_cv_host
! host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
! host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
! host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
  
  
  
! # Check whether --with-gnu-ld or --without-gnu-ld was given.
  if test "${with_gnu_ld+set}" = set; then
!   withval="$with_gnu_ld"
!   test "$withval" = no || with_gnu_ld=yes
  else
    with_gnu_ld=no
! fi;
  # Prepare PATH_SEPARATOR.
  # The user is always right.
  if test "${PATH_SEPARATOR+set}" != set; then
--- 29134,29218 ----
  echo "$as_me: error: cannot run $ac_config_sub" >&2;}
     { (exit 1); exit 1; }; }
  
! { echo "$as_me:$LINENO: checking build system type" >&5
! echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
  if test "${ac_cv_build+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!   ac_build_alias=$build_alias
! test "x$ac_build_alias" = x &&
!   ac_build_alias=`$ac_config_guess`
! test "x$ac_build_alias" = x &&
    { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
  echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
     { (exit 1); exit 1; }; }
! ac_cv_build=`$ac_config_sub $ac_build_alias` ||
!   { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_build_alias failed" >&5
! echo "$as_me: error: $ac_config_sub $ac_build_alias failed" >&2;}
     { (exit 1); exit 1; }; }
  
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_build" >&5
! echo "${ECHO_T}$ac_cv_build" >&6; }
! case $ac_cv_build in
! *-*-*) ;;
! *) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
! echo "$as_me: error: invalid value of canonical build" >&2;}
!    { (exit 1); exit 1; }; };;
! esac
  build=$ac_cv_build
! ac_save_IFS=$IFS; IFS='-'
! set x $ac_cv_build
! shift
! build_cpu=$1
! build_vendor=$2
! shift; shift
! build_os=$*
! IFS=$ac_save_IFS
  
  
! { echo "$as_me:$LINENO: checking host system type" >&5
! echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
  if test "${ac_cv_host+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
!   if test "x$host_alias" = x; then
!   ac_cv_host=$ac_cv_build
! else
!   ac_cv_host=`$ac_config_sub $host_alias` ||
!     { { echo "$as_me:$LINENO: error: $ac_config_sub $host_alias failed" >&5
! echo "$as_me: error: $ac_config_sub $host_alias failed" >&2;}
     { (exit 1); exit 1; }; }
+ fi
  
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_host" >&5
! echo "${ECHO_T}$ac_cv_host" >&6; }
! case $ac_cv_host in
! *-*-*) ;;
! *) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
! echo "$as_me: error: invalid value of canonical host" >&2;}
!    { (exit 1); exit 1; }; };;
! esac
  host=$ac_cv_host
! ac_save_IFS=$IFS; IFS='-'
! set x $ac_cv_host
! shift
! host_cpu=$1
! host_vendor=$2
! shift; shift
! host_os=$*
! IFS=$ac_save_IFS
  
  
  
! # Check whether --with-gnu-ld was given.
  if test "${with_gnu_ld+set}" = set; then
!   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
  else
    with_gnu_ld=no
! fi
! 
  # Prepare PATH_SEPARATOR.
  # The user is always right.
  if test "${PATH_SEPARATOR+set}" != set; then
***************
*** 28468,28475 ****
  ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
!   echo "$as_me:$LINENO: checking for ld used by GCC" >&5
! echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
--- 29229,29236 ----
  ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
!   { echo "$as_me:$LINENO: checking for ld used by GCC" >&5
! echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6; }
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
***************
*** 28498,28508 ****
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
!   echo "$as_me:$LINENO: checking for GNU ld" >&5
! echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
  else
!   echo "$as_me:$LINENO: checking for non-GNU ld" >&5
! echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
  fi
  if test "${acl_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
--- 29259,29269 ----
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
!   { echo "$as_me:$LINENO: checking for GNU ld" >&5
! echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
  else
!   { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
! echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
  fi
  if test "${acl_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
***************
*** 28532,28548 ****
  
  LD="$acl_cv_path_LD"
  if test -n "$LD"; then
!   echo "$as_me:$LINENO: result: $LD" >&5
! echo "${ECHO_T}$LD" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
  echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
     { (exit 1); exit 1; }; }
! echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
! echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
  if test "${acl_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 29293,29309 ----
  
  LD="$acl_cv_path_LD"
  if test -n "$LD"; then
!   { echo "$as_me:$LINENO: result: $LD" >&5
! echo "${ECHO_T}$LD" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
  echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
     { (exit 1); exit 1; }; }
! { echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
! echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
  if test "${acl_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 28554,28568 ****
    acl_cv_prog_gnu_ld=no ;;
  esac
  fi
! echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
! echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
  with_gnu_ld=$acl_cv_prog_gnu_ld
  
  
  
  
!                                                 echo "$as_me:$LINENO: checking for shared library run path origin" >&5
! echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
  if test "${acl_cv_rpath+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 29315,29329 ----
    acl_cv_prog_gnu_ld=no ;;
  esac
  fi
! { echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
! echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6; }
  with_gnu_ld=$acl_cv_prog_gnu_ld
  
  
  
  
!                                                 { echo "$as_me:$LINENO: checking for shared library run path origin" >&5
! echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6; }
  if test "${acl_cv_rpath+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 28574,28581 ****
      acl_cv_rpath=done
  
  fi
! echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
! echo "${ECHO_T}$acl_cv_rpath" >&6
    wl="$acl_cv_wl"
    libext="$acl_cv_libext"
    shlibext="$acl_cv_shlibext"
--- 29335,29342 ----
      acl_cv_rpath=done
  
  fi
! { echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
! echo "${ECHO_T}$acl_cv_rpath" >&6; }
    wl="$acl_cv_wl"
    libext="$acl_cv_libext"
    shlibext="$acl_cv_shlibext"
***************
*** 28583,28595 ****
    hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
    hardcode_direct="$acl_cv_hardcode_direct"
    hardcode_minus_L="$acl_cv_hardcode_minus_L"
!     # Check whether --enable-rpath or --disable-rpath was given.
  if test "${enable_rpath+set}" = set; then
!   enableval="$enable_rpath"
!   :
  else
    enable_rpath=yes
! fi;
  
  
                    acl_libdirstem=lib
--- 29344,29356 ----
    hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
    hardcode_direct="$acl_cv_hardcode_direct"
    hardcode_minus_L="$acl_cv_hardcode_minus_L"
!     # Check whether --enable-rpath was given.
  if test "${enable_rpath+set}" = set; then
!   enableval=$enable_rpath; :
  else
    enable_rpath=yes
! fi
! 
  
  
                    acl_libdirstem=lib
***************
*** 28631,28640 ****
    prefix="$acl_save_prefix"
  
  
! # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
  if test "${with_libiconv_prefix+set}" = set; then
!   withval="$with_libiconv_prefix"
! 
      if test "X$withval" = "Xno"; then
        use_additional=no
      else
--- 29392,29400 ----
    prefix="$acl_save_prefix"
  
  
! # Check whether --with-libiconv-prefix was given.
  if test "${with_libiconv_prefix+set}" = set; then
!   withval=$with_libiconv_prefix;
      if test "X$withval" = "Xno"; then
        use_additional=no
      else
***************
*** 28657,28663 ****
        fi
      fi
  
! fi;
        LIBICONV=
    LTLIBICONV=
    INCICONV=
--- 29417,29424 ----
        fi
      fi
  
! fi
! 
        LIBICONV=
    LTLIBICONV=
    INCICONV=
***************
*** 29010,29017 ****
  
  
  
!     echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
! echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6
  if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 29771,29778 ----
  
  
  
!     { echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
! echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6; }
  if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 29061,29075 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gt_cv_func_CFPreferencesCopyAppValue=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
       CPPFLAGS="$gt_save_CPPFLAGS"
       LIBS="$gt_save_LIBS"
  fi
! echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
! echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6
    if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 29822,29837 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gt_cv_func_CFPreferencesCopyAppValue=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
       CPPFLAGS="$gt_save_CPPFLAGS"
       LIBS="$gt_save_LIBS"
  fi
! { echo "$as_me:$LINENO: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
! echo "${ECHO_T}$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
    if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 29077,29084 ****
  _ACEOF
  
    fi
!     echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
! echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6
  if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 29839,29846 ----
  _ACEOF
  
    fi
!     { echo "$as_me:$LINENO: checking for CFLocaleCopyCurrent" >&5
! echo $ECHO_N "checking for CFLocaleCopyCurrent... $ECHO_C" >&6; }
  if test "${gt_cv_func_CFLocaleCopyCurrent+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 29128,29142 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gt_cv_func_CFLocaleCopyCurrent=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
       CPPFLAGS="$gt_save_CPPFLAGS"
       LIBS="$gt_save_LIBS"
  fi
! echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
! echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6
    if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 29890,29905 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gt_cv_func_CFLocaleCopyCurrent=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
       CPPFLAGS="$gt_save_CPPFLAGS"
       LIBS="$gt_save_LIBS"
  fi
! { echo "$as_me:$LINENO: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
! echo "${ECHO_T}$gt_cv_func_CFLocaleCopyCurrent" >&6; }
    if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 29152,29168 ****
  
  
  
!   echo "$as_me:$LINENO: checking whether NLS is requested" >&5
! echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
!     # Check whether --enable-nls or --disable-nls was given.
  if test "${enable_nls+set}" = set; then
!   enableval="$enable_nls"
!   USE_NLS=$enableval
  else
    USE_NLS=yes
! fi;
!   echo "$as_me:$LINENO: result: $USE_NLS" >&5
! echo "${ECHO_T}$USE_NLS" >&6
  
  
  
--- 29915,29931 ----
  
  
  
!   { echo "$as_me:$LINENO: checking whether NLS is requested" >&5
! echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6; }
!     # Check whether --enable-nls was given.
  if test "${enable_nls+set}" = set; then
!   enableval=$enable_nls; USE_NLS=$enableval
  else
    USE_NLS=yes
! fi
! 
!   { echo "$as_me:$LINENO: result: $USE_NLS" >&5
! echo "${ECHO_T}$USE_NLS" >&6; }
  
  
  
***************
*** 29179,29186 ****
  
  
  
!         echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
! echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
  if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 29942,29949 ----
  
  
  
!         { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
! echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
  if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 29229,29241 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gt_cv_func_gnugettext1_libc=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
! echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
  
          if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
  
--- 29992,30005 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gt_cv_func_gnugettext1_libc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
! echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6; }
  
          if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
  
***************
*** 29268,29275 ****
    done
  
  
!   echo "$as_me:$LINENO: checking for iconv" >&5
! echo $ECHO_N "checking for iconv... $ECHO_C" >&6
  if test "${am_cv_func_iconv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 30032,30039 ----
    done
  
  
!   { echo "$as_me:$LINENO: checking for iconv" >&5
! echo $ECHO_N "checking for iconv... $ECHO_C" >&6; }
  if test "${am_cv_func_iconv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 29321,29327 ****
--- 30085,30093 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
      if test "$am_cv_func_iconv" != yes; then
***************
*** 29373,29387 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
        LIBS="$am_save_LIBS"
      fi
  
  fi
! echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
! echo "${ECHO_T}$am_cv_func_iconv" >&6
    if test "$am_cv_func_iconv" = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 30139,30155 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
        LIBS="$am_save_LIBS"
      fi
  
  fi
! { echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
! echo "${ECHO_T}$am_cv_func_iconv" >&6; }
    if test "$am_cv_func_iconv" = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 29390,29399 ****
  
    fi
    if test "$am_cv_lib_iconv" = yes; then
!     echo "$as_me:$LINENO: checking how to link with libiconv" >&5
! echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
!     echo "$as_me:$LINENO: result: $LIBICONV" >&5
! echo "${ECHO_T}$LIBICONV" >&6
    else
              CPPFLAGS="$am_save_CPPFLAGS"
      LIBICONV=
--- 30158,30167 ----
  
    fi
    if test "$am_cv_lib_iconv" = yes; then
!     { echo "$as_me:$LINENO: checking how to link with libiconv" >&5
! echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }
!     { echo "$as_me:$LINENO: result: $LIBICONV" >&5
! echo "${ECHO_T}$LIBICONV" >&6; }
    else
              CPPFLAGS="$am_save_CPPFLAGS"
      LIBICONV=
***************
*** 29420,29429 ****
    prefix="$acl_save_prefix"
  
  
! # Check whether --with-libintl-prefix or --without-libintl-prefix was given.
  if test "${with_libintl_prefix+set}" = set; then
!   withval="$with_libintl_prefix"
! 
      if test "X$withval" = "Xno"; then
        use_additional=no
      else
--- 30188,30196 ----
    prefix="$acl_save_prefix"
  
  
! # Check whether --with-libintl-prefix was given.
  if test "${with_libintl_prefix+set}" = set; then
!   withval=$with_libintl_prefix;
      if test "X$withval" = "Xno"; then
        use_additional=no
      else
***************
*** 29446,29452 ****
        fi
      fi
  
! fi;
        LIBINTL=
    LTLIBINTL=
    INCINTL=
--- 30213,30220 ----
        fi
      fi
  
! fi
! 
        LIBINTL=
    LTLIBINTL=
    INCINTL=
***************
*** 29782,29789 ****
      done
    fi
  
!           echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
! echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
  if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 30550,30557 ----
      done
    fi
  
!           { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
! echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; }
  if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 29840,29847 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gt_cv_func_gnugettext1_libintl=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
                          if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
--- 30608,30616 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gt_cv_func_gnugettext1_libintl=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
                          if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
***************
*** 29898,29912 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
              fi
              CPPFLAGS="$gt_save_CPPFLAGS"
              LIBS="$gt_save_LIBS"
  fi
! echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
! echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6
          fi
  
                                          if test "$gt_cv_func_gnugettext1_libc" = "yes" \
--- 30667,30683 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
              fi
              CPPFLAGS="$gt_save_CPPFLAGS"
              LIBS="$gt_save_LIBS"
  fi
! { echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
! echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; }
          fi
  
                                          if test "$gt_cv_func_gnugettext1_libc" = "yes" \
***************
*** 29942,29954 ****
      fi
    fi
  
!   echo "$as_me:$LINENO: checking whether to use NLS" >&5
! echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6
!   echo "$as_me:$LINENO: result: $USE_NLS" >&5
! echo "${ECHO_T}$USE_NLS" >&6
    if test "$USE_NLS" = "yes"; then
!     echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
! echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6
      if test "$gt_use_preinstalled_gnugettext" = "yes"; then
        if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
          gt_source="external libintl"
--- 30713,30725 ----
      fi
    fi
  
!   { echo "$as_me:$LINENO: checking whether to use NLS" >&5
! echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6; }
!   { echo "$as_me:$LINENO: result: $USE_NLS" >&5
! echo "${ECHO_T}$USE_NLS" >&6; }
    if test "$USE_NLS" = "yes"; then
!     { echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
! echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; }
      if test "$gt_use_preinstalled_gnugettext" = "yes"; then
        if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
          gt_source="external libintl"
***************
*** 29958,29975 ****
      else
        gt_source="included intl directory"
      fi
!     echo "$as_me:$LINENO: result: $gt_source" >&5
! echo "${ECHO_T}$gt_source" >&6
    fi
  
    if test "$USE_NLS" = "yes"; then
  
      if test "$gt_use_preinstalled_gnugettext" = "yes"; then
        if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
!         echo "$as_me:$LINENO: checking how to link with libintl" >&5
! echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6
!         echo "$as_me:$LINENO: result: $LIBINTL" >&5
! echo "${ECHO_T}$LIBINTL" >&6
  
    for element in $INCINTL; do
      haveit=
--- 30729,30746 ----
      else
        gt_source="included intl directory"
      fi
!     { echo "$as_me:$LINENO: result: $gt_source" >&5
! echo "${ECHO_T}$gt_source" >&6; }
    fi
  
    if test "$USE_NLS" = "yes"; then
  
      if test "$gt_use_preinstalled_gnugettext" = "yes"; then
        if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
!         { echo "$as_me:$LINENO: checking how to link with libintl" >&5
! echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; }
!         { echo "$as_me:$LINENO: result: $LIBINTL" >&5
! echo "${ECHO_T}$LIBINTL" >&6; }
  
    for element in $INCINTL; do
      haveit=
***************
*** 30020,30027 ****
  
  
   # The error module still poses merge problems.
! echo "$as_me:$LINENO: checking whether strerror_r is declared" >&5
! echo $ECHO_N "checking whether strerror_r is declared... $ECHO_C" >&6
  if test "${ac_cv_have_decl_strerror_r+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 30791,30798 ----
  
  
   # The error module still poses merge problems.
! { echo "$as_me:$LINENO: checking whether strerror_r is declared" >&5
! echo $ECHO_N "checking whether strerror_r is declared... $ECHO_C" >&6; }
  if test "${ac_cv_have_decl_strerror_r+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 30070,30081 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_have_decl_strerror_r=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror_r" >&5
! echo "${ECHO_T}$ac_cv_have_decl_strerror_r" >&6
  if test $ac_cv_have_decl_strerror_r = yes; then
  
  cat >>confdefs.h <<_ACEOF
--- 30841,30853 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_have_decl_strerror_r=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror_r" >&5
! echo "${ECHO_T}$ac_cv_have_decl_strerror_r" >&6; }
  if test $ac_cv_have_decl_strerror_r = yes; then
  
  cat >>confdefs.h <<_ACEOF
***************
*** 30096,30104 ****
  for ac_func in strerror_r
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 30868,30876 ----
  for ac_func in strerror_r
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 30124,30153 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 30896,30919 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 30179,30191 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 30945,30959 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 30194,30201 ****
  fi
  done
  
! echo "$as_me:$LINENO: checking whether strerror_r returns char *" >&5
! echo $ECHO_N "checking whether strerror_r returns char *... $ECHO_C" >&6
  if test "${ac_cv_func_strerror_r_char_p+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 30962,30969 ----
  fi
  done
  
! { echo "$as_me:$LINENO: checking whether strerror_r returns char *" >&5
! echo $ECHO_N "checking whether strerror_r returns char *... $ECHO_C" >&6; }
  if test "${ac_cv_func_strerror_r_char_p+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 30248,30254 ****
--- 31016,31024 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
      else
        # strerror_r is not declared.  Choose between
***************
*** 30296,30308 ****
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
      fi
  
  fi
! echo "$as_me:$LINENO: result: $ac_cv_func_strerror_r_char_p" >&5
! echo "${ECHO_T}$ac_cv_func_strerror_r_char_p" >&6
  if test $ac_cv_func_strerror_r_char_p = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 31066,31080 ----
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
      fi
  
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_func_strerror_r_char_p" >&5
! echo "${ECHO_T}$ac_cv_func_strerror_r_char_p" >&6; }
  if test $ac_cv_func_strerror_r_char_p = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 30344,30361 ****
  for ac_header in glob.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 31116,31134 ----
  for ac_header in glob.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 30392,30406 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 31165,31180 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 30434,30442 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 31208,31217 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 30470,30484 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 31245,31260 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 30494,30501 ****
  
  
    if test -z "$GLOB_H"; then
!     echo "$as_me:$LINENO: checking for GNU glob interface version 1" >&5
! echo $ECHO_N "checking for GNU glob interface version 1... $ECHO_C" >&6
  if test "${gl_cv_gnu_glob_interface_version_1+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 31270,31277 ----
  
  
    if test -z "$GLOB_H"; then
!     { echo "$as_me:$LINENO: checking for GNU glob interface version 1" >&5
! echo $ECHO_N "checking for GNU glob interface version 1... $ECHO_C" >&6; }
  if test "${gl_cv_gnu_glob_interface_version_1+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 30530,30541 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! gl_cv_gnu_glob_interface_version_1=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $gl_cv_gnu_glob_interface_version_1" >&5
! echo "${ECHO_T}$gl_cv_gnu_glob_interface_version_1" >&6
  
      if test "$gl_cv_gnu_glob_interface_version_1" = "no"; then
        GLOB_H=glob.h
--- 31306,31318 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	gl_cv_gnu_glob_interface_version_1=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_gnu_glob_interface_version_1" >&5
! echo "${ECHO_T}$gl_cv_gnu_glob_interface_version_1" >&6; }
  
      if test "$gl_cv_gnu_glob_interface_version_1" = "no"; then
        GLOB_H=glob.h
***************
*** 30543,30550 ****
    fi
  
    if test -z "$GLOB_H"; then
!     echo "$as_me:$LINENO: checking whether glob lists broken symlinks" >&5
! echo $ECHO_N "checking whether glob lists broken symlinks... $ECHO_C" >&6
  if test "${gl_cv_glob_lists_symlinks+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 31320,31327 ----
    fi
  
    if test -z "$GLOB_H"; then
!     { echo "$as_me:$LINENO: checking whether glob lists broken symlinks" >&5
! echo $ECHO_N "checking whether glob lists broken symlinks... $ECHO_C" >&6; }
  if test "${gl_cv_glob_lists_symlinks+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 30597,30608 ****
  ( exit $ac_status )
  gl_cv_glob_lists_symlinks=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
        fi
  fi
! echo "$as_me:$LINENO: result: $gl_cv_glob_lists_symlinks" >&5
! echo "${ECHO_T}$gl_cv_glob_lists_symlinks" >&6
  
      if test $gl_cv_glob_lists_symlinks = no; then
        GLOB_H=glob.h
--- 31374,31387 ----
  ( exit $ac_status )
  gl_cv_glob_lists_symlinks=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
        fi
  fi
! { echo "$as_me:$LINENO: result: $gl_cv_glob_lists_symlinks" >&5
! echo "${ECHO_T}$gl_cv_glob_lists_symlinks" >&6; }
  
      if test $gl_cv_glob_lists_symlinks = no; then
        GLOB_H=glob.h
***************
*** 30640,30646 ****
    *" glob.$ac_objext"   | \
      "glob.$ac_objext "* | \
    *" glob.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS glob.$ac_objext" ;;
  esac
  
  
--- 31419,31426 ----
    *" glob.$ac_objext"   | \
      "glob.$ac_objext "* | \
    *" glob.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS glob.$ac_objext"
!  ;;
  esac
  
  
***************
*** 30709,30717 ****
  
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 31489,31497 ----
  
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 30737,30766 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 31517,31540 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 30792,30804 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 31566,31580 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 30815,30822 ****
  _ACEOF
  
  else
! 	echo "$as_me:$LINENO: checking for char" >&5
! echo $ECHO_N "checking for char... $ECHO_C" >&6
  if test "${ac_cv_type_char+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 31591,31598 ----
  _ACEOF
  
  else
! 	{ echo "$as_me:$LINENO: checking for char" >&5
! echo $ECHO_N "checking for char... $ECHO_C" >&6; }
  if test "${ac_cv_type_char+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 30865,30884 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_char=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
! echo "${ECHO_T}$ac_cv_type_char" >&6
  
! echo "$as_me:$LINENO: checking size of char" >&5
! echo $ECHO_N "checking size of char... $ECHO_C" >&6
  if test "${ac_cv_sizeof_char+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_char" = yes; then
!   # The cast to unsigned long works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
--- 31641,31661 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_char=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
! echo "${ECHO_T}$ac_cv_type_char" >&6; }
  
! { echo "$as_me:$LINENO: checking size of char" >&5
! echo $ECHO_N "checking size of char... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_char+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_char" = yes; then
!   # The cast to long int works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
***************
*** 30894,30900 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (char))) >= 0)];
  test_array [0] = 0
  
    ;
--- 31671,31677 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= 0)];
  test_array [0] = 0
  
    ;
***************
*** 30935,30941 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 31712,31718 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 30969,30988 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr $ac_mid + 1`
! 		    if test $ac_lo -le $ac_mid; then
! 		      ac_lo= ac_hi=
! 		      break
! 		    fi
! 		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 31746,31766 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr $ac_mid + 1`
! 			if test $ac_lo -le $ac_mid; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 30992,30998 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (char))) < 0)];
  test_array [0] = 0
  
    ;
--- 31770,31776 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (char))) < 0)];
  test_array [0] = 0
  
    ;
***************
*** 31033,31039 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 31811,31817 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 31067,31089 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_hi=`expr '(' $ac_mid ')' - 1`
! 		       if test $ac_mid -le $ac_hi; then
! 			 ac_lo= ac_hi=
! 			 break
! 		       fi
! 		       ac_mid=`expr 2 '*' $ac_mid`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo= ac_hi=
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
--- 31845,31870 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_hi=`expr '(' $ac_mid ')' - 1`
! 			if test $ac_mid -le $ac_hi; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo= ac_hi=
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
***************
*** 31098,31104 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 31879,31885 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 31132,31139 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
--- 31913,31921 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
***************
*** 31145,31157 ****
     { (exit 1); exit 1; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 31927,31932 ----
***************
*** 31159,31166 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! long longval () { return (long) (sizeof (char)); }
! unsigned long ulongval () { return (long) (sizeof (char)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
--- 31934,31941 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! static long int longval () { return (long int) (sizeof (char)); }
! static unsigned long int ulongval () { return (long int) (sizeof (char)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
***************
*** 31170,31186 ****
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long) (sizeof (char))) < 0)
      {
!       long i = longval ();
!       if (i != ((long) (sizeof (char))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long i = ulongval ();
!       if (i != ((long) (sizeof (char))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
--- 31945,31961 ----
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long int) (sizeof (char))) < 0)
      {
!       long int i = longval ();
!       if (i != ((long int) (sizeof (char))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long int i = ulongval ();
!       if (i != ((long int) (sizeof (char))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
***************
*** 31214,31236 ****
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
! fi
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_char=0
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
! echo "${ECHO_T}$ac_cv_sizeof_char" >&6
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_CHAR $ac_cv_sizeof_char
  _ACEOF
  
  
! 	echo "$as_me:$LINENO: checking for uniquely sized char" >&5
! echo $ECHO_N "checking for uniquely sized char... $ECHO_C" >&6
  if test "${ccvs_cv_unique_int_type_char+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 31989,32010 ----
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_char=0
  fi
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
! echo "${ECHO_T}$ac_cv_sizeof_char" >&6; }
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_CHAR $ac_cv_sizeof_char
  _ACEOF
  
  
! 	{ echo "$as_me:$LINENO: checking for uniquely sized char" >&5
! echo $ECHO_N "checking for uniquely sized char... $ECHO_C" >&6; }
  if test "${ccvs_cv_unique_int_type_char+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 31241,31248 ****
  			ccvs_cv_unique_int_type_char=yes\($ac_cv_sizeof_char\)
  		fi
  fi
! echo "$as_me:$LINENO: result: $ccvs_cv_unique_int_type_char" >&5
! echo "${ECHO_T}$ccvs_cv_unique_int_type_char" >&6
  	if test $ccvs_cv_unique_int_type_char != no ; then
  
  cat >>confdefs.h <<\_ACEOF
--- 32015,32022 ----
  			ccvs_cv_unique_int_type_char=yes\($ac_cv_sizeof_char\)
  		fi
  fi
! { echo "$as_me:$LINENO: result: $ccvs_cv_unique_int_type_char" >&5
! echo "${ECHO_T}$ccvs_cv_unique_int_type_char" >&6; }
  	if test $ccvs_cv_unique_int_type_char != no ; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 31250,31257 ****
  _ACEOF
  
  	fi
! 	echo "$as_me:$LINENO: checking for short" >&5
! echo $ECHO_N "checking for short... $ECHO_C" >&6
  if test "${ac_cv_type_short+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 32024,32031 ----
  _ACEOF
  
  	fi
! 	{ echo "$as_me:$LINENO: checking for short" >&5
! echo $ECHO_N "checking for short... $ECHO_C" >&6; }
  if test "${ac_cv_type_short+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 31300,31319 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_short=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
! echo "${ECHO_T}$ac_cv_type_short" >&6
  
! echo "$as_me:$LINENO: checking size of short" >&5
! echo $ECHO_N "checking size of short... $ECHO_C" >&6
  if test "${ac_cv_sizeof_short+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_short" = yes; then
!   # The cast to unsigned long works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
--- 32074,32094 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_short=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
! echo "${ECHO_T}$ac_cv_type_short" >&6; }
  
! { echo "$as_me:$LINENO: checking size of short" >&5
! echo $ECHO_N "checking size of short... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_short+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_short" = yes; then
!   # The cast to long int works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
***************
*** 31329,31335 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
  test_array [0] = 0
  
    ;
--- 32104,32110 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
  test_array [0] = 0
  
    ;
***************
*** 31370,31376 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 32145,32151 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 31404,31423 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr $ac_mid + 1`
! 		    if test $ac_lo -le $ac_mid; then
! 		      ac_lo= ac_hi=
! 		      break
! 		    fi
! 		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 32179,32199 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr $ac_mid + 1`
! 			if test $ac_lo -le $ac_mid; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 31427,31433 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
  test_array [0] = 0
  
    ;
--- 32203,32209 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)];
  test_array [0] = 0
  
    ;
***************
*** 31468,31474 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 32244,32250 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 31502,31524 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_hi=`expr '(' $ac_mid ')' - 1`
! 		       if test $ac_mid -le $ac_hi; then
! 			 ac_lo= ac_hi=
! 			 break
! 		       fi
! 		       ac_mid=`expr 2 '*' $ac_mid`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo= ac_hi=
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
--- 32278,32303 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_hi=`expr '(' $ac_mid ')' - 1`
! 			if test $ac_mid -le $ac_hi; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo= ac_hi=
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
***************
*** 31533,31539 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 32312,32318 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 31567,31574 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
--- 32346,32354 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
***************
*** 31580,31592 ****
     { (exit 1); exit 1; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 32360,32365 ----
***************
*** 31594,31601 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! long longval () { return (long) (sizeof (short)); }
! unsigned long ulongval () { return (long) (sizeof (short)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
--- 32367,32374 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! static long int longval () { return (long int) (sizeof (short)); }
! static unsigned long int ulongval () { return (long int) (sizeof (short)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
***************
*** 31605,31621 ****
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long) (sizeof (short))) < 0)
      {
!       long i = longval ();
!       if (i != ((long) (sizeof (short))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long i = ulongval ();
!       if (i != ((long) (sizeof (short))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
--- 32378,32394 ----
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long int) (sizeof (short))) < 0)
      {
!       long int i = longval ();
!       if (i != ((long int) (sizeof (short))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long int i = ulongval ();
!       if (i != ((long int) (sizeof (short))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
***************
*** 31649,31671 ****
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
! fi
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_short=0
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
! echo "${ECHO_T}$ac_cv_sizeof_short" >&6
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_SHORT $ac_cv_sizeof_short
  _ACEOF
  
  
! 	echo "$as_me:$LINENO: checking for uniquely sized short" >&5
! echo $ECHO_N "checking for uniquely sized short... $ECHO_C" >&6
  if test "${ccvs_cv_unique_int_type_short+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 32422,32443 ----
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_short=0
  fi
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
! echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_SHORT $ac_cv_sizeof_short
  _ACEOF
  
  
! 	{ echo "$as_me:$LINENO: checking for uniquely sized short" >&5
! echo $ECHO_N "checking for uniquely sized short... $ECHO_C" >&6; }
  if test "${ccvs_cv_unique_int_type_short+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 31676,31683 ****
  			ccvs_cv_unique_int_type_short=yes\($ac_cv_sizeof_short\)
  		fi
  fi
! echo "$as_me:$LINENO: result: $ccvs_cv_unique_int_type_short" >&5
! echo "${ECHO_T}$ccvs_cv_unique_int_type_short" >&6
  	if test $ccvs_cv_unique_int_type_short != no ; then
  
  cat >>confdefs.h <<\_ACEOF
--- 32448,32455 ----
  			ccvs_cv_unique_int_type_short=yes\($ac_cv_sizeof_short\)
  		fi
  fi
! { echo "$as_me:$LINENO: result: $ccvs_cv_unique_int_type_short" >&5
! echo "${ECHO_T}$ccvs_cv_unique_int_type_short" >&6; }
  	if test $ccvs_cv_unique_int_type_short != no ; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 31685,31692 ****
  _ACEOF
  
  	fi
! 	echo "$as_me:$LINENO: checking for int" >&5
! echo $ECHO_N "checking for int... $ECHO_C" >&6
  if test "${ac_cv_type_int+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 32457,32464 ----
  _ACEOF
  
  	fi
! 	{ echo "$as_me:$LINENO: checking for int" >&5
! echo $ECHO_N "checking for int... $ECHO_C" >&6; }
  if test "${ac_cv_type_int+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 31735,31754 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_int=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
! echo "${ECHO_T}$ac_cv_type_int" >&6
  
! echo "$as_me:$LINENO: 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" >&6
  else
    if test "$ac_cv_type_int" = yes; then
!   # The cast to unsigned long works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
--- 32507,32527 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_int=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
! echo "${ECHO_T}$ac_cv_type_int" >&6; }
  
! { echo "$as_me:$LINENO: 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" >&6
  else
    if test "$ac_cv_type_int" = yes; then
!   # The cast to long int works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
***************
*** 31764,31770 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
  test_array [0] = 0
  
    ;
--- 32537,32543 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
  test_array [0] = 0
  
    ;
***************
*** 31805,31811 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 32578,32584 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 31839,31858 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr $ac_mid + 1`
! 		    if test $ac_lo -le $ac_mid; then
! 		      ac_lo= ac_hi=
! 		      break
! 		    fi
! 		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 32612,32632 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr $ac_mid + 1`
! 			if test $ac_lo -le $ac_mid; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 31862,31868 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
  test_array [0] = 0
  
    ;
--- 32636,32642 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
  test_array [0] = 0
  
    ;
***************
*** 31903,31909 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 32677,32683 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 31937,31959 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_hi=`expr '(' $ac_mid ')' - 1`
! 		       if test $ac_mid -le $ac_hi; then
! 			 ac_lo= ac_hi=
! 			 break
! 		       fi
! 		       ac_mid=`expr 2 '*' $ac_mid`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo= ac_hi=
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
--- 32711,32736 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_hi=`expr '(' $ac_mid ')' - 1`
! 			if test $ac_mid -le $ac_hi; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo= ac_hi=
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
***************
*** 31968,31974 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 32745,32751 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 32002,32009 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
--- 32779,32787 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
***************
*** 32015,32027 ****
     { (exit 1); exit 1; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 32793,32798 ----
***************
*** 32029,32036 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! long longval () { return (long) (sizeof (int)); }
! unsigned long ulongval () { return (long) (sizeof (int)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
--- 32800,32807 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! static long int longval () { return (long int) (sizeof (int)); }
! static unsigned long int ulongval () { return (long int) (sizeof (int)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
***************
*** 32040,32056 ****
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long) (sizeof (int))) < 0)
      {
!       long i = longval ();
!       if (i != ((long) (sizeof (int))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long i = ulongval ();
!       if (i != ((long) (sizeof (int))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
--- 32811,32827 ----
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long int) (sizeof (int))) < 0)
      {
!       long int i = longval ();
!       if (i != ((long int) (sizeof (int))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long int i = ulongval ();
!       if (i != ((long int) (sizeof (int))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
***************
*** 32084,32106 ****
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
! fi
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_int=0
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
! echo "${ECHO_T}$ac_cv_sizeof_int" >&6
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_INT $ac_cv_sizeof_int
  _ACEOF
  
  
! 	echo "$as_me:$LINENO: checking for uniquely sized int" >&5
! echo $ECHO_N "checking for uniquely sized int... $ECHO_C" >&6
  if test "${ccvs_cv_unique_int_type_int+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 32855,32876 ----
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_int=0
  fi
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
! echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_INT $ac_cv_sizeof_int
  _ACEOF
  
  
! 	{ echo "$as_me:$LINENO: checking for uniquely sized int" >&5
! echo $ECHO_N "checking for uniquely sized int... $ECHO_C" >&6; }
  if test "${ccvs_cv_unique_int_type_int+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 32111,32118 ****
  			ccvs_cv_unique_int_type_int=yes\($ac_cv_sizeof_int\)
  		fi
  fi
! echo "$as_me:$LINENO: result: $ccvs_cv_unique_int_type_int" >&5
! echo "${ECHO_T}$ccvs_cv_unique_int_type_int" >&6
  	if test $ccvs_cv_unique_int_type_int != no ; then
  
  cat >>confdefs.h <<\_ACEOF
--- 32881,32888 ----
  			ccvs_cv_unique_int_type_int=yes\($ac_cv_sizeof_int\)
  		fi
  fi
! { echo "$as_me:$LINENO: result: $ccvs_cv_unique_int_type_int" >&5
! echo "${ECHO_T}$ccvs_cv_unique_int_type_int" >&6; }
  	if test $ccvs_cv_unique_int_type_int != no ; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 32120,32127 ****
  _ACEOF
  
  	fi
! 	echo "$as_me:$LINENO: checking for long" >&5
! echo $ECHO_N "checking for long... $ECHO_C" >&6
  if test "${ac_cv_type_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 32890,32897 ----
  _ACEOF
  
  	fi
! 	{ echo "$as_me:$LINENO: checking for long" >&5
! echo $ECHO_N "checking for long... $ECHO_C" >&6; }
  if test "${ac_cv_type_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 32170,32189 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_long=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
! echo "${ECHO_T}$ac_cv_type_long" >&6
  
! echo "$as_me:$LINENO: 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" >&6
  else
    if test "$ac_cv_type_long" = yes; then
!   # The cast to unsigned long works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
--- 32940,32960 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_long=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
! echo "${ECHO_T}$ac_cv_type_long" >&6; }
  
! { echo "$as_me:$LINENO: 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" >&6
  else
    if test "$ac_cv_type_long" = yes; then
!   # The cast to long int works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
***************
*** 32199,32205 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
  test_array [0] = 0
  
    ;
--- 32970,32976 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
  test_array [0] = 0
  
    ;
***************
*** 32240,32246 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 33011,33017 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 32274,32293 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr $ac_mid + 1`
! 		    if test $ac_lo -le $ac_mid; then
! 		      ac_lo= ac_hi=
! 		      break
! 		    fi
! 		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 33045,33065 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr $ac_mid + 1`
! 			if test $ac_lo -le $ac_mid; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 32297,32303 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
  test_array [0] = 0
  
    ;
--- 33069,33075 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
  test_array [0] = 0
  
    ;
***************
*** 32338,32344 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 33110,33116 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 32372,32394 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_hi=`expr '(' $ac_mid ')' - 1`
! 		       if test $ac_mid -le $ac_hi; then
! 			 ac_lo= ac_hi=
! 			 break
! 		       fi
! 		       ac_mid=`expr 2 '*' $ac_mid`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo= ac_hi=
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
--- 33144,33169 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_hi=`expr '(' $ac_mid ')' - 1`
! 			if test $ac_mid -le $ac_hi; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo= ac_hi=
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
***************
*** 32403,32409 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 33178,33184 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 32437,32444 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
--- 33212,33220 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
***************
*** 32450,32462 ****
     { (exit 1); exit 1; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 33226,33231 ----
***************
*** 32464,32471 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! long longval () { return (long) (sizeof (long)); }
! unsigned long ulongval () { return (long) (sizeof (long)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
--- 33233,33240 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! static long int longval () { return (long int) (sizeof (long)); }
! static unsigned long int ulongval () { return (long int) (sizeof (long)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
***************
*** 32475,32491 ****
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long) (sizeof (long))) < 0)
      {
!       long i = longval ();
!       if (i != ((long) (sizeof (long))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long i = ulongval ();
!       if (i != ((long) (sizeof (long))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
--- 33244,33260 ----
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long int) (sizeof (long))) < 0)
      {
!       long int i = longval ();
!       if (i != ((long int) (sizeof (long))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long int i = ulongval ();
!       if (i != ((long int) (sizeof (long))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
***************
*** 32519,32541 ****
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
! fi
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_long=0
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
! echo "${ECHO_T}$ac_cv_sizeof_long" >&6
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_LONG $ac_cv_sizeof_long
  _ACEOF
  
  
! 	echo "$as_me:$LINENO: checking for uniquely sized long" >&5
! echo $ECHO_N "checking for uniquely sized long... $ECHO_C" >&6
  if test "${ccvs_cv_unique_int_type_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 33288,33309 ----
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_long=0
  fi
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
! echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_LONG $ac_cv_sizeof_long
  _ACEOF
  
  
! 	{ echo "$as_me:$LINENO: checking for uniquely sized long" >&5
! echo $ECHO_N "checking for uniquely sized long... $ECHO_C" >&6; }
  if test "${ccvs_cv_unique_int_type_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 32546,32553 ****
  			ccvs_cv_unique_int_type_long=yes\($ac_cv_sizeof_long\)
  		fi
  fi
! echo "$as_me:$LINENO: result: $ccvs_cv_unique_int_type_long" >&5
! echo "${ECHO_T}$ccvs_cv_unique_int_type_long" >&6
  	if test $ccvs_cv_unique_int_type_long != no ; then
  
  cat >>confdefs.h <<\_ACEOF
--- 33314,33321 ----
  			ccvs_cv_unique_int_type_long=yes\($ac_cv_sizeof_long\)
  		fi
  fi
! { echo "$as_me:$LINENO: result: $ccvs_cv_unique_int_type_long" >&5
! echo "${ECHO_T}$ccvs_cv_unique_int_type_long" >&6; }
  	if test $ccvs_cv_unique_int_type_long != no ; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 32556,32563 ****
  
  	fi
  	if test $ac_cv_type_long_long != no; then
! 		echo "$as_me:$LINENO: checking for long long" >&5
! echo $ECHO_N "checking for long long... $ECHO_C" >&6
  if test "${ac_cv_type_long_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 33324,33331 ----
  
  	fi
  	if test $ac_cv_type_long_long != no; then
! 		{ echo "$as_me:$LINENO: checking for long long" >&5
! echo $ECHO_N "checking for long long... $ECHO_C" >&6; }
  if test "${ac_cv_type_long_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 32606,32625 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_long_long=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
! echo "${ECHO_T}$ac_cv_type_long_long" >&6
  
! echo "$as_me:$LINENO: checking size of long long" >&5
! echo $ECHO_N "checking size of long long... $ECHO_C" >&6
  if test "${ac_cv_sizeof_long_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_long_long" = yes; then
!   # The cast to unsigned long works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
--- 33374,33394 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_long_long=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
! echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
  
! { echo "$as_me:$LINENO: checking size of long long" >&5
! echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_long_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_long_long" = yes; then
!   # The cast to long int works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
***************
*** 32635,32641 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
  test_array [0] = 0
  
    ;
--- 33404,33410 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= 0)];
  test_array [0] = 0
  
    ;
***************
*** 32676,32682 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 33445,33451 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 32710,32729 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr $ac_mid + 1`
! 		    if test $ac_lo -le $ac_mid; then
! 		      ac_lo= ac_hi=
! 		      break
! 		    fi
! 		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 33479,33499 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr $ac_mid + 1`
! 			if test $ac_lo -le $ac_mid; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 32733,32739 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
  test_array [0] = 0
  
    ;
--- 33503,33509 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (long long))) < 0)];
  test_array [0] = 0
  
    ;
***************
*** 32774,32780 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 33544,33550 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (long long))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 32808,32830 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_hi=`expr '(' $ac_mid ')' - 1`
! 		       if test $ac_mid -le $ac_hi; then
! 			 ac_lo= ac_hi=
! 			 break
! 		       fi
! 		       ac_mid=`expr 2 '*' $ac_mid`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo= ac_hi=
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
--- 33578,33603 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_hi=`expr '(' $ac_mid ')' - 1`
! 			if test $ac_mid -le $ac_hi; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo= ac_hi=
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
***************
*** 32839,32845 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 33612,33618 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (long long))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 32873,32880 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
--- 33646,33654 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
***************
*** 32886,32898 ****
     { (exit 1); exit 1; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 33660,33665 ----
***************
*** 32900,32907 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! long longval () { return (long) (sizeof (long long)); }
! unsigned long ulongval () { return (long) (sizeof (long long)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
--- 33667,33674 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! static long int longval () { return (long int) (sizeof (long long)); }
! static unsigned long int ulongval () { return (long int) (sizeof (long long)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
***************
*** 32911,32927 ****
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long) (sizeof (long long))) < 0)
      {
!       long i = longval ();
!       if (i != ((long) (sizeof (long long))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long i = ulongval ();
!       if (i != ((long) (sizeof (long long))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
--- 33678,33694 ----
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long int) (sizeof (long long))) < 0)
      {
!       long int i = longval ();
!       if (i != ((long int) (sizeof (long long))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long int i = ulongval ();
!       if (i != ((long int) (sizeof (long long))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
***************
*** 32955,32977 ****
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
! fi
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_long_long=0
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
! echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
  _ACEOF
  
  
! 		echo "$as_me:$LINENO: checking for uniquely sized long long" >&5
! echo $ECHO_N "checking for uniquely sized long long... $ECHO_C" >&6
  if test "${ccvs_cv_unique_int_type_long_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 33722,33743 ----
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_long_long=0
  fi
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
! echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
  _ACEOF
  
  
! 		{ echo "$as_me:$LINENO: checking for uniquely sized long long" >&5
! echo $ECHO_N "checking for uniquely sized long long... $ECHO_C" >&6; }
  if test "${ccvs_cv_unique_int_type_long_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 32982,32989 ****
  				ccvs_cv_unique_int_type_long_long=yes\($ac_cv_sizeof_long_long\)
  			fi
  fi
! echo "$as_me:$LINENO: result: $ccvs_cv_unique_int_type_long_long" >&5
! echo "${ECHO_T}$ccvs_cv_unique_int_type_long_long" >&6
  		if test $ccvs_cv_unique_int_type_long_long != no ; then
  
  cat >>confdefs.h <<\_ACEOF
--- 33748,33755 ----
  				ccvs_cv_unique_int_type_long_long=yes\($ac_cv_sizeof_long_long\)
  			fi
  fi
! { echo "$as_me:$LINENO: result: $ccvs_cv_unique_int_type_long_long" >&5
! echo "${ECHO_T}$ccvs_cv_unique_int_type_long_long" >&6; }
  		if test $ccvs_cv_unique_int_type_long_long != no ; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 32992,32999 ****
  
  		fi
  	fi
! 	echo "$as_me:$LINENO: 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" >&6
  else
--- 33758,33765 ----
  
  		fi
  	fi
! 	{ echo "$as_me:$LINENO: 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" >&6
  else
***************
*** 33042,33061 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_size_t=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
! echo "${ECHO_T}$ac_cv_type_size_t" >&6
  
! echo "$as_me:$LINENO: checking size of size_t" >&5
! echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
  if test "${ac_cv_sizeof_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_size_t" = yes; then
!   # The cast to unsigned long works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
--- 33808,33828 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_size_t=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
! echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
  
! { echo "$as_me:$LINENO: checking size of size_t" >&5
! echo $ECHO_N "checking size of size_t... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_size_t" = yes; then
!   # The cast to long int works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
***************
*** 33071,33077 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= 0)];
  test_array [0] = 0
  
    ;
--- 33838,33844 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= 0)];
  test_array [0] = 0
  
    ;
***************
*** 33112,33118 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 33879,33885 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 33146,33165 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr $ac_mid + 1`
! 		    if test $ac_lo -le $ac_mid; then
! 		      ac_lo= ac_hi=
! 		      break
! 		    fi
! 		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 33913,33933 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr $ac_mid + 1`
! 			if test $ac_lo -le $ac_mid; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 33169,33175 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (size_t))) < 0)];
  test_array [0] = 0
  
    ;
--- 33937,33943 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) < 0)];
  test_array [0] = 0
  
    ;
***************
*** 33210,33216 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (size_t))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 33978,33984 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 33244,33266 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_hi=`expr '(' $ac_mid ')' - 1`
! 		       if test $ac_mid -le $ac_hi; then
! 			 ac_lo= ac_hi=
! 			 break
! 		       fi
! 		       ac_mid=`expr 2 '*' $ac_mid`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo= ac_hi=
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
--- 34012,34037 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_hi=`expr '(' $ac_mid ')' - 1`
! 			if test $ac_mid -le $ac_hi; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo= ac_hi=
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
***************
*** 33275,33281 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (size_t))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 34046,34052 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 33309,33316 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
--- 34080,34088 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
***************
*** 33322,33334 ****
     { (exit 1); exit 1; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 34094,34099 ----
***************
*** 33336,33343 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! long longval () { return (long) (sizeof (size_t)); }
! unsigned long ulongval () { return (long) (sizeof (size_t)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
--- 34101,34108 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! static long int longval () { return (long int) (sizeof (size_t)); }
! static unsigned long int ulongval () { return (long int) (sizeof (size_t)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
***************
*** 33347,33363 ****
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long) (sizeof (size_t))) < 0)
      {
!       long i = longval ();
!       if (i != ((long) (sizeof (size_t))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long i = ulongval ();
!       if (i != ((long) (sizeof (size_t))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
--- 34112,34128 ----
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long int) (sizeof (size_t))) < 0)
      {
!       long int i = longval ();
!       if (i != ((long int) (sizeof (size_t))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long int i = ulongval ();
!       if (i != ((long int) (sizeof (size_t))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
***************
*** 33391,33413 ****
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
! fi
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_size_t=0
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
! echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
  _ACEOF
  
  
! 	echo "$as_me:$LINENO: checking for uniquely sized size_t" >&5
! echo $ECHO_N "checking for uniquely sized size_t... $ECHO_C" >&6
  if test "${ccvs_cv_unique_int_type_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 34156,34177 ----
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_size_t=0
  fi
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
! echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6; }
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
  _ACEOF
  
  
! 	{ echo "$as_me:$LINENO: checking for uniquely sized size_t" >&5
! echo $ECHO_N "checking for uniquely sized size_t... $ECHO_C" >&6; }
  if test "${ccvs_cv_unique_int_type_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 33418,33425 ****
  			ccvs_cv_unique_int_type_size_t=yes\($ac_cv_sizeof_size_t\)
  		fi
  fi
! echo "$as_me:$LINENO: result: $ccvs_cv_unique_int_type_size_t" >&5
! echo "${ECHO_T}$ccvs_cv_unique_int_type_size_t" >&6
  	if test $ccvs_cv_unique_int_type_size_t != no ; then
  
  cat >>confdefs.h <<\_ACEOF
--- 34182,34189 ----
  			ccvs_cv_unique_int_type_size_t=yes\($ac_cv_sizeof_size_t\)
  		fi
  fi
! { echo "$as_me:$LINENO: result: $ccvs_cv_unique_int_type_size_t" >&5
! echo "${ECHO_T}$ccvs_cv_unique_int_type_size_t" >&6; }
  	if test $ccvs_cv_unique_int_type_size_t != no ; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 33427,33434 ****
  _ACEOF
  
  	fi
! 	echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
! echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6
  if test "${ac_cv_type_ptrdiff_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 34191,34198 ----
  _ACEOF
  
  	fi
! 	{ echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
! echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_ptrdiff_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 33477,33496 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_ptrdiff_t=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
! echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6
  
! echo "$as_me:$LINENO: checking size of ptrdiff_t" >&5
! echo $ECHO_N "checking size of ptrdiff_t... $ECHO_C" >&6
  if test "${ac_cv_sizeof_ptrdiff_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_ptrdiff_t" = yes; then
!   # The cast to unsigned long works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
--- 34241,34261 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_ptrdiff_t=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
! echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6; }
  
! { echo "$as_me:$LINENO: checking size of ptrdiff_t" >&5
! echo $ECHO_N "checking size of ptrdiff_t... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_ptrdiff_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_ptrdiff_t" = yes; then
!   # The cast to long int works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
***************
*** 33506,33512 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (ptrdiff_t))) >= 0)];
  test_array [0] = 0
  
    ;
--- 34271,34277 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (ptrdiff_t))) >= 0)];
  test_array [0] = 0
  
    ;
***************
*** 33547,33553 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (ptrdiff_t))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 34312,34318 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (ptrdiff_t))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 33581,33600 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr $ac_mid + 1`
! 		    if test $ac_lo -le $ac_mid; then
! 		      ac_lo= ac_hi=
! 		      break
! 		    fi
! 		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 34346,34366 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr $ac_mid + 1`
! 			if test $ac_lo -le $ac_mid; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 33604,33610 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (ptrdiff_t))) < 0)];
  test_array [0] = 0
  
    ;
--- 34370,34376 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (ptrdiff_t))) < 0)];
  test_array [0] = 0
  
    ;
***************
*** 33645,33651 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (ptrdiff_t))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 34411,34417 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (ptrdiff_t))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 33679,33701 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_hi=`expr '(' $ac_mid ')' - 1`
! 		       if test $ac_mid -le $ac_hi; then
! 			 ac_lo= ac_hi=
! 			 break
! 		       fi
! 		       ac_mid=`expr 2 '*' $ac_mid`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo= ac_hi=
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
--- 34445,34470 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_hi=`expr '(' $ac_mid ')' - 1`
! 			if test $ac_mid -le $ac_hi; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo= ac_hi=
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
***************
*** 33710,33716 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (ptrdiff_t))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 34479,34485 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (ptrdiff_t))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 33744,33751 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
--- 34513,34521 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
***************
*** 33757,33769 ****
     { (exit 1); exit 1; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 34527,34532 ----
***************
*** 33771,33778 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! long longval () { return (long) (sizeof (ptrdiff_t)); }
! unsigned long ulongval () { return (long) (sizeof (ptrdiff_t)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
--- 34534,34541 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! static long int longval () { return (long int) (sizeof (ptrdiff_t)); }
! static unsigned long int ulongval () { return (long int) (sizeof (ptrdiff_t)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
***************
*** 33782,33798 ****
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long) (sizeof (ptrdiff_t))) < 0)
      {
!       long i = longval ();
!       if (i != ((long) (sizeof (ptrdiff_t))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long i = ulongval ();
!       if (i != ((long) (sizeof (ptrdiff_t))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
--- 34545,34561 ----
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long int) (sizeof (ptrdiff_t))) < 0)
      {
!       long int i = longval ();
!       if (i != ((long int) (sizeof (ptrdiff_t))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long int i = ulongval ();
!       if (i != ((long int) (sizeof (ptrdiff_t))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
***************
*** 33826,33848 ****
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
! fi
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_ptrdiff_t=0
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sizeof_ptrdiff_t" >&5
! echo "${ECHO_T}$ac_cv_sizeof_ptrdiff_t" >&6
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_PTRDIFF_T $ac_cv_sizeof_ptrdiff_t
  _ACEOF
  
  
! 	echo "$as_me:$LINENO: checking for uniquely sized ptrdiff_t" >&5
! echo $ECHO_N "checking for uniquely sized ptrdiff_t... $ECHO_C" >&6
  if test "${ccvs_cv_unique_int_type_ptrdiff_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 34589,34610 ----
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_ptrdiff_t=0
  fi
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sizeof_ptrdiff_t" >&5
! echo "${ECHO_T}$ac_cv_sizeof_ptrdiff_t" >&6; }
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_PTRDIFF_T $ac_cv_sizeof_ptrdiff_t
  _ACEOF
  
  
! 	{ echo "$as_me:$LINENO: checking for uniquely sized ptrdiff_t" >&5
! echo $ECHO_N "checking for uniquely sized ptrdiff_t... $ECHO_C" >&6; }
  if test "${ccvs_cv_unique_int_type_ptrdiff_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 33853,33860 ****
  			ccvs_cv_unique_int_type_ptrdiff_t=yes\($ac_cv_sizeof_ptrdiff_t\)
  		fi
  fi
! echo "$as_me:$LINENO: result: $ccvs_cv_unique_int_type_ptrdiff_t" >&5
! echo "${ECHO_T}$ccvs_cv_unique_int_type_ptrdiff_t" >&6
  	if test $ccvs_cv_unique_int_type_ptrdiff_t != no ; then
  
  cat >>confdefs.h <<\_ACEOF
--- 34615,34622 ----
  			ccvs_cv_unique_int_type_ptrdiff_t=yes\($ac_cv_sizeof_ptrdiff_t\)
  		fi
  fi
! { echo "$as_me:$LINENO: result: $ccvs_cv_unique_int_type_ptrdiff_t" >&5
! echo "${ECHO_T}$ccvs_cv_unique_int_type_ptrdiff_t" >&6; }
  	if test $ccvs_cv_unique_int_type_ptrdiff_t != no ; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 33863,33870 ****
  
  	fi
  	if test $gt_cv_c_wint_t != no; then
! 		echo "$as_me:$LINENO: checking for wint_t" >&5
! echo $ECHO_N "checking for wint_t... $ECHO_C" >&6
  if test "${ac_cv_type_wint_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 34625,34632 ----
  
  	fi
  	if test $gt_cv_c_wint_t != no; then
! 		{ echo "$as_me:$LINENO: checking for wint_t" >&5
! echo $ECHO_N "checking for wint_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_wint_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 33916,33935 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_wint_t=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_wint_t" >&5
! echo "${ECHO_T}$ac_cv_type_wint_t" >&6
  
! echo "$as_me:$LINENO: checking size of wint_t" >&5
! echo $ECHO_N "checking size of wint_t... $ECHO_C" >&6
  if test "${ac_cv_sizeof_wint_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_wint_t" = yes; then
!   # The cast to unsigned long works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
--- 34678,34698 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_wint_t=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_wint_t" >&5
! echo "${ECHO_T}$ac_cv_type_wint_t" >&6; }
  
! { echo "$as_me:$LINENO: checking size of wint_t" >&5
! echo $ECHO_N "checking size of wint_t... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_wint_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_wint_t" = yes; then
!   # The cast to long int works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
***************
*** 33948,33954 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (wint_t))) >= 0)];
  test_array [0] = 0
  
    ;
--- 34711,34717 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (wint_t))) >= 0)];
  test_array [0] = 0
  
    ;
***************
*** 33992,33998 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (wint_t))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 34755,34761 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (wint_t))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 34026,34045 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr $ac_mid + 1`
! 		    if test $ac_lo -le $ac_mid; then
! 		      ac_lo= ac_hi=
! 		      break
! 		    fi
! 		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 34789,34809 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr $ac_mid + 1`
! 			if test $ac_lo -le $ac_mid; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 34052,34058 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (wint_t))) < 0)];
  test_array [0] = 0
  
    ;
--- 34816,34822 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (wint_t))) < 0)];
  test_array [0] = 0
  
    ;
***************
*** 34096,34102 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (wint_t))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 34860,34866 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (wint_t))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 34130,34152 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_hi=`expr '(' $ac_mid ')' - 1`
! 		       if test $ac_mid -le $ac_hi; then
! 			 ac_lo= ac_hi=
! 			 break
! 		       fi
! 		       ac_mid=`expr 2 '*' $ac_mid`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo= ac_hi=
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
--- 34894,34919 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_hi=`expr '(' $ac_mid ')' - 1`
! 			if test $ac_mid -le $ac_hi; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo= ac_hi=
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
***************
*** 34164,34170 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (wint_t))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 34931,34937 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (wint_t))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 34198,34205 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
--- 34965,34973 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
***************
*** 34211,34223 ****
     { (exit 1); exit 1; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 34979,34984 ----
***************
*** 34228,34235 ****
  #include <wchar.h>
  
  
! long longval () { return (long) (sizeof (wint_t)); }
! unsigned long ulongval () { return (long) (sizeof (wint_t)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
--- 34989,34996 ----
  #include <wchar.h>
  
  
! static long int longval () { return (long int) (sizeof (wint_t)); }
! static unsigned long int ulongval () { return (long int) (sizeof (wint_t)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
***************
*** 34239,34255 ****
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long) (sizeof (wint_t))) < 0)
      {
!       long i = longval ();
!       if (i != ((long) (sizeof (wint_t))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long i = ulongval ();
!       if (i != ((long) (sizeof (wint_t))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
--- 35000,35016 ----
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long int) (sizeof (wint_t))) < 0)
      {
!       long int i = longval ();
!       if (i != ((long int) (sizeof (wint_t))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long int i = ulongval ();
!       if (i != ((long int) (sizeof (wint_t))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
***************
*** 34283,34305 ****
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
! fi
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_wint_t=0
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sizeof_wint_t" >&5
! echo "${ECHO_T}$ac_cv_sizeof_wint_t" >&6
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_WINT_T $ac_cv_sizeof_wint_t
  _ACEOF
  
  
! 		echo "$as_me:$LINENO: checking for uniquely sized wint_t" >&5
! echo $ECHO_N "checking for uniquely sized wint_t... $ECHO_C" >&6
  if test "${ccvs_cv_unique_int_type_wint_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 35044,35065 ----
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_wint_t=0
  fi
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sizeof_wint_t" >&5
! echo "${ECHO_T}$ac_cv_sizeof_wint_t" >&6; }
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_WINT_T $ac_cv_sizeof_wint_t
  _ACEOF
  
  
! 		{ echo "$as_me:$LINENO: checking for uniquely sized wint_t" >&5
! echo $ECHO_N "checking for uniquely sized wint_t... $ECHO_C" >&6; }
  if test "${ccvs_cv_unique_int_type_wint_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 34310,34317 ****
  				ccvs_cv_unique_int_type_wint_t=yes\($ac_cv_sizeof_wint_t\)
  			fi
  fi
! echo "$as_me:$LINENO: result: $ccvs_cv_unique_int_type_wint_t" >&5
! echo "${ECHO_T}$ccvs_cv_unique_int_type_wint_t" >&6
  		if test $ccvs_cv_unique_int_type_wint_t != no ; then
  
  cat >>confdefs.h <<\_ACEOF
--- 35070,35077 ----
  				ccvs_cv_unique_int_type_wint_t=yes\($ac_cv_sizeof_wint_t\)
  			fi
  fi
! { echo "$as_me:$LINENO: result: $ccvs_cv_unique_int_type_wint_t" >&5
! echo "${ECHO_T}$ccvs_cv_unique_int_type_wint_t" >&6; }
  		if test $ccvs_cv_unique_int_type_wint_t != no ; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 34321,34328 ****
  		fi
  	fi
  	if test $gt_cv_c_intmax_t != no; then
! 		echo "$as_me:$LINENO: checking for intmax_t" >&5
! echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6
  if test "${ac_cv_type_intmax_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 35081,35088 ----
  		fi
  	fi
  	if test $gt_cv_c_intmax_t != no; then
! 		{ echo "$as_me:$LINENO: checking for intmax_t" >&5
! echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6; }
  if test "${ac_cv_type_intmax_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 34380,34399 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_intmax_t=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_intmax_t" >&5
! echo "${ECHO_T}$ac_cv_type_intmax_t" >&6
  
! echo "$as_me:$LINENO: checking size of intmax_t" >&5
! echo $ECHO_N "checking size of intmax_t... $ECHO_C" >&6
  if test "${ac_cv_sizeof_intmax_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_intmax_t" = yes; then
!   # The cast to unsigned long works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
--- 35140,35160 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_intmax_t=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_intmax_t" >&5
! echo "${ECHO_T}$ac_cv_type_intmax_t" >&6; }
  
! { echo "$as_me:$LINENO: checking size of intmax_t" >&5
! echo $ECHO_N "checking size of intmax_t... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_intmax_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_intmax_t" = yes; then
!   # The cast to long int works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
***************
*** 34418,34424 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (intmax_t))) >= 0)];
  test_array [0] = 0
  
    ;
--- 35179,35185 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (intmax_t))) >= 0)];
  test_array [0] = 0
  
    ;
***************
*** 34468,34474 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (intmax_t))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 35229,35235 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (intmax_t))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 34502,34521 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr $ac_mid + 1`
! 		    if test $ac_lo -le $ac_mid; then
! 		      ac_lo= ac_hi=
! 		      break
! 		    fi
! 		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 35263,35283 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr $ac_mid + 1`
! 			if test $ac_lo -le $ac_mid; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 34534,34540 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (intmax_t))) < 0)];
  test_array [0] = 0
  
    ;
--- 35296,35302 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (intmax_t))) < 0)];
  test_array [0] = 0
  
    ;
***************
*** 34584,34590 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (intmax_t))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 35346,35352 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (intmax_t))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 34618,34640 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_hi=`expr '(' $ac_mid ')' - 1`
! 		       if test $ac_mid -le $ac_hi; then
! 			 ac_lo= ac_hi=
! 			 break
! 		       fi
! 		       ac_mid=`expr 2 '*' $ac_mid`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo= ac_hi=
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
--- 35380,35405 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_hi=`expr '(' $ac_mid ')' - 1`
! 			if test $ac_mid -le $ac_hi; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo= ac_hi=
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
***************
*** 34658,34664 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (intmax_t))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 35423,35429 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (intmax_t))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 34692,34699 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
--- 35457,35465 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
***************
*** 34705,34717 ****
     { (exit 1); exit 1; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 35471,35476 ----
***************
*** 34728,34735 ****
  #endif
  
  
! long longval () { return (long) (sizeof (intmax_t)); }
! unsigned long ulongval () { return (long) (sizeof (intmax_t)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
--- 35487,35494 ----
  #endif
  
  
! static long int longval () { return (long int) (sizeof (intmax_t)); }
! static unsigned long int ulongval () { return (long int) (sizeof (intmax_t)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
***************
*** 34739,34755 ****
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long) (sizeof (intmax_t))) < 0)
      {
!       long i = longval ();
!       if (i != ((long) (sizeof (intmax_t))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long i = ulongval ();
!       if (i != ((long) (sizeof (intmax_t))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
--- 35498,35514 ----
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long int) (sizeof (intmax_t))) < 0)
      {
!       long int i = longval ();
!       if (i != ((long int) (sizeof (intmax_t))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long int i = ulongval ();
!       if (i != ((long int) (sizeof (intmax_t))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
***************
*** 34783,34805 ****
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
! fi
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_intmax_t=0
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sizeof_intmax_t" >&5
! echo "${ECHO_T}$ac_cv_sizeof_intmax_t" >&6
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_INTMAX_T $ac_cv_sizeof_intmax_t
  _ACEOF
  
  
! 		echo "$as_me:$LINENO: checking for uniquely sized intmax_t" >&5
! echo $ECHO_N "checking for uniquely sized intmax_t... $ECHO_C" >&6
  if test "${ccvs_cv_unique_int_type_intmax_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 35542,35563 ----
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_intmax_t=0
  fi
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sizeof_intmax_t" >&5
! echo "${ECHO_T}$ac_cv_sizeof_intmax_t" >&6; }
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_INTMAX_T $ac_cv_sizeof_intmax_t
  _ACEOF
  
  
! 		{ echo "$as_me:$LINENO: checking for uniquely sized intmax_t" >&5
! echo $ECHO_N "checking for uniquely sized intmax_t... $ECHO_C" >&6; }
  if test "${ccvs_cv_unique_int_type_intmax_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 34810,34817 ****
  				ccvs_cv_unique_int_type_intmax_t=yes\($ac_cv_sizeof_intmax_t\)
  			fi
  fi
! echo "$as_me:$LINENO: result: $ccvs_cv_unique_int_type_intmax_t" >&5
! echo "${ECHO_T}$ccvs_cv_unique_int_type_intmax_t" >&6
  		if test $ccvs_cv_unique_int_type_intmax_t != no ; then
  
  cat >>confdefs.h <<\_ACEOF
--- 35568,35575 ----
  				ccvs_cv_unique_int_type_intmax_t=yes\($ac_cv_sizeof_intmax_t\)
  			fi
  fi
! { echo "$as_me:$LINENO: result: $ccvs_cv_unique_int_type_intmax_t" >&5
! echo "${ECHO_T}$ccvs_cv_unique_int_type_intmax_t" >&6; }
  		if test $ccvs_cv_unique_int_type_intmax_t != no ; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 34821,34828 ****
  		fi
  	fi
  
! 				echo "$as_me:$LINENO: checking for float" >&5
! echo $ECHO_N "checking for float... $ECHO_C" >&6
  if test "${ac_cv_type_float+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 35579,35586 ----
  		fi
  	fi
  
! 				{ echo "$as_me:$LINENO: checking for float" >&5
! echo $ECHO_N "checking for float... $ECHO_C" >&6; }
  if test "${ac_cv_type_float+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 34871,34890 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_float=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_float" >&5
! echo "${ECHO_T}$ac_cv_type_float" >&6
  
! echo "$as_me:$LINENO: checking size of float" >&5
! echo $ECHO_N "checking size of float... $ECHO_C" >&6
  if test "${ac_cv_sizeof_float+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_float" = yes; then
!   # The cast to unsigned long works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
--- 35629,35649 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_float=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_float" >&5
! echo "${ECHO_T}$ac_cv_type_float" >&6; }
  
! { echo "$as_me:$LINENO: checking size of float" >&5
! echo $ECHO_N "checking size of float... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_float+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_float" = yes; then
!   # The cast to long int works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
***************
*** 34900,34906 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (float))) >= 0)];
  test_array [0] = 0
  
    ;
--- 35659,35665 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (float))) >= 0)];
  test_array [0] = 0
  
    ;
***************
*** 34941,34947 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (float))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 35700,35706 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (float))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 34975,34994 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr $ac_mid + 1`
! 		    if test $ac_lo -le $ac_mid; then
! 		      ac_lo= ac_hi=
! 		      break
! 		    fi
! 		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 35734,35754 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr $ac_mid + 1`
! 			if test $ac_lo -le $ac_mid; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 34998,35004 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (float))) < 0)];
  test_array [0] = 0
  
    ;
--- 35758,35764 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (float))) < 0)];
  test_array [0] = 0
  
    ;
***************
*** 35039,35045 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (float))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 35799,35805 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (float))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 35073,35095 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_hi=`expr '(' $ac_mid ')' - 1`
! 		       if test $ac_mid -le $ac_hi; then
! 			 ac_lo= ac_hi=
! 			 break
! 		       fi
! 		       ac_mid=`expr 2 '*' $ac_mid`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo= ac_hi=
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
--- 35833,35858 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_hi=`expr '(' $ac_mid ')' - 1`
! 			if test $ac_mid -le $ac_hi; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo= ac_hi=
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
***************
*** 35104,35110 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (float))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 35867,35873 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (float))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 35138,35145 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
--- 35901,35909 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
***************
*** 35151,35163 ****
     { (exit 1); exit 1; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 35915,35920 ----
***************
*** 35165,35172 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! long longval () { return (long) (sizeof (float)); }
! unsigned long ulongval () { return (long) (sizeof (float)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
--- 35922,35929 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! static long int longval () { return (long int) (sizeof (float)); }
! static unsigned long int ulongval () { return (long int) (sizeof (float)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
***************
*** 35176,35192 ****
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long) (sizeof (float))) < 0)
      {
!       long i = longval ();
!       if (i != ((long) (sizeof (float))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long i = ulongval ();
!       if (i != ((long) (sizeof (float))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
--- 35933,35949 ----
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long int) (sizeof (float))) < 0)
      {
!       long int i = longval ();
!       if (i != ((long int) (sizeof (float))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long int i = ulongval ();
!       if (i != ((long int) (sizeof (float))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
***************
*** 35220,35242 ****
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
! fi
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_float=0
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5
! echo "${ECHO_T}$ac_cv_sizeof_float" >&6
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_FLOAT $ac_cv_sizeof_float
  _ACEOF
  
  
! 	echo "$as_me:$LINENO: checking for uniquely sized float" >&5
! echo $ECHO_N "checking for uniquely sized float... $ECHO_C" >&6
  if test "${ccvs_cv_unique_float_type_float+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 35977,35998 ----
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_float=0
  fi
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sizeof_float" >&5
! echo "${ECHO_T}$ac_cv_sizeof_float" >&6; }
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_FLOAT $ac_cv_sizeof_float
  _ACEOF
  
  
! 	{ echo "$as_me:$LINENO: checking for uniquely sized float" >&5
! echo $ECHO_N "checking for uniquely sized float... $ECHO_C" >&6; }
  if test "${ccvs_cv_unique_float_type_float+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 35247,35254 ****
  			ccvs_cv_unique_float_type_float=yes\($ac_cv_sizeof_float\)
  		fi
  fi
! echo "$as_me:$LINENO: result: $ccvs_cv_unique_float_type_float" >&5
! echo "${ECHO_T}$ccvs_cv_unique_float_type_float" >&6
  	if test $ccvs_cv_unique_float_type_float != no ; then
  
  cat >>confdefs.h <<\_ACEOF
--- 36003,36010 ----
  			ccvs_cv_unique_float_type_float=yes\($ac_cv_sizeof_float\)
  		fi
  fi
! { echo "$as_me:$LINENO: result: $ccvs_cv_unique_float_type_float" >&5
! echo "${ECHO_T}$ccvs_cv_unique_float_type_float" >&6; }
  	if test $ccvs_cv_unique_float_type_float != no ; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 35256,35263 ****
  _ACEOF
  
  	fi
! 	echo "$as_me:$LINENO: checking for double" >&5
! echo $ECHO_N "checking for double... $ECHO_C" >&6
  if test "${ac_cv_type_double+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 36012,36019 ----
  _ACEOF
  
  	fi
! 	{ echo "$as_me:$LINENO: checking for double" >&5
! echo $ECHO_N "checking for double... $ECHO_C" >&6; }
  if test "${ac_cv_type_double+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 35306,35325 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_double=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5
! echo "${ECHO_T}$ac_cv_type_double" >&6
  
! echo "$as_me:$LINENO: checking size of double" >&5
! echo $ECHO_N "checking size of double... $ECHO_C" >&6
  if test "${ac_cv_sizeof_double+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_double" = yes; then
!   # The cast to unsigned long works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
--- 36062,36082 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_double=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5
! echo "${ECHO_T}$ac_cv_type_double" >&6; }
  
! { echo "$as_me:$LINENO: checking size of double" >&5
! echo $ECHO_N "checking size of double... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_double+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_double" = yes; then
!   # The cast to long int works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
***************
*** 35335,35341 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (double))) >= 0)];
  test_array [0] = 0
  
    ;
--- 36092,36098 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (double))) >= 0)];
  test_array [0] = 0
  
    ;
***************
*** 35376,35382 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (double))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 36133,36139 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (double))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 35410,35429 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr $ac_mid + 1`
! 		    if test $ac_lo -le $ac_mid; then
! 		      ac_lo= ac_hi=
! 		      break
! 		    fi
! 		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 36167,36187 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr $ac_mid + 1`
! 			if test $ac_lo -le $ac_mid; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 35433,35439 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (double))) < 0)];
  test_array [0] = 0
  
    ;
--- 36191,36197 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (double))) < 0)];
  test_array [0] = 0
  
    ;
***************
*** 35474,35480 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (double))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 36232,36238 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (double))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 35508,35530 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_hi=`expr '(' $ac_mid ')' - 1`
! 		       if test $ac_mid -le $ac_hi; then
! 			 ac_lo= ac_hi=
! 			 break
! 		       fi
! 		       ac_mid=`expr 2 '*' $ac_mid`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo= ac_hi=
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
--- 36266,36291 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_hi=`expr '(' $ac_mid ')' - 1`
! 			if test $ac_mid -le $ac_hi; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo= ac_hi=
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
***************
*** 35539,35545 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (double))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 36300,36306 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (double))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 35573,35580 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
--- 36334,36342 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
***************
*** 35586,35598 ****
     { (exit 1); exit 1; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 36348,36353 ----
***************
*** 35600,35607 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! long longval () { return (long) (sizeof (double)); }
! unsigned long ulongval () { return (long) (sizeof (double)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
--- 36355,36362 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! static long int longval () { return (long int) (sizeof (double)); }
! static unsigned long int ulongval () { return (long int) (sizeof (double)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
***************
*** 35611,35627 ****
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long) (sizeof (double))) < 0)
      {
!       long i = longval ();
!       if (i != ((long) (sizeof (double))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long i = ulongval ();
!       if (i != ((long) (sizeof (double))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
--- 36366,36382 ----
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long int) (sizeof (double))) < 0)
      {
!       long int i = longval ();
!       if (i != ((long int) (sizeof (double))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long int i = ulongval ();
!       if (i != ((long int) (sizeof (double))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
***************
*** 35655,35677 ****
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
! fi
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_double=0
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
! echo "${ECHO_T}$ac_cv_sizeof_double" >&6
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_DOUBLE $ac_cv_sizeof_double
  _ACEOF
  
  
! 	echo "$as_me:$LINENO: checking for uniquely sized double" >&5
! echo $ECHO_N "checking for uniquely sized double... $ECHO_C" >&6
  if test "${ccvs_cv_unique_float_type_double+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 36410,36431 ----
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_double=0
  fi
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
! echo "${ECHO_T}$ac_cv_sizeof_double" >&6; }
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_DOUBLE $ac_cv_sizeof_double
  _ACEOF
  
  
! 	{ echo "$as_me:$LINENO: checking for uniquely sized double" >&5
! echo $ECHO_N "checking for uniquely sized double... $ECHO_C" >&6; }
  if test "${ccvs_cv_unique_float_type_double+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 35682,35689 ****
  			ccvs_cv_unique_float_type_double=yes\($ac_cv_sizeof_double\)
  		fi
  fi
! echo "$as_me:$LINENO: result: $ccvs_cv_unique_float_type_double" >&5
! echo "${ECHO_T}$ccvs_cv_unique_float_type_double" >&6
  	if test $ccvs_cv_unique_float_type_double != no ; then
  
  cat >>confdefs.h <<\_ACEOF
--- 36436,36443 ----
  			ccvs_cv_unique_float_type_double=yes\($ac_cv_sizeof_double\)
  		fi
  fi
! { echo "$as_me:$LINENO: result: $ccvs_cv_unique_float_type_double" >&5
! echo "${ECHO_T}$ccvs_cv_unique_float_type_double" >&6; }
  	if test $ccvs_cv_unique_float_type_double != no ; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 35692,35699 ****
  
  	fi
  	if test $gt_cv_c_long_double != no; then
! 		echo "$as_me:$LINENO: checking for long double" >&5
! echo $ECHO_N "checking for long double... $ECHO_C" >&6
  if test "${ac_cv_type_long_double+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 36446,36453 ----
  
  	fi
  	if test $gt_cv_c_long_double != no; then
! 		{ echo "$as_me:$LINENO: checking for long double" >&5
! echo $ECHO_N "checking for long double... $ECHO_C" >&6; }
  if test "${ac_cv_type_long_double+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 35742,35761 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_type_long_double=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_type_long_double" >&5
! echo "${ECHO_T}$ac_cv_type_long_double" >&6
  
! echo "$as_me:$LINENO: checking size of long double" >&5
! echo $ECHO_N "checking size of long double... $ECHO_C" >&6
  if test "${ac_cv_sizeof_long_double+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_long_double" = yes; then
!   # The cast to unsigned long works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
--- 36496,36516 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_type_long_double=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_type_long_double" >&5
! echo "${ECHO_T}$ac_cv_type_long_double" >&6; }
  
! { echo "$as_me:$LINENO: checking size of long double" >&5
! echo $ECHO_N "checking size of long double... $ECHO_C" >&6; }
  if test "${ac_cv_sizeof_long_double+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    if test "$ac_cv_type_long_double" = yes; then
!   # The cast to long int works around a bug in the HP C Compiler
    # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
    # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
    # This bug is HP SR number 8606223364.
***************
*** 35771,35777 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (long double))) >= 0)];
  test_array [0] = 0
  
    ;
--- 36526,36532 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (long double))) >= 0)];
  test_array [0] = 0
  
    ;
***************
*** 35812,35818 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (long double))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 36567,36573 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (long double))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 35846,35865 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr $ac_mid + 1`
! 		    if test $ac_lo -le $ac_mid; then
! 		      ac_lo= ac_hi=
! 		      break
! 		    fi
! 		    ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
--- 36601,36621 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr $ac_mid + 1`
! 			if test $ac_lo -le $ac_mid; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
***************
*** 35869,35875 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (long double))) < 0)];
  test_array [0] = 0
  
    ;
--- 36625,36631 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (long double))) < 0)];
  test_array [0] = 0
  
    ;
***************
*** 35910,35916 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (long double))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 36666,36672 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (long double))) >= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 35944,35966 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_hi=`expr '(' $ac_mid ')' - 1`
! 		       if test $ac_mid -le $ac_hi; then
! 			 ac_lo= ac_hi=
! 			 break
! 		       fi
! 		       ac_mid=`expr 2 '*' $ac_mid`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo= ac_hi=
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
--- 36700,36725 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_hi=`expr '(' $ac_mid ')' - 1`
! 			if test $ac_mid -le $ac_hi; then
! 			  ac_lo= ac_hi=
! 			  break
! 			fi
! 			ac_mid=`expr 2 '*' $ac_mid`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo= ac_hi=
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
***************
*** 35975,35981 ****
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long) (sizeof (long double))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
--- 36734,36740 ----
  int
  main ()
  {
! static int test_array [1 - 2 * !(((long int) (sizeof (long double))) <= $ac_mid)];
  test_array [0] = 0
  
    ;
***************
*** 36009,36016 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
--- 36768,36776 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
***************
*** 36022,36034 ****
     { (exit 1); exit 1; }; } ;;
  esac
  else
-   if test "$cross_compiling" = yes; then
-   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
-    { (exit 1); exit 1; }; }
- else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 36782,36787 ----
***************
*** 36036,36043 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! long longval () { return (long) (sizeof (long double)); }
! unsigned long ulongval () { return (long) (sizeof (long double)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
--- 36789,36796 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
! static long int longval () { return (long int) (sizeof (long double)); }
! static unsigned long int ulongval () { return (long int) (sizeof (long double)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
***************
*** 36047,36063 ****
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long) (sizeof (long double))) < 0)
      {
!       long i = longval ();
!       if (i != ((long) (sizeof (long double))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long i = ulongval ();
!       if (i != ((long) (sizeof (long double))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
--- 36800,36816 ----
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      exit (1);
!   if (((long int) (sizeof (long double))) < 0)
      {
!       long int i = longval ();
!       if (i != ((long int) (sizeof (long double))))
  	exit (1);
        fprintf (f, "%ld\n", i);
      }
    else
      {
!       unsigned long int i = ulongval ();
!       if (i != ((long int) (sizeof (long double))))
  	exit (1);
        fprintf (f, "%lu\n", i);
      }
***************
*** 36091,36113 ****
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
! fi
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_long_double=0
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_double" >&5
! echo "${ECHO_T}$ac_cv_sizeof_long_double" >&6
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_LONG_DOUBLE $ac_cv_sizeof_long_double
  _ACEOF
  
  
! 		echo "$as_me:$LINENO: checking for uniquely sized long double" >&5
! echo $ECHO_N "checking for uniquely sized long double... $ECHO_C" >&6
  if test "${ccvs_cv_unique_float_type_long_double+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 36844,36865 ----
  See \`config.log' for more details." >&2;}
     { (exit 1); exit 1; }; }
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
  else
    ac_cv_sizeof_long_double=0
  fi
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_double" >&5
! echo "${ECHO_T}$ac_cv_sizeof_long_double" >&6; }
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_LONG_DOUBLE $ac_cv_sizeof_long_double
  _ACEOF
  
  
! 		{ echo "$as_me:$LINENO: checking for uniquely sized long double" >&5
! echo $ECHO_N "checking for uniquely sized long double... $ECHO_C" >&6; }
  if test "${ccvs_cv_unique_float_type_long_double+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 36118,36125 ****
  				ccvs_cv_unique_float_type_long_double=yes\($ac_cv_sizeof_long_double\)
  			fi
  fi
! echo "$as_me:$LINENO: result: $ccvs_cv_unique_float_type_long_double" >&5
! echo "${ECHO_T}$ccvs_cv_unique_float_type_long_double" >&6
  		if test $ccvs_cv_unique_float_type_long_double != no ; then
  
  cat >>confdefs.h <<\_ACEOF
--- 36870,36877 ----
  				ccvs_cv_unique_float_type_long_double=yes\($ac_cv_sizeof_long_double\)
  			fi
  fi
! { echo "$as_me:$LINENO: result: $ccvs_cv_unique_float_type_long_double" >&5
! echo "${ECHO_T}$ccvs_cv_unique_float_type_long_double" >&6; }
  		if test $ccvs_cv_unique_float_type_long_double != no ; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 36152,36173 ****
  _ACEOF
  
  
! 
! for ac_header in unistd.h vfork.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 36904,36925 ----
  _ACEOF
  
  
! for ac_header in vfork.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 36204,36218 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 36956,36971 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 36246,36254 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 36999,37008 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 36282,36296 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 37036,37051 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 36307,36315 ****
  for ac_func in fork vfork
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 37062,37070 ----
  for ac_func in fork vfork
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 36335,36364 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 37090,37113 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 36390,36402 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 37139,37153 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 36406,36413 ****
  done
  
  if test "x$ac_cv_func_fork" = xyes; then
!   echo "$as_me:$LINENO: checking for working fork" >&5
! echo $ECHO_N "checking for working fork... $ECHO_C" >&6
  if test "${ac_cv_func_fork_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 37157,37164 ----
  done
  
  if test "x$ac_cv_func_fork" = xyes; then
!   { echo "$as_me:$LINENO: checking for working fork" >&5
! echo $ECHO_N "checking for working fork... $ECHO_C" >&6; }
  if test "${ac_cv_func_fork_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 36415,36432 ****
    ac_cv_func_fork_works=cross
  else
    cat >conftest.$ac_ext <<_ACEOF
! /* By Ruediger Kuhlmann. */
!       #include <sys/types.h>
!       #if HAVE_UNISTD_H
!       # include <unistd.h>
!       #endif
!       /* Some systems only have a dummy stub for fork() */
!       int main ()
!       {
! 	if (fork() < 0)
! 	  exit (1);
! 	exit (0);
!       }
  _ACEOF
  rm -f conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--- 37166,37189 ----
    ac_cv_func_fork_works=cross
  else
    cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! $ac_includes_default
! int
! main ()
! {
! 
! 	  /* By Ruediger Kuhlmann. */
! 	  if (fork() < 0)
! 	    exit (1);
! 	  exit (0);
! 
!   ;
!   return 0;
! }
  _ACEOF
  rm -f conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
***************
*** 36448,36458 ****
  ( exit $ac_status )
  ac_cv_func_fork_works=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5
! echo "${ECHO_T}$ac_cv_func_fork_works" >&6
  
  else
    ac_cv_func_fork_works=$ac_cv_func_fork
--- 37205,37217 ----
  ( exit $ac_status )
  ac_cv_func_fork_works=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5
! echo "${ECHO_T}$ac_cv_func_fork_works" >&6; }
  
  else
    ac_cv_func_fork_works=$ac_cv_func_fork
***************
*** 36472,36479 ****
  fi
  ac_cv_func_vfork_works=$ac_cv_func_vfork
  if test "x$ac_cv_func_vfork" = xyes; then
!   echo "$as_me:$LINENO: checking for working vfork" >&5
! echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
  if test "${ac_cv_func_vfork_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 37231,37238 ----
  fi
  ac_cv_func_vfork_works=$ac_cv_func_vfork
  if test "x$ac_cv_func_vfork" = xyes; then
!   { echo "$as_me:$LINENO: checking for working vfork" >&5
! echo $ECHO_N "checking for working vfork... $ECHO_C" >&6; }
  if test "${ac_cv_func_vfork_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 36487,36500 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* Thanks to Paul Eggert for this test.  */
! #include <stdio.h>
! #include <stdlib.h>
! #include <sys/types.h>
! #include <sys/stat.h>
  #include <sys/wait.h>
- #if HAVE_UNISTD_H
- # include <unistd.h>
- #endif
  #if HAVE_VFORK_H
  # include <vfork.h>
  #endif
--- 37246,37253 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  /* Thanks to Paul Eggert for this test.  */
! $ac_includes_default
  #include <sys/wait.h>
  #if HAVE_VFORK_H
  # include <vfork.h>
  #endif
***************
*** 36602,36612 ****
  ( exit $ac_status )
  ac_cv_func_vfork_works=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5
! echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
  
  fi;
  if test "x$ac_cv_func_fork_works" = xcross; then
--- 37355,37367 ----
  ( exit $ac_status )
  ac_cv_func_vfork_works=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5
! echo "${ECHO_T}$ac_cv_func_vfork_works" >&6; }
  
  fi;
  if test "x$ac_cv_func_fork_works" = xcross; then
***************
*** 36636,36643 ****
  
  fi
  
! echo "$as_me:$LINENO: checking whether closedir returns void" >&5
! echo $ECHO_N "checking whether closedir returns void... $ECHO_C" >&6
  if test "${ac_cv_func_closedir_void+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 37391,37398 ----
  
  fi
  
! { echo "$as_me:$LINENO: checking whether closedir returns void" >&5
! echo $ECHO_N "checking whether closedir returns void... $ECHO_C" >&6; }
  if test "${ac_cv_func_closedir_void+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 36684,36694 ****
  ( exit $ac_status )
  ac_cv_func_closedir_void=yes
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  fi
! echo "$as_me:$LINENO: result: $ac_cv_func_closedir_void" >&5
! echo "${ECHO_T}$ac_cv_func_closedir_void" >&6
  if test $ac_cv_func_closedir_void = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 37439,37451 ----
  ( exit $ac_status )
  ac_cv_func_closedir_void=yes
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_func_closedir_void" >&5
! echo "${ECHO_T}$ac_cv_func_closedir_void" >&6; }
  if test $ac_cv_func_closedir_void = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 36698,36710 ****
  fi
  
  
! echo "$as_me:$LINENO: checking for library containing getspnam" >&5
! echo $ECHO_N "checking for library containing getspnam... $ECHO_C" >&6
  if test "${ac_cv_search_getspnam+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
- ac_cv_search_getspnam=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 37455,37466 ----
  fi
  
  
! { echo "$as_me:$LINENO: checking for library containing getspnam" >&5
! echo $ECHO_N "checking for library containing getspnam... $ECHO_C" >&6; }
  if test "${ac_cv_search_getspnam+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 36712,36788 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char getspnam ();
  int
  main ()
  {
! getspnam ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
!   (eval $ac_link) 2>conftest.er1
!   ac_status=$?
!   grep -v '^ *+' conftest.er1 >conftest.err
!   rm -f conftest.er1
!   cat conftest.err >&5
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"
! 			 || test ! -s conftest.err'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; } &&
! 	 { ac_try='test -s conftest$ac_exeext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
!   ac_cv_search_getspnam="none required"
! else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! fi
! rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
! if test "$ac_cv_search_getspnam" = no; then
!   for ac_lib in sec gen; do
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!     cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! 
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char getspnam ();
! int
! main ()
! {
! getspnam ();
!   ;
!   return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 37468,37496 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char getspnam ();
  int
  main ()
  {
! return getspnam ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' sec gen; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 36804,36826 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_getspnam="-l$ac_lib"
! break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_getspnam" >&5
! echo "${ECHO_T}$ac_cv_search_getspnam" >&6
! if test "$ac_cv_search_getspnam" != no; then
!   test "$ac_cv_search_getspnam" = "none required" || LIBS="$ac_cv_search_getspnam $LIBS"
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_GETSPNAM 1
--- 37512,37544 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_getspnam=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_getspnam+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search_getspnam+set}" = set; then
!   :
! else
!   ac_cv_search_getspnam=no
  fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_getspnam" >&5
! echo "${ECHO_T}$ac_cv_search_getspnam" >&6; }
! ac_res=$ac_cv_search_getspnam
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_GETSPNAM 1
***************
*** 36829,36836 ****
  fi
  
  
! echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5
! echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6
  if test "${ac_cv_func_utime_null+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 37547,37554 ----
  fi
  
  
! { echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5
! echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6; }
  if test "${ac_cv_func_utime_null+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 36851,36857 ****
  {
  struct stat s, t;
    exit (!(stat ("conftest.data", &s) == 0
! 	  && utime ("conftest.data", (long *)0) == 0
  	  && stat ("conftest.data", &t) == 0
  	  && t.st_mtime >= s.st_mtime
  	  && t.st_mtime - s.st_mtime < 120));
--- 37569,37575 ----
  {
  struct stat s, t;
    exit (!(stat ("conftest.data", &s) == 0
! 	  && utime ("conftest.data", 0) == 0
  	  && stat ("conftest.data", &t) == 0
  	  && t.st_mtime >= s.st_mtime
  	  && t.st_mtime - s.st_mtime < 120));
***************
*** 36879,36890 ****
  ( exit $ac_status )
  ac_cv_func_utime_null=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
! rm -f core *.core
  fi
! echo "$as_me:$LINENO: result: $ac_cv_func_utime_null" >&5
! echo "${ECHO_T}$ac_cv_func_utime_null" >&6
  if test $ac_cv_func_utime_null = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 37597,37609 ----
  ( exit $ac_status )
  ac_cv_func_utime_null=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
! 
! 
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_func_utime_null" >&5
! echo "${ECHO_T}$ac_cv_func_utime_null" >&6; }
  if test $ac_cv_func_utime_null = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 36894,36901 ****
  fi
  rm -f conftest.data
  
! echo "$as_me:$LINENO: checking for long file names" >&5
! echo $ECHO_N "checking for long file names... $ECHO_C" >&6
  if test "${ac_cv_sys_long_file_names+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 37613,37620 ----
  fi
  rm -f conftest.data
  
! { echo "$as_me:$LINENO: checking for long file names" >&5
! echo $ECHO_N "checking for long file names... $ECHO_C" >&6; }
  if test "${ac_cv_sys_long_file_names+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 36922,36940 ****
    (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue
    ac_tf1=$ac_xdir/conftest9012345
    ac_tf2=$ac_xdir/conftest9012346
!   (echo 1 >$ac_tf1) 2>/dev/null
!   (echo 2 >$ac_tf2) 2>/dev/null
!   ac_val=`cat $ac_tf1 2>/dev/null`
!   if test ! -f $ac_tf1 || test "$ac_val" != 1; then
      ac_cv_sys_long_file_names=no
!     rm -rf $ac_xdir 2>/dev/null
!     break
!   fi
!   rm -rf $ac_xdir 2>/dev/null
  done
  fi
! echo "$as_me:$LINENO: result: $ac_cv_sys_long_file_names" >&5
! echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
  if test $ac_cv_sys_long_file_names = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 37641,37654 ----
    (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue
    ac_tf1=$ac_xdir/conftest9012345
    ac_tf2=$ac_xdir/conftest9012346
!   touch $ac_tf1 2>/dev/null && test -f $ac_tf1 && test ! -f $ac_tf2 ||
      ac_cv_sys_long_file_names=no
!   rm -f -r $ac_xdir 2>/dev/null
!   test $ac_cv_sys_long_file_names = no && break
  done
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_sys_long_file_names" >&5
! echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6; }
  if test $ac_cv_sys_long_file_names = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 36944,36951 ****
  fi
  
  
! echo "$as_me:$LINENO: checking whether printf supports %p" >&5
! echo $ECHO_N "checking whether printf supports %p... $ECHO_C" >&6
  if test "${cvs_cv_func_printf_ptr+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 37658,37665 ----
  fi
  
  
! { echo "$as_me:$LINENO: checking whether printf supports %p" >&5
! echo $ECHO_N "checking whether printf supports %p... $ECHO_C" >&6; }
  if test "${cvs_cv_func_printf_ptr+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 36994,37005 ****
  ( exit $ac_status )
  cvs_cv_func_printf_ptr=no
  fi
! rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f core core.* *.core
  fi
! echo "$as_me:$LINENO: result: $cvs_cv_func_printf_ptr" >&5
! echo "${ECHO_T}$cvs_cv_func_printf_ptr" >&6
  if test $cvs_cv_func_printf_ptr = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 37708,37721 ----
  ( exit $ac_status )
  cvs_cv_func_printf_ptr=no
  fi
! rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+ 
+ 
  rm -f core core.* *.core
  fi
! { echo "$as_me:$LINENO: result: $cvs_cv_func_printf_ptr" >&5
! echo "${ECHO_T}$cvs_cv_func_printf_ptr" >&6; }
  if test $cvs_cv_func_printf_ptr = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 37011,37018 ****
  
  # Try to find connect and gethostbyname.
  
! echo "$as_me:$LINENO: checking for main in -lnsl" >&5
! echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6
  if test "${ac_cv_lib_nsl_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 37727,37734 ----
  
  # Try to find connect and gethostbyname.
  
! { echo "$as_me:$LINENO: checking for main in -lnsl" >&5
! echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6; }
  if test "${ac_cv_lib_nsl_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 37029,37035 ****
  int
  main ()
  {
! main ();
    ;
    return 0;
  }
--- 37745,37751 ----
  int
  main ()
  {
! return main ();
    ;
    return 0;
  }
***************
*** 37061,37074 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_lib_nsl_main=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5
! echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6
  if test $ac_cv_lib_nsl_main = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNSL 1
--- 37777,37791 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_lib_nsl_main=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5
! echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6; }
  if test $ac_cv_lib_nsl_main = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBNSL 1
***************
*** 37078,37090 ****
  
  fi
  
! echo "$as_me:$LINENO: checking for library containing connect" >&5
! echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6
  if test "${ac_cv_search_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
- ac_cv_search_connect=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 37795,37806 ----
  
  fi
  
! { echo "$as_me:$LINENO: checking for library containing connect" >&5
! echo $ECHO_N "checking for library containing connect... $ECHO_C" >&6; }
  if test "${ac_cv_search_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 37092,37168 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
- char connect ();
- int
- main ()
- {
- connect ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
- 	 { ac_try='test -z "$ac_c_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_search_connect="none required"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_connect" = no; then
-   for ac_lib in xnet socket inet; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char connect ();
  int
  main ()
  {
! connect ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 37808,37836 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
     builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char connect ();
  int
  main ()
  {
! return connect ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' xnet socket inet; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 37184,37206 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_connect="-l$ac_lib"
! break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5
! echo "${ECHO_T}$ac_cv_search_connect" >&6
! if test "$ac_cv_search_connect" != no; then
!   test "$ac_cv_search_connect" = "none required" || LIBS="$ac_cv_search_connect $LIBS"
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_CONNECT 1
--- 37852,37884 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_connect=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_connect+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search_connect+set}" = set; then
!   :
! else
!   ac_cv_search_connect=no
  fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_connect" >&5
! echo "${ECHO_T}$ac_cv_search_connect" >&6; }
! ac_res=$ac_cv_search_connect
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_CONNECT 1
***************
*** 37208,37220 ****
  
  fi
  
! echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
! echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6
  if test "${ac_cv_search_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
- ac_cv_search_gethostbyname=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 37886,37897 ----
  
  fi
  
! { echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5
! echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6; }
  if test "${ac_cv_search_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 37222,37298 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
- char gethostbyname ();
- int
- main ()
- {
- gethostbyname ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
- 	 { ac_try='test -z "$ac_c_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_search_gethostbyname="none required"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_gethostbyname" = no; then
-   for ac_lib in netinet; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char gethostbyname ();
  int
  main ()
  {
! gethostbyname ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 37899,37927 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
     builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char gethostbyname ();
  int
  main ()
  {
! return gethostbyname ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' netinet; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 37314,37336 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_gethostbyname="-l$ac_lib"
! break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
! echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6
! if test "$ac_cv_search_gethostbyname" != no; then
!   test "$ac_cv_search_gethostbyname" = "none required" || LIBS="$ac_cv_search_gethostbyname $LIBS"
  
  fi
  
--- 37943,37975 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_gethostbyname=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_gethostbyname+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search_gethostbyname+set}" = set; then
!   :
! else
!   ac_cv_search_gethostbyname=no
  fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
! echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6; }
! ac_res=$ac_cv_search_gethostbyname
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
  
***************
*** 37342,37360 ****
  KRB4=/usr/kerberos
  
  
! # Check whether --with-krb4 or --without-krb4 was given.
  if test "${with_krb4+set}" = set; then
!   withval="$with_krb4"
!   KRB4=$with_krb4
! fi; echo "$as_me:$LINENO: checking for KRB4 in $KRB4" >&5
! echo $ECHO_N "checking for KRB4 in $KRB4... $ECHO_C" >&6
! echo "$as_me:$LINENO: result: " >&5
! echo "${ECHO_T}" >&6
  
  
  krb_h=
! echo "$as_me:$LINENO: checking for krb.h" >&5
! echo $ECHO_N "checking for krb.h... $ECHO_C" >&6
  if test "$cross_compiling" != yes && test -r $KRB4/include/krb.h; then
     hold_cflags=$CFLAGS
     CFLAGS="$CFLAGS -I$KRB4/include"
--- 37981,37999 ----
  KRB4=/usr/kerberos
  
  
! # Check whether --with-krb4 was given.
  if test "${with_krb4+set}" = set; then
!   withval=$with_krb4; KRB4=$with_krb4
! fi
! { echo "$as_me:$LINENO: checking for KRB4 in $KRB4" >&5
! echo $ECHO_N "checking for KRB4 in $KRB4... $ECHO_C" >&6; }
! { echo "$as_me:$LINENO: result: " >&5
! echo "${ECHO_T}" >&6; }
  
  
  krb_h=
! { echo "$as_me:$LINENO: checking for krb.h" >&5
! echo $ECHO_N "checking for krb.h... $ECHO_C" >&6; }
  if test "$cross_compiling" != yes && test -r $KRB4/include/krb.h; then
     hold_cflags=$CFLAGS
     CFLAGS="$CFLAGS -I$KRB4/include"
***************
*** 37400,37406 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! CFLAGS=$hold_cflags
             cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 38039,38045 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	CFLAGS=$hold_cflags
             cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 37443,37452 ****
--- 38082,38094 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
     CFLAGS=$hold_cflags
***************
*** 37493,37499 ****
--- 38135,38143 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
***************
*** 37540,37546 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! if test "$cross_compiling" != yes && test -r $KRB4/include/kerberosIV/krb.h; then
         hold_cflags=$CFLAGS
         CFLAGS="$CFLAGS -I$KRB4/include/kerberosIV"
         cat >conftest.$ac_ext <<_ACEOF
--- 38184,38190 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	if test "$cross_compiling" != yes && test -r $KRB4/include/kerberosIV/krb.h; then
         hold_cflags=$CFLAGS
         CFLAGS="$CFLAGS -I$KRB4/include/kerberosIV"
         cat >conftest.$ac_ext <<_ACEOF
***************
*** 37585,37609 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
         CFLAGS=$hold_cflags
       fi
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $krb_h" >&5
! echo "${ECHO_T}$krb_h" >&6
  
  if test -n "$krb_h"; then
    krb_lib=
    if test "$cross_compiling" != yes && test -r $KRB4/lib/libkrb.a; then
         hold_ldflags=$LDFLAGS
         LDFLAGS="-L${KRB4}/lib $LDFLAGS"
!        echo "$as_me:$LINENO: checking for printf in -lkrb" >&5
! echo $ECHO_N "checking for printf in -lkrb... $ECHO_C" >&6
  if test "${ac_cv_lib_krb_printf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 38229,38256 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
         CFLAGS=$hold_cflags
       fi
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $krb_h" >&5
! echo "${ECHO_T}$krb_h" >&6; }
  
  if test -n "$krb_h"; then
    krb_lib=
    if test "$cross_compiling" != yes && test -r $KRB4/lib/libkrb.a; then
         hold_ldflags=$LDFLAGS
         LDFLAGS="-L${KRB4}/lib $LDFLAGS"
!        { echo "$as_me:$LINENO: checking for printf in -lkrb" >&5
! echo $ECHO_N "checking for printf in -lkrb... $ECHO_C" >&6; }
  if test "${ac_cv_lib_krb_printf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 37616,37632 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char printf ();
  int
  main ()
  {
! printf ();
    ;
    return 0;
  }
--- 38263,38279 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char printf ();
  int
  main ()
  {
! return printf ();
    ;
    return 0;
  }
***************
*** 37658,37679 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_lib_krb_printf=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_krb_printf" >&5
! echo "${ECHO_T}$ac_cv_lib_krb_printf" >&6
  if test $ac_cv_lib_krb_printf = yes; then
    krb_lib=yes krb_libdir=${KRB4}/lib
  else
    LDFLAGS=$hold_ldflags
              # Using open here instead of printf so we don't
              # get confused by the cached value for printf from above.
!             echo "$as_me:$LINENO: checking for open in -lkrb" >&5
! echo $ECHO_N "checking for open in -lkrb... $ECHO_C" >&6
  if test "${ac_cv_lib_krb_open+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 38305,38327 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_lib_krb_printf=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_lib_krb_printf" >&5
! echo "${ECHO_T}$ac_cv_lib_krb_printf" >&6; }
  if test $ac_cv_lib_krb_printf = yes; then
    krb_lib=yes krb_libdir=${KRB4}/lib
  else
    LDFLAGS=$hold_ldflags
              # Using open here instead of printf so we don't
              # get confused by the cached value for printf from above.
!             { echo "$as_me:$LINENO: checking for open in -lkrb" >&5
! echo $ECHO_N "checking for open in -lkrb... $ECHO_C" >&6; }
  if test "${ac_cv_lib_krb_open+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 37686,37702 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char open ();
  int
  main ()
  {
! open ();
    ;
    return 0;
  }
--- 38334,38350 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char open ();
  int
  main ()
  {
! return open ();
    ;
    return 0;
  }
***************
*** 37728,37741 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_lib_krb_open=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_krb_open" >&5
! echo "${ECHO_T}$ac_cv_lib_krb_open" >&6
  if test $ac_cv_lib_krb_open = yes; then
    krb_lib=yes krb_libdir=
  fi
--- 38376,38390 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_lib_krb_open=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_lib_krb_open" >&5
! echo "${ECHO_T}$ac_cv_lib_krb_open" >&6; }
  if test $ac_cv_lib_krb_open = yes; then
    krb_lib=yes krb_libdir=
  fi
***************
*** 37744,37751 ****
  
         LDFLAGS=$hold_ldflags
    else
!        echo "$as_me:$LINENO: checking for printf in -lkrb" >&5
! echo $ECHO_N "checking for printf in -lkrb... $ECHO_C" >&6
  if test "${ac_cv_lib_krb_printf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 38393,38400 ----
  
         LDFLAGS=$hold_ldflags
    else
!        { echo "$as_me:$LINENO: checking for printf in -lkrb" >&5
! echo $ECHO_N "checking for printf in -lkrb... $ECHO_C" >&6; }
  if test "${ac_cv_lib_krb_printf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 37758,37774 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char printf ();
  int
  main ()
  {
! printf ();
    ;
    return 0;
  }
--- 38407,38423 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char printf ();
  int
  main ()
  {
! return printf ();
    ;
    return 0;
  }
***************
*** 37800,37819 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_lib_krb_printf=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_krb_printf" >&5
! echo "${ECHO_T}$ac_cv_lib_krb_printf" >&6
  if test $ac_cv_lib_krb_printf = yes; then
    krb_lib=yes krb_libdir=
  fi
  
!        echo "$as_me:$LINENO: checking for krb_recvauth" >&5
! echo $ECHO_N "checking for krb_recvauth... $ECHO_C" >&6
  if test "${ac_cv_func_krb_recvauth+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 38449,38469 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_lib_krb_printf=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_lib_krb_printf" >&5
! echo "${ECHO_T}$ac_cv_lib_krb_printf" >&6; }
  if test $ac_cv_lib_krb_printf = yes; then
    krb_lib=yes krb_libdir=
  fi
  
!        { echo "$as_me:$LINENO: checking for krb_recvauth" >&5
! echo $ECHO_N "checking for krb_recvauth... $ECHO_C" >&6; }
  if test "${ac_cv_func_krb_recvauth+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 37840,37869 ****
  
  #undef krb_recvauth
  
! /* 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 krb_recvauth ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_krb_recvauth) || defined (__stub___krb_recvauth)
  choke me
- #else
- char (*f) () = krb_recvauth;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != krb_recvauth;
    ;
    return 0;
  }
--- 38490,38513 ----
  
  #undef krb_recvauth
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char krb_recvauth ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_krb_recvauth) || defined (__stub___krb_recvauth)
  choke me
  #endif
  
  int
  main ()
  {
! return krb_recvauth ();
    ;
    return 0;
  }
***************
*** 37895,37907 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_func_krb_recvauth=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ac_cv_func_krb_recvauth" >&5
! echo "${ECHO_T}$ac_cv_func_krb_recvauth" >&6
  if test $ac_cv_func_krb_recvauth = yes; then
    krb_lib=yes krb_libdir=
  fi
--- 38539,38552 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_func_krb_recvauth=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_func_krb_recvauth" >&5
! echo "${ECHO_T}$ac_cv_func_krb_recvauth" >&6; }
  if test $ac_cv_func_krb_recvauth = yes; then
    krb_lib=yes krb_libdir=
  fi
***************
*** 37920,37927 ****
      # the user's setting for LDFLAGS
      hold_ldflags=$LDFLAGS
      test -n "${krb_libdir}" && LDFLAGS="$LDFLAGS -L${krb_libdir}"
!     echo "$as_me:$LINENO: checking for printf in -ldes" >&5
! echo $ECHO_N "checking for printf in -ldes... $ECHO_C" >&6
  if test "${ac_cv_lib_des_printf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 38565,38572 ----
      # the user's setting for LDFLAGS
      hold_ldflags=$LDFLAGS
      test -n "${krb_libdir}" && LDFLAGS="$LDFLAGS -L${krb_libdir}"
!     { echo "$as_me:$LINENO: checking for printf in -ldes" >&5
! echo $ECHO_N "checking for printf in -ldes... $ECHO_C" >&6; }
  if test "${ac_cv_lib_des_printf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 37934,37950 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char printf ();
  int
  main ()
  {
! printf ();
    ;
    return 0;
  }
--- 38579,38595 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char printf ();
  int
  main ()
  {
! return printf ();
    ;
    return 0;
  }
***************
*** 37976,37996 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_lib_des_printf=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_des_printf" >&5
! echo "${ECHO_T}$ac_cv_lib_des_printf" >&6
  if test $ac_cv_lib_des_printf = yes; then
    LIBS="${LIBS} -ldes"
  fi
  
  
! echo "$as_me:$LINENO: checking for krb_recvauth in -lkrb" >&5
! echo $ECHO_N "checking for krb_recvauth in -lkrb... $ECHO_C" >&6
  if test "${ac_cv_lib_krb_krb_recvauth+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 38621,38642 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_lib_des_printf=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_lib_des_printf" >&5
! echo "${ECHO_T}$ac_cv_lib_des_printf" >&6; }
  if test $ac_cv_lib_des_printf = yes; then
    LIBS="${LIBS} -ldes"
  fi
  
  
! { echo "$as_me:$LINENO: checking for krb_recvauth in -lkrb" >&5
! echo $ECHO_N "checking for krb_recvauth in -lkrb... $ECHO_C" >&6; }
  if test "${ac_cv_lib_krb_krb_recvauth+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 38003,38019 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char krb_recvauth ();
  int
  main ()
  {
! krb_recvauth ();
    ;
    return 0;
  }
--- 38649,38665 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char krb_recvauth ();
  int
  main ()
  {
! return krb_recvauth ();
    ;
    return 0;
  }
***************
*** 38045,38058 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_lib_krb_krb_recvauth=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_krb_krb_recvauth" >&5
! echo "${ECHO_T}$ac_cv_lib_krb_krb_recvauth" >&6
  if test $ac_cv_lib_krb_krb_recvauth = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBKRB 1
--- 38691,38705 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_lib_krb_krb_recvauth=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_lib_krb_krb_recvauth" >&5
! echo "${ECHO_T}$ac_cv_lib_krb_krb_recvauth" >&6; }
  if test $ac_cv_lib_krb_krb_recvauth = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBKRB 1
***************
*** 38063,38070 ****
  fi
  
  
! echo "$as_me:$LINENO: checking for krb_recvauth in -lkrb4" >&5
! echo $ECHO_N "checking for krb_recvauth in -lkrb4... $ECHO_C" >&6
  if test "${ac_cv_lib_krb4_krb_recvauth+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 38710,38717 ----
  fi
  
  
! { echo "$as_me:$LINENO: checking for krb_recvauth in -lkrb4" >&5
! echo $ECHO_N "checking for krb_recvauth in -lkrb4... $ECHO_C" >&6; }
  if test "${ac_cv_lib_krb4_krb_recvauth+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 38077,38093 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char krb_recvauth ();
  int
  main ()
  {
! krb_recvauth ();
    ;
    return 0;
  }
--- 38724,38740 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char krb_recvauth ();
  int
  main ()
  {
! return krb_recvauth ();
    ;
    return 0;
  }
***************
*** 38119,38132 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_lib_krb4_krb_recvauth=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_krb4_krb_recvauth" >&5
! echo "${ECHO_T}$ac_cv_lib_krb4_krb_recvauth" >&6
  if test $ac_cv_lib_krb4_krb_recvauth = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBKRB4 1
--- 38766,38780 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_lib_krb4_krb_recvauth=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_lib_krb4_krb_recvauth" >&5
! echo "${ECHO_T}$ac_cv_lib_krb4_krb_recvauth" >&6; }
  if test $ac_cv_lib_krb4_krb_recvauth = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBKRB4 1
***************
*** 38146,38154 ****
  for ac_func in krb_get_err_text
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
! if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
--- 38794,38802 ----
  for ac_func in krb_get_err_text
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
! { echo "$as_me:$LINENO: checking for $ac_func" >&5
! echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
! if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
***************
*** 38174,38203 ****
  
  #undef $ac_func
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
- {
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
- #else
- char (*f) () = $ac_func;
- #endif
- #ifdef __cplusplus
- }
  #endif
  
  int
  main ()
  {
! return f != $ac_func;
    ;
    return 0;
  }
--- 38822,38845 ----
  
  #undef $ac_func
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char $ac_func ();
  /* The GNU C library defines this for functions which it implements
      to always fail with ENOSYS.  Some functions are actually named
      something starting with __ and the normal name is an alias.  */
  #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
  choke me
  #endif
  
  int
  main ()
  {
! return $ac_func ();
    ;
    return 0;
  }
***************
*** 38229,38241 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! eval "$as_ac_var=no"
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
--- 38871,38885 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	eval "$as_ac_var=no"
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
! ac_res=`eval echo '${'$as_ac_var'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
***************
*** 38255,38267 ****
  # Search for /SUNHEA/ and read the comments about this default below.
  #
  
! # Check whether --with-gssapi or --without-gssapi was given.
  if test "${with_gssapi+set}" = set; then
!   withval="$with_gssapi"
! 
  else
    with_gssapi=yes
! fi;
  #
  # Try to locate a GSSAPI installation if no location was specified, assuming
  # GSSAPI was enabled (the default).
--- 38899,38911 ----
  # Search for /SUNHEA/ and read the comments about this default below.
  #
  
! # Check whether --with-gssapi was given.
  if test "${with_gssapi+set}" = set; then
!   withval=$with_gssapi;
  else
    with_gssapi=yes
! fi
! 
  #
  # Try to locate a GSSAPI installation if no location was specified, assuming
  # GSSAPI was enabled (the default).
***************
*** 38270,38277 ****
    # Granted, this is a slightly ugly way to print this info, but the
    # AC_CHECK_HEADER used in the search for a GSSAPI installation makes using
    # AC_CACHE_CHECK worse
!   echo "$as_me:$LINENO: checking for GSSAPI" >&5
! echo $ECHO_N "checking for GSSAPI... $ECHO_C" >&6
  else :; fi
  if test "${acx_gssapi_cv_gssapi+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
--- 38914,38921 ----
    # Granted, this is a slightly ugly way to print this info, but the
    # AC_CHECK_HEADER used in the search for a GSSAPI installation makes using
    # AC_CACHE_CHECK worse
!   { echo "$as_me:$LINENO: checking for GSSAPI" >&5
! echo $ECHO_N "checking for GSSAPI... $ECHO_C" >&6; }
  else :; fi
  if test "${acx_gssapi_cv_gssapi+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
***************
*** 38296,38311 ****
        break
      fi
      if test x$acx_gssapi_cv_gssapi = xyes; then
!       echo "$as_me:$LINENO: checking for GSSAPI" >&5
! echo $ECHO_N "checking for GSSAPI... $ECHO_C" >&6
!       echo "$as_me:$LINENO: result: " >&5
! echo "${ECHO_T}" >&6
      else
        CPPFLAGS="$acx_gssapi_save_CPPFLAGS -I$acx_gssapi_cv_gssapi/include"
!       echo "$as_me:$LINENO: checking for GSSAPI in $acx_gssapi_cv_gssapi" >&5
! echo $ECHO_N "checking for GSSAPI in $acx_gssapi_cv_gssapi... $ECHO_C" >&6
!       echo "$as_me:$LINENO: result: " >&5
! echo "${ECHO_T}" >&6
      fi
      unset ac_cv_header_gssapi_h
      unset ac_cv_header_gssapi_gssapi_h
--- 38940,38955 ----
        break
      fi
      if test x$acx_gssapi_cv_gssapi = xyes; then
!       { echo "$as_me:$LINENO: checking for GSSAPI" >&5
! echo $ECHO_N "checking for GSSAPI... $ECHO_C" >&6; }
!       { echo "$as_me:$LINENO: result: " >&5
! echo "${ECHO_T}" >&6; }
      else
        CPPFLAGS="$acx_gssapi_save_CPPFLAGS -I$acx_gssapi_cv_gssapi/include"
!       { echo "$as_me:$LINENO: checking for GSSAPI in $acx_gssapi_cv_gssapi" >&5
! echo $ECHO_N "checking for GSSAPI in $acx_gssapi_cv_gssapi... $ECHO_C" >&6; }
!       { echo "$as_me:$LINENO: result: " >&5
! echo "${ECHO_T}" >&6; }
      fi
      unset ac_cv_header_gssapi_h
      unset ac_cv_header_gssapi_gssapi_h
***************
*** 38316,38333 ****
  for ac_header in gssapi.h gssapi/gssapi.h krb5.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 38960,38978 ----
  for ac_header in gssapi.h gssapi/gssapi.h krb5.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 38364,38378 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 39009,39024 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 38406,38414 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 39052,39061 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 38442,38456 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 39089,39104 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 38472,38483 ****
  else
    acx_gssapi_cv_gssapi=$with_gssapi
  fi
! echo "$as_me:$LINENO: checking for GSSAPI" >&5
! echo $ECHO_N "checking for GSSAPI... $ECHO_C" >&6
  
  fi
! echo "$as_me:$LINENO: result: $acx_gssapi_cv_gssapi" >&5
! echo "${ECHO_T}$acx_gssapi_cv_gssapi" >&6
  
  #
  # Set up GSSAPI includes for later use.  We don't bother to check for
--- 39120,39131 ----
  else
    acx_gssapi_cv_gssapi=$with_gssapi
  fi
! { echo "$as_me:$LINENO: checking for GSSAPI" >&5
! echo $ECHO_N "checking for GSSAPI... $ECHO_C" >&6; }
  
  fi
! { echo "$as_me:$LINENO: result: $acx_gssapi_cv_gssapi" >&5
! echo "${ECHO_T}$acx_gssapi_cv_gssapi" >&6; }
  
  #
  # Set up GSSAPI includes for later use.  We don't bother to check for
***************
*** 38513,38530 ****
  for ac_header in gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h krb5.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 39161,39179 ----
  for ac_header in gssapi.h gssapi/gssapi.h gssapi/gssapi_generic.h krb5.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 38561,38575 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 39210,39225 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 38603,38611 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 39253,39262 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 38639,38653 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 39290,39305 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 38660,38667 ****
  done
  
    # And look through them for GSS_C_NT_HOSTBASED_SERVICE or its alternatives
!   echo "$as_me:$LINENO: checking for GSS_C_NT_HOSTBASED_SERVICE" >&5
! echo $ECHO_N "checking for GSS_C_NT_HOSTBASED_SERVICE... $ECHO_C" >&6
  if test "${acx_gssapi_cv_gss_c_nt_hostbased_service+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 39312,39319 ----
  done
  
    # And look through them for GSS_C_NT_HOSTBASED_SERVICE or its alternatives
!   { echo "$as_me:$LINENO: checking for GSS_C_NT_HOSTBASED_SERVICE" >&5
! echo $ECHO_N "checking for GSS_C_NT_HOSTBASED_SERVICE... $ECHO_C" >&6; }
  if test "${acx_gssapi_cv_gss_c_nt_hostbased_service+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 38776,38783 ****
      else :; fi
  
  fi
! echo "$as_me:$LINENO: result: $acx_gssapi_cv_gss_c_nt_hostbased_service" >&5
! echo "${ECHO_T}$acx_gssapi_cv_gss_c_nt_hostbased_service" >&6
    if test $acx_gssapi_cv_gss_c_nt_hostbased_service != yes &&
       test $acx_gssapi_cv_gss_c_nt_hostbased_service != no; then
      # don't define for yes since that means it already means something and
--- 39428,39435 ----
      else :; fi
  
  fi
! { echo "$as_me:$LINENO: result: $acx_gssapi_cv_gss_c_nt_hostbased_service" >&5
! echo "${ECHO_T}$acx_gssapi_cv_gss_c_nt_hostbased_service" >&6; }
    if test $acx_gssapi_cv_gss_c_nt_hostbased_service != yes &&
       test $acx_gssapi_cv_gss_c_nt_hostbased_service != no; then
      # don't define for yes since that means it already means something and
***************
*** 38815,38827 ****
    # des			Heimdal K 0.3d, but Heimdal seems to be set up such
    #			that it could have been installed from elsewhere.
    #
!   echo "$as_me:$LINENO: checking for library containing des_set_odd_parity" >&5
! echo $ECHO_N "checking for library containing des_set_odd_parity... $ECHO_C" >&6
  if test "${ac_cv_search_des_set_odd_parity+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
- ac_cv_search_des_set_odd_parity=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 39467,39478 ----
    # des			Heimdal K 0.3d, but Heimdal seems to be set up such
    #			that it could have been installed from elsewhere.
    #
!   { echo "$as_me:$LINENO: checking for library containing des_set_odd_parity" >&5
! echo $ECHO_N "checking for library containing des_set_odd_parity... $ECHO_C" >&6; }
  if test "${ac_cv_search_des_set_odd_parity+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 38829,38850 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char des_set_odd_parity ();
  int
  main ()
  {
! des_set_odd_parity ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 39480,39508 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char des_set_odd_parity ();
  int
  main ()
  {
! return des_set_odd_parity ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' des; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 38866,38905 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_des_set_odd_parity="none required"
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
! if test "$ac_cv_search_des_set_odd_parity" = no; then
!   for ac_lib in des; do
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!     cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char des_set_odd_parity ();
  int
  main ()
  {
! des_set_odd_parity ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 39524,39601 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_des_set_odd_parity=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_des_set_odd_parity+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search_des_set_odd_parity+set}" = set; then
!   :
! else
!   ac_cv_search_des_set_odd_parity=no
! fi
! rm conftest.$ac_ext
! LIBS=$ac_func_search_save_LIBS
! fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_des_set_odd_parity" >&5
! echo "${ECHO_T}$ac_cv_search_des_set_odd_parity" >&6; }
! ac_res=$ac_cv_search_des_set_odd_parity
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
! 
! fi
! 
! 
!   #
!   # com_err		Heimdal K 0.3d
!   #
!   # com_err		MIT K5 v1.2.2-beta1
!   #
!   { echo "$as_me:$LINENO: checking for library containing com_err" >&5
! echo $ECHO_N "checking for library containing com_err... $ECHO_C" >&6; }
! if test "${ac_cv_search_com_err+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   ac_func_search_save_LIBS=$LIBS
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
! char com_err ();
  int
  main ()
  {
! return com_err ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' com_err; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 38921,38959 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_des_set_odd_parity="-l$ac_lib"
! break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_des_set_odd_parity" >&5
! echo "${ECHO_T}$ac_cv_search_des_set_odd_parity" >&6
! if test "$ac_cv_search_des_set_odd_parity" != no; then
!   test "$ac_cv_search_des_set_odd_parity" = "none required" || LIBS="$ac_cv_search_des_set_odd_parity $LIBS"
  
  fi
  
  
    #
!   # com_err		Heimdal K 0.3d
!   #
!   # com_err		MIT K5 v1.2.2-beta1
    #
!   echo "$as_me:$LINENO: checking for library containing com_err" >&5
! echo $ECHO_N "checking for library containing com_err... $ECHO_C" >&6
! if test "${ac_cv_search_com_err+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
- ac_cv_search_com_err=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 39617,39662 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_com_err=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_com_err+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search_com_err+set}" = set; then
!   :
! else
!   ac_cv_search_com_err=no
  fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_com_err" >&5
! echo "${ECHO_T}$ac_cv_search_com_err" >&6; }
! ac_res=$ac_cv_search_com_err
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
  
  
    #
!   # asn1		Heimdal K 0.3d		-lcom_err
    #
!   { echo "$as_me:$LINENO: checking for library containing initialize_asn1_error_table_r" >&5
! echo $ECHO_N "checking for library containing initialize_asn1_error_table_r... $ECHO_C" >&6; }
! if test "${ac_cv_search_initialize_asn1_error_table_r+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 38961,38982 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char com_err ();
  int
  main ()
  {
! com_err ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 39664,39692 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
! char initialize_asn1_error_table_r ();
  int
  main ()
  {
! return initialize_asn1_error_table_r ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' asn1; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 38998,39037 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_com_err="none required"
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
! if test "$ac_cv_search_com_err" = no; then
!   for ac_lib in com_err; do
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!     cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char com_err ();
  int
  main ()
  {
! com_err ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 39708,39786 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_initialize_asn1_error_table_r=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_initialize_asn1_error_table_r+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search_initialize_asn1_error_table_r+set}" = set; then
!   :
! else
!   ac_cv_search_initialize_asn1_error_table_r=no
! fi
! rm conftest.$ac_ext
! LIBS=$ac_func_search_save_LIBS
! fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_initialize_asn1_error_table_r" >&5
! echo "${ECHO_T}$ac_cv_search_initialize_asn1_error_table_r" >&6; }
! ac_res=$ac_cv_search_initialize_asn1_error_table_r
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
! 
! fi
! 
! 
!   #
!   # resolv		required, but not installed by Heimdal K 0.3d
!   #
!   # resolv		MIT K5 1.2.2-beta1
!   # 			Linux 2.2.17
!   #
!   { echo "$as_me:$LINENO: checking for library containing __dn_expand" >&5
! echo $ECHO_N "checking for library containing __dn_expand... $ECHO_C" >&6; }
! if test "${ac_cv_search___dn_expand+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   ac_func_search_save_LIBS=$LIBS
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
! char __dn_expand ();
  int
  main ()
  {
! return __dn_expand ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' resolv; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 39053,39089 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_com_err="-l$ac_lib"
! break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_com_err" >&5
! echo "${ECHO_T}$ac_cv_search_com_err" >&6
! if test "$ac_cv_search_com_err" != no; then
!   test "$ac_cv_search_com_err" = "none required" || LIBS="$ac_cv_search_com_err $LIBS"
  
  fi
  
  
    #
!   # asn1		Heimdal K 0.3d		-lcom_err
    #
!   echo "$as_me:$LINENO: checking for library containing initialize_asn1_error_table_r" >&5
! echo $ECHO_N "checking for library containing initialize_asn1_error_table_r... $ECHO_C" >&6
! if test "${ac_cv_search_initialize_asn1_error_table_r+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
- ac_cv_search_initialize_asn1_error_table_r=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 39802,39847 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search___dn_expand=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search___dn_expand+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search___dn_expand+set}" = set; then
!   :
! else
!   ac_cv_search___dn_expand=no
  fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_search___dn_expand" >&5
! echo "${ECHO_T}$ac_cv_search___dn_expand" >&6; }
! ac_res=$ac_cv_search___dn_expand
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
  
  
    #
!   # crypto             Need by gssapi under FreeBSD 5.4
    #
!   { echo "$as_me:$LINENO: checking for library containing RC4" >&5
! echo $ECHO_N "checking for library containing RC4... $ECHO_C" >&6; }
! if test "${ac_cv_search_RC4+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 39091,39112 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char initialize_asn1_error_table_r ();
  int
  main ()
  {
! initialize_asn1_error_table_r ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 39849,39877 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
! char RC4 ();
  int
  main ()
  {
! return RC4 ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' crypto; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 39128,39167 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_initialize_asn1_error_table_r="none required"
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
! if test "$ac_cv_search_initialize_asn1_error_table_r" = no; then
!   for ac_lib in asn1; do
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!     cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char initialize_asn1_error_table_r ();
  int
  main ()
  {
! initialize_asn1_error_table_r ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 39893,39968 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_RC4=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_RC4+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search_RC4+set}" = set; then
!   :
! else
!   ac_cv_search_RC4=no
! fi
! rm conftest.$ac_ext
! LIBS=$ac_func_search_save_LIBS
! fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_RC4" >&5
! echo "${ECHO_T}$ac_cv_search_RC4" >&6; }
! ac_res=$ac_cv_search_RC4
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
! 
! fi
! 
! 
!   #
!   # crypt              Needed by roken under FreeBSD 4.6.
!   #
!   { echo "$as_me:$LINENO: checking for library containing crypt" >&5
! echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6; }
! if test "${ac_cv_search_crypt+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   ac_func_search_save_LIBS=$LIBS
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
! char crypt ();
  int
  main ()
  {
! return crypt ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' crypt; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 39183,39222 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_initialize_asn1_error_table_r="-l$ac_lib"
! break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_initialize_asn1_error_table_r" >&5
! echo "${ECHO_T}$ac_cv_search_initialize_asn1_error_table_r" >&6
! if test "$ac_cv_search_initialize_asn1_error_table_r" != no; then
!   test "$ac_cv_search_initialize_asn1_error_table_r" = "none required" || LIBS="$ac_cv_search_initialize_asn1_error_table_r $LIBS"
  
  fi
  
  
    #
!   # resolv		required, but not installed by Heimdal K 0.3d
!   #
!   # resolv		MIT K5 1.2.2-beta1
!   # 			Linux 2.2.17
    #
!   echo "$as_me:$LINENO: checking for library containing __dn_expand" >&5
! echo $ECHO_N "checking for library containing __dn_expand... $ECHO_C" >&6
! if test "${ac_cv_search___dn_expand+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
- ac_cv_search___dn_expand=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 39984,40030 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_crypt=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_crypt+set}" = set; then
!   break
  fi
+ done
+ if test "${ac_cv_search_crypt+set}" = set; then
+   :
+ else
+   ac_cv_search_crypt=no
+ fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
! echo "${ECHO_T}$ac_cv_search_crypt" >&6; }
! ac_res=$ac_cv_search_crypt
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
  
  
    #
!   # roken		Heimdal K 0.3d		-lresolv
!   # roken               FreeBSD 4.6             -lcrypt
    #
!   { echo "$as_me:$LINENO: checking for library containing roken_gethostbyaddr" >&5
! echo $ECHO_N "checking for library containing roken_gethostbyaddr... $ECHO_C" >&6; }
! if test "${ac_cv_search_roken_gethostbyaddr+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 39224,39245 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char __dn_expand ();
  int
  main ()
  {
! __dn_expand ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 40032,40060 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
! char roken_gethostbyaddr ();
  int
  main ()
  {
! return roken_gethostbyaddr ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' roken; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 39261,39300 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search___dn_expand="none required"
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
! if test "$ac_cv_search___dn_expand" = no; then
!   for ac_lib in resolv; do
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!     cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char __dn_expand ();
  int
  main ()
  {
! __dn_expand ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 40076,40151 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_roken_gethostbyaddr=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_roken_gethostbyaddr+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search_roken_gethostbyaddr+set}" = set; then
!   :
! else
!   ac_cv_search_roken_gethostbyaddr=no
! fi
! rm conftest.$ac_ext
! LIBS=$ac_func_search_save_LIBS
! fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_roken_gethostbyaddr" >&5
! echo "${ECHO_T}$ac_cv_search_roken_gethostbyaddr" >&6; }
! ac_res=$ac_cv_search_roken_gethostbyaddr
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
! 
! fi
! 
! 
!   #
!   # k5crypto		MIT K5 v1.2.2-beta1
!   #
!   { echo "$as_me:$LINENO: checking for library containing valid_enctype" >&5
! echo $ECHO_N "checking for library containing valid_enctype... $ECHO_C" >&6; }
! if test "${ac_cv_search_valid_enctype+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   ac_func_search_save_LIBS=$LIBS
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
! char valid_enctype ();
  int
  main ()
  {
! return valid_enctype ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' k5crypto; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 39316,39352 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search___dn_expand="-l$ac_lib"
! break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search___dn_expand" >&5
! echo "${ECHO_T}$ac_cv_search___dn_expand" >&6
! if test "$ac_cv_search___dn_expand" != no; then
!   test "$ac_cv_search___dn_expand" = "none required" || LIBS="$ac_cv_search___dn_expand $LIBS"
  
  fi
  
  
    #
!   # crypto             Need by gssapi under FreeBSD 5.4
    #
!   echo "$as_me:$LINENO: checking for library containing RC4" >&5
! echo $ECHO_N "checking for library containing RC4... $ECHO_C" >&6
! if test "${ac_cv_search_RC4+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
- ac_cv_search_RC4=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 40167,40219 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_valid_enctype=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_valid_enctype+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search_valid_enctype+set}" = set; then
!   :
! else
!   ac_cv_search_valid_enctype=no
  fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_valid_enctype" >&5
! echo "${ECHO_T}$ac_cv_search_valid_enctype" >&6; }
! ac_res=$ac_cv_search_valid_enctype
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
  
  
    #
!   # gen			? ? ?			Needed on Irix 5.3 with some
!   #			Irix 5.3		version of Kerberos.  I'm not
!   #						sure which since Irix didn't
!   #						get any testing this time
!   #						around.  Original comment:
    #
!   # This is necessary on Irix 5.3, in order to link against libkrb5 --
!   # there, an_to_ln.o refers to things defined only in -lgen.
!   #
!   { echo "$as_me:$LINENO: checking for library containing compile" >&5
! echo $ECHO_N "checking for library containing compile... $ECHO_C" >&6; }
! if test "${ac_cv_search_compile+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 39354,39375 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char RC4 ();
  int
  main ()
  {
! RC4 ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 40221,40249 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
! char compile ();
  int
  main ()
  {
! return compile ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' gen; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 39391,39996 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_RC4="none required"
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_RC4" = no; then
-   for ac_lib in crypto; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
  
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char RC4 ();
- int
- main ()
- {
- RC4 ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
- 	 { ac_try='test -z "$ac_c_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_search_RC4="-l$ac_lib"
- break
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
-   done
- fi
- LIBS=$ac_func_search_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_search_RC4" >&5
- echo "${ECHO_T}$ac_cv_search_RC4" >&6
- if test "$ac_cv_search_RC4" != no; then
-   test "$ac_cv_search_RC4" = "none required" || LIBS="$ac_cv_search_RC4 $LIBS"
- 
- fi
- 
- 
-   #
-   # crypt              Needed by roken under FreeBSD 4.6.
-   #
-   echo "$as_me:$LINENO: checking for library containing crypt" >&5
- echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6
- if test "${ac_cv_search_crypt+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_func_search_save_LIBS=$LIBS
- ac_cv_search_crypt=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char crypt ();
- int
- main ()
- {
- crypt ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
- 	 { ac_try='test -z "$ac_c_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_search_crypt="none required"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_crypt" = no; then
-   for ac_lib in crypt; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char crypt ();
- int
- main ()
- {
- crypt ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
- 	 { ac_try='test -z "$ac_c_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_search_crypt="-l$ac_lib"
- break
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
-   done
- fi
- LIBS=$ac_func_search_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
- echo "${ECHO_T}$ac_cv_search_crypt" >&6
- if test "$ac_cv_search_crypt" != no; then
-   test "$ac_cv_search_crypt" = "none required" || LIBS="$ac_cv_search_crypt $LIBS"
- 
- fi
- 
- 
-   #
-   # roken		Heimdal K 0.3d		-lresolv
-   # roken               FreeBSD 4.6             -lcrypt
-   #
-   echo "$as_me:$LINENO: checking for library containing roken_gethostbyaddr" >&5
- echo $ECHO_N "checking for library containing roken_gethostbyaddr... $ECHO_C" >&6
- if test "${ac_cv_search_roken_gethostbyaddr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_func_search_save_LIBS=$LIBS
- ac_cv_search_roken_gethostbyaddr=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char roken_gethostbyaddr ();
- int
- main ()
- {
- roken_gethostbyaddr ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
- 	 { ac_try='test -z "$ac_c_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_search_roken_gethostbyaddr="none required"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_roken_gethostbyaddr" = no; then
-   for ac_lib in roken; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char roken_gethostbyaddr ();
- int
- main ()
- {
- roken_gethostbyaddr ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
- 	 { ac_try='test -z "$ac_c_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_search_roken_gethostbyaddr="-l$ac_lib"
- break
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
-   done
- fi
- LIBS=$ac_func_search_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_search_roken_gethostbyaddr" >&5
- echo "${ECHO_T}$ac_cv_search_roken_gethostbyaddr" >&6
- if test "$ac_cv_search_roken_gethostbyaddr" != no; then
-   test "$ac_cv_search_roken_gethostbyaddr" = "none required" || LIBS="$ac_cv_search_roken_gethostbyaddr $LIBS"
- 
- fi
- 
- 
-   #
-   # k5crypto		MIT K5 v1.2.2-beta1
-   #
-   echo "$as_me:$LINENO: checking for library containing valid_enctype" >&5
- echo $ECHO_N "checking for library containing valid_enctype... $ECHO_C" >&6
- if test "${ac_cv_search_valid_enctype+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_func_search_save_LIBS=$LIBS
- ac_cv_search_valid_enctype=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char valid_enctype ();
- int
- main ()
- {
- valid_enctype ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
- 	 { ac_try='test -z "$ac_c_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_search_valid_enctype="none required"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_valid_enctype" = no; then
-   for ac_lib in k5crypto; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
- extern "C"
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
- char valid_enctype ();
- int
- main ()
- {
- valid_enctype ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
- 	 { ac_try='test -z "$ac_c_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_search_valid_enctype="-l$ac_lib"
- break
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
! fi
! LIBS=$ac_func_search_save_LIBS
! fi
! echo "$as_me:$LINENO: result: $ac_cv_search_valid_enctype" >&5
! echo "${ECHO_T}$ac_cv_search_valid_enctype" >&6
! if test "$ac_cv_search_valid_enctype" != no; then
!   test "$ac_cv_search_valid_enctype" = "none required" || LIBS="$ac_cv_search_valid_enctype $LIBS"
! 
  fi
! 
! 
!   #
!   # gen			? ? ?			Needed on Irix 5.3 with some
!   #			Irix 5.3		version of Kerberos.  I'm not
!   #						sure which since Irix didn't
!   #						get any testing this time
!   #						around.  Original comment:
!   #
!   # This is necessary on Irix 5.3, in order to link against libkrb5 --
!   # there, an_to_ln.o refers to things defined only in -lgen.
!   #
!   echo "$as_me:$LINENO: checking for library containing compile" >&5
! echo $ECHO_N "checking for library containing compile... $ECHO_C" >&6
  if test "${ac_cv_search_compile+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   ac_func_search_save_LIBS=$LIBS
! ac_cv_search_compile=no
! cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! 
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char compile ();
! int
! main ()
! {
! compile ();
!   ;
!   return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
!   (eval $ac_link) 2>conftest.er1
!   ac_status=$?
!   grep -v '^ *+' conftest.er1 >conftest.err
!   rm -f conftest.er1
!   cat conftest.err >&5
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"
! 			 || test ! -s conftest.err'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; } &&
! 	 { ac_try='test -s conftest$ac_exeext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
!   ac_cv_search_compile="none required"
! else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! fi
! rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
! if test "$ac_cv_search_compile" = no; then
!   for ac_lib in gen; do
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!     cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! 
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char compile ();
! int
! main ()
! {
! compile ();
!   ;
!   return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
!   (eval $ac_link) 2>conftest.er1
!   ac_status=$?
!   grep -v '^ *+' conftest.er1 >conftest.err
!   rm -f conftest.er1
!   cat conftest.err >&5
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"
! 			 || test ! -s conftest.err'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; } &&
! 	 { ac_try='test -s conftest$ac_exeext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
!   ac_cv_search_compile="-l$ac_lib"
! break
  else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
! 
! fi
! rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_compile" >&5
! echo "${ECHO_T}$ac_cv_search_compile" >&6
! if test "$ac_cv_search_compile" != no; then
!   test "$ac_cv_search_compile" = "none required" || LIBS="$ac_cv_search_compile $LIBS"
  
  fi
  
--- 40265,40297 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_compile=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
  
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_compile+set}" = set; then
!   break
  fi
! done
  if test "${ac_cv_search_compile+set}" = set; then
!   :
  else
!   ac_cv_search_compile=no
  fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_compile" >&5
! echo "${ECHO_T}$ac_cv_search_compile" >&6; }
! ac_res=$ac_cv_search_compile
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
  
***************
*** 40008,40020 ****
    #
    # krb5		Heimdal K 0.3d		-lasn1 -lroken -ldes
    #
!   echo "$as_me:$LINENO: checking for library containing krb5_free_context" >&5
! echo $ECHO_N "checking for library containing krb5_free_context... $ECHO_C" >&6
  if test "${ac_cv_search_krb5_free_context+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
- ac_cv_search_krb5_free_context=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 40309,40320 ----
    #
    # krb5		Heimdal K 0.3d		-lasn1 -lroken -ldes
    #
!   { echo "$as_me:$LINENO: checking for library containing krb5_free_context" >&5
! echo $ECHO_N "checking for library containing krb5_free_context... $ECHO_C" >&6; }
  if test "${ac_cv_search_krb5_free_context+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 40022,40098 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
- char krb5_free_context ();
- int
- main ()
- {
- krb5_free_context ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
- 	 { ac_try='test -z "$ac_c_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_search_krb5_free_context="none required"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_krb5_free_context" = no; then
-   for ac_lib in krb5; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char krb5_free_context ();
  int
  main ()
  {
! krb5_free_context ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 40322,40350 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
     builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char krb5_free_context ();
  int
  main ()
  {
! return krb5_free_context ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' krb5; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 40114,40136 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_krb5_free_context="-l$ac_lib"
! break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_krb5_free_context" >&5
! echo "${ECHO_T}$ac_cv_search_krb5_free_context" >&6
! if test "$ac_cv_search_krb5_free_context" != no; then
!   test "$ac_cv_search_krb5_free_context" = "none required" || LIBS="$ac_cv_search_krb5_free_context $LIBS"
  
  fi
  
--- 40366,40398 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_krb5_free_context=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_krb5_free_context+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search_krb5_free_context+set}" = set; then
!   :
! else
!   ac_cv_search_krb5_free_context=no
  fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_krb5_free_context" >&5
! echo "${ECHO_T}$ac_cv_search_krb5_free_context" >&6; }
! ac_res=$ac_cv_search_krb5_free_context
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
  
***************
*** 40146,40158 ****
    #
    # gssapi		Heimdal K 0.3d		-lkrb5
    #
!   echo "$as_me:$LINENO: checking for library containing gss_import_name" >&5
! echo $ECHO_N "checking for library containing gss_import_name... $ECHO_C" >&6
  if test "${ac_cv_search_gss_import_name+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
- ac_cv_search_gss_import_name=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 40408,40419 ----
    #
    # gssapi		Heimdal K 0.3d		-lkrb5
    #
!   { echo "$as_me:$LINENO: checking for library containing gss_import_name" >&5
! echo $ECHO_N "checking for library containing gss_import_name... $ECHO_C" >&6; }
  if test "${ac_cv_search_gss_import_name+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 40160,40236 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
- char gss_import_name ();
- int
- main ()
- {
- gss_import_name ();
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   (eval $ac_link) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
- 	 { ac_try='test -z "$ac_c_werror_flag"
- 			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_search_gss_import_name="none required"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_gss_import_name" = no; then
-   for ac_lib in gssapi_krb5 gssapi; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char gss_import_name ();
  int
  main ()
  {
! gss_import_name ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 40421,40449 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
     builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char gss_import_name ();
  int
  main ()
  {
! return gss_import_name ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' gssapi_krb5 gssapi; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 40252,40274 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_gss_import_name="-l$ac_lib"
! break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_gss_import_name" >&5
! echo "${ECHO_T}$ac_cv_search_gss_import_name" >&6
! if test "$ac_cv_search_gss_import_name" != no; then
!   test "$ac_cv_search_gss_import_name" = "none required" || LIBS="$ac_cv_search_gss_import_name $LIBS"
  
  fi
  
--- 40465,40497 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_gss_import_name=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_gss_import_name+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search_gss_import_name+set}" = set; then
!   :
! else
!   ac_cv_search_gss_import_name=no
  fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_gss_import_name" >&5
! echo "${ECHO_T}$ac_cv_search_gss_import_name" >&6; }
! ac_res=$ac_cv_search_gss_import_name
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  fi
  
***************
*** 40283,40295 ****
  # defaults to the included snapshot of zlib
  #
  
! # Check whether --with-external-zlib or --without-external-zlib was given.
  if test "${with_external_zlib+set}" = set; then
!   withval="$with_external_zlib"
!   with_external_zlib=$withval
  else
    with_external_zlib=no
! fi;
  
  #
  # Try to locate a ZLIB installation if no location was specified, assuming
--- 40506,40518 ----
  # defaults to the included snapshot of zlib
  #
  
! # Check whether --with-external-zlib was given.
  if test "${with_external_zlib+set}" = set; then
!   withval=$with_external_zlib; with_external_zlib=$withval
  else
    with_external_zlib=no
! fi
! 
  
  #
  # Try to locate a ZLIB installation if no location was specified, assuming
***************
*** 40299,40306 ****
    # Granted, this is a slightly ugly way to print this info, but the
    # AC_CHECK_HEADER used in the search for a ZLIB installation makes using
    # AC_CACHE_CHECK worse
!   echo "$as_me:$LINENO: checking for external ZLIB" >&5
! echo $ECHO_N "checking for external ZLIB... $ECHO_C" >&6
  else :; fi
  if test "${acx_zlib_cv_external_zlib+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
--- 40522,40529 ----
    # Granted, this is a slightly ugly way to print this info, but the
    # AC_CHECK_HEADER used in the search for a ZLIB installation makes using
    # AC_CACHE_CHECK worse
!   { echo "$as_me:$LINENO: checking for external ZLIB" >&5
! echo $ECHO_N "checking for external ZLIB... $ECHO_C" >&6; }
  else :; fi
  if test "${acx_zlib_cv_external_zlib+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
***************
*** 40316,40349 ****
        break
      fi
      if test x$acx_zlib_cv_external_zlib = xyes; then
!       echo "$as_me:$LINENO: checking for external ZLIB" >&5
! echo $ECHO_N "checking for external ZLIB... $ECHO_C" >&6
!       echo "$as_me:$LINENO: result: " >&5
! echo "${ECHO_T}" >&6
      else
        CPPFLAGS="$acx_zlib_save_CPPFLAGS -I$acx_zlib_cv_external_zlib/include"
!       echo "$as_me:$LINENO: checking for external ZLIB in $acx_zlib_cv_external_zlib" >&5
! echo $ECHO_N "checking for external ZLIB in $acx_zlib_cv_external_zlib... $ECHO_C" >&6
!       echo "$as_me:$LINENO: result: " >&5
! echo "${ECHO_T}" >&6
      fi
      unset ac_cv_header_zlib_h
  
  for ac_header in zlib.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
!   echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 40539,40573 ----
        break
      fi
      if test x$acx_zlib_cv_external_zlib = xyes; then
!       { echo "$as_me:$LINENO: checking for external ZLIB" >&5
! echo $ECHO_N "checking for external ZLIB... $ECHO_C" >&6; }
!       { echo "$as_me:$LINENO: result: " >&5
! echo "${ECHO_T}" >&6; }
      else
        CPPFLAGS="$acx_zlib_save_CPPFLAGS -I$acx_zlib_cv_external_zlib/include"
!       { echo "$as_me:$LINENO: checking for external ZLIB in $acx_zlib_cv_external_zlib" >&5
! echo $ECHO_N "checking for external ZLIB in $acx_zlib_cv_external_zlib... $ECHO_C" >&6; }
!       { echo "$as_me:$LINENO: result: " >&5
! echo "${ECHO_T}" >&6; }
      fi
      unset ac_cv_header_zlib_h
  
  for ac_header in zlib.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
!   { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking $ac_header usability" >&5
! echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 40380,40394 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 40604,40619 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking $ac_header presence" >&5
! echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 40422,40430 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 40647,40656 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 40458,40472 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
! if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
! echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
--- 40684,40699 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for $ac_header" >&5
! echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    eval "$as_ac_Header=\$ac_header_preproc"
  fi
! ac_res=`eval echo '${'$as_ac_Header'}'`
! 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
! echo "${ECHO_T}$ac_res" >&6; }
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
***************
*** 40483,40508 ****
      fi
    done
    CPPFLAGS=$acx_zlib_save_CPPFLAGS
! echo "$as_me:$LINENO: checking for external ZLIB" >&5
! echo $ECHO_N "checking for external ZLIB... $ECHO_C" >&6
  
  fi
! echo "$as_me:$LINENO: result: $acx_zlib_cv_external_zlib" >&5
! echo "${ECHO_T}$acx_zlib_cv_external_zlib" >&6
  
  
  #
  # Output a pretty message naming our selected ZLIB "external" or "package"
  # so that any warnings printed by the version check make more sense.
  #
! echo "$as_me:$LINENO: checking selected ZLIB" >&5
! echo $ECHO_N "checking selected ZLIB... $ECHO_C" >&6
  if test "x$with_external_zlib" = xno; then
!   echo "$as_me:$LINENO: result: package" >&5
! echo "${ECHO_T}package" >&6
  else
!   echo "$as_me:$LINENO: result: external" >&5
! echo "${ECHO_T}external" >&6
  fi
  
  
--- 40710,40735 ----
      fi
    done
    CPPFLAGS=$acx_zlib_save_CPPFLAGS
! { echo "$as_me:$LINENO: checking for external ZLIB" >&5
! echo $ECHO_N "checking for external ZLIB... $ECHO_C" >&6; }
  
  fi
! { echo "$as_me:$LINENO: result: $acx_zlib_cv_external_zlib" >&5
! echo "${ECHO_T}$acx_zlib_cv_external_zlib" >&6; }
  
  
  #
  # Output a pretty message naming our selected ZLIB "external" or "package"
  # so that any warnings printed by the version check make more sense.
  #
! { echo "$as_me:$LINENO: checking selected ZLIB" >&5
! echo $ECHO_N "checking selected ZLIB... $ECHO_C" >&6; }
  if test "x$with_external_zlib" = xno; then
!   { echo "$as_me:$LINENO: result: package" >&5
! echo "${ECHO_T}package" >&6; }
  else
!   { echo "$as_me:$LINENO: result: external" >&5
! echo "${ECHO_T}external" >&6; }
  fi
  
  
***************
*** 40639,40646 ****
    #
    # Ideally, we would also check that the version is newer
    #
!   echo "$as_me:$LINENO: checking that ZLIB library works" >&5
! echo $ECHO_N "checking that ZLIB library works... $ECHO_C" >&6
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 40866,40873 ----
    #
    # Ideally, we would also check that the version is newer
    #
!   { echo "$as_me:$LINENO: checking that ZLIB library works" >&5
! echo $ECHO_N "checking that ZLIB library works... $ECHO_C" >&6; }
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 40678,40695 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   echo "$as_me:$LINENO: result: yes" >&5
! echo "${ECHO_T}yes" >&6
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
                 { { echo "$as_me:$LINENO: error: ZLIB failed to link" >&5
  echo "$as_me: error: ZLIB failed to link" >&2;}
     { (exit 1); exit 1; }; }
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
--- 40905,40923 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   { echo "$as_me:$LINENO: result: yes" >&5
! echo "${ECHO_T}yes" >&6; }
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	{ echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
                 { { echo "$as_me:$LINENO: error: ZLIB failed to link" >&5
  echo "$as_me: error: ZLIB failed to link" >&2;}
     { (exit 1); exit 1; }; }
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  fi
***************
*** 40699,40711 ****
  
  # What remote shell transport should our client cvs default to using?
  
! # Check whether --with-rsh or --without-rsh was given.
  if test "${with_rsh+set}" = set; then
!   withval="$with_rsh"
! 
  else
    with_rsh="ssh rsh"
! fi;
  
  if test no = "$with_rsh"; then
    { echo "$as_me:$LINENO: WARNING: Failed to find usable remote shell. Using 'rsh'." >&5
--- 40927,40939 ----
  
  # What remote shell transport should our client cvs default to using?
  
! # Check whether --with-rsh was given.
  if test "${with_rsh+set}" = set; then
!   withval=$with_rsh;
  else
    with_rsh="ssh rsh"
! fi
! 
  
  if test no = "$with_rsh"; then
    { echo "$as_me:$LINENO: WARNING: Failed to find usable remote shell. Using 'rsh'." >&5
***************
*** 40721,40728 ****
    # doesn't exist or isn't usable, but then trust the user and use it
    # regardless
    with_default_rsh=$with_rsh
!   echo "$as_me:$LINENO: checking for a remote shell" >&5
! echo $ECHO_N "checking for a remote shell... $ECHO_C" >&6
    if ! test -f $with_rsh \
        || ! test -x $with_rsh; then
      # warn the user that they may encounter problems
--- 40949,40956 ----
    # doesn't exist or isn't usable, but then trust the user and use it
    # regardless
    with_default_rsh=$with_rsh
!   { echo "$as_me:$LINENO: checking for a remote shell" >&5
! echo $ECHO_N "checking for a remote shell... $ECHO_C" >&6; }
    if ! test -f $with_rsh \
        || ! test -x $with_rsh; then
      # warn the user that they may encounter problems
***************
*** 40735,40742 ****
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_with_default_rsh+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 40963,40970 ----
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_with_default_rsh+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 40749,40755 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_with_default_rsh="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 40977,40983 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_with_default_rsh="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 40761,40773 ****
  fi
  with_default_rsh=$ac_cv_prog_with_default_rsh
  if test -n "$with_default_rsh"; then
!   echo "$as_me:$LINENO: result: $with_default_rsh" >&5
! echo "${ECHO_T}$with_default_rsh" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
    test -n "$with_default_rsh" && break
  done
  test -n "$with_default_rsh" || with_default_rsh=""rsh""
--- 40989,41002 ----
  fi
  with_default_rsh=$ac_cv_prog_with_default_rsh
  if test -n "$with_default_rsh"; then
!   { echo "$as_me:$LINENO: result: $with_default_rsh" >&5
! echo "${ECHO_T}$with_default_rsh" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ 
    test -n "$with_default_rsh" && break
  done
  test -n "$with_default_rsh" || with_default_rsh=""rsh""
***************
*** 40787,40799 ****
  
  # Let the confiscator request a specific editor
  
! # Check whether --with-editor or --without-editor was given.
  if test "${with_editor+set}" = set; then
!   withval="$with_editor"
! 
  else
    with_editor=yes
! fi;
  
  # If --with-editor was supplied with an argument, let it override $EDITOR from
  # the user's environment.  We need to unset EDITOR here because AC_CHECK_PROGS
--- 41016,41028 ----
  
  # Let the confiscator request a specific editor
  
! # Check whether --with-editor was given.
  if test "${with_editor+set}" = set; then
!   withval=$with_editor;
  else
    with_editor=yes
! fi
! 
  
  # If --with-editor was supplied with an argument, let it override $EDITOR from
  # the user's environment.  We need to unset EDITOR here because AC_CHECK_PROGS
***************
*** 40806,40812 ****
  # Set the default when --with-editor wasn't supplied or when it was supplied
  # without an argument.
  if test yes = $with_editor; then
!   with_editor="vim vi emacs nano pico edit"
  fi
  
  if echo $with_editor |grep ^/ >/dev/null; then
--- 41035,41041 ----
  # Set the default when --with-editor wasn't supplied or when it was supplied
  # without an argument.
  if test yes = $with_editor; then
!   with_editor="vim vi emacs nano pico edit e"
  fi
  
  if echo $with_editor |grep ^/ >/dev/null; then
***************
*** 40814,40823 ****
    # doesn't exist or isn't usable, but then trust the user and use it
    # regardless
    EDITOR=$with_editor
!   echo "$as_me:$LINENO: checking for an editor" >&5
! echo $ECHO_N "checking for an editor... $ECHO_C" >&6
!   echo "$as_me:$LINENO: result: $EDITOR" >&5
! echo "${ECHO_T}$EDITOR" >&6
    if ! test -f $with_editor \
        || ! test -x $with_editor; then
      # warn the user that they may encounter problems
--- 41043,41052 ----
    # doesn't exist or isn't usable, but then trust the user and use it
    # regardless
    EDITOR=$with_editor
!   { echo "$as_me:$LINENO: checking for an editor" >&5
! echo $ECHO_N "checking for an editor... $ECHO_C" >&6; }
!   { echo "$as_me:$LINENO: result: $EDITOR" >&5
! echo "${ECHO_T}$EDITOR" >&6; }
    if ! test -f $with_editor \
        || ! test -x $with_editor; then
      # warn the user that they may encounter problems
***************
*** 40830,40837 ****
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
! echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
  if test "${ac_cv_prog_EDITOR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 41059,41066 ----
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
! { echo "$as_me:$LINENO: checking for $ac_word" >&5
! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  if test "${ac_cv_prog_EDITOR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 40844,40850 ****
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
      ac_cv_prog_EDITOR="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
--- 41073,41079 ----
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
!   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_EDITOR="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
***************
*** 40856,40868 ****
  fi
  EDITOR=$ac_cv_prog_EDITOR
  if test -n "$EDITOR"; then
!   echo "$as_me:$LINENO: result: $EDITOR" >&5
! echo "${ECHO_T}$EDITOR" >&6
  else
!   echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6
  fi
  
    test -n "$EDITOR" && break
  done
  test -n "$EDITOR" || EDITOR="no"
--- 41085,41098 ----
  fi
  EDITOR=$ac_cv_prog_EDITOR
  if test -n "$EDITOR"; then
!   { echo "$as_me:$LINENO: result: $EDITOR" >&5
! echo "${ECHO_T}$EDITOR" >&6; }
  else
!   { echo "$as_me:$LINENO: result: no" >&5
! echo "${ECHO_T}no" >&6; }
  fi
  
+ 
    test -n "$EDITOR" && break
  done
  test -n "$EDITOR" || EDITOR="no"
***************
*** 40898,40910 ****
  
  
  
! # Check whether --with-hardcoded-pam-service-name or --without-hardcoded-pam-service-name was given.
  if test "${with_hardcoded_pam_service_name+set}" = set; then
!   withval="$with_hardcoded_pam_service_name"
! 
  else
    with_hardcoded_pam_service_name=cvs
! fi;
  
  if test "x$with_hardcoded_pam_service_name" = xno ||
     test "x$with_hardcoded_pam_service_name" = xprogram_name; then
--- 41128,41140 ----
  
  
  
! # Check whether --with-hardcoded-pam-service-name was given.
  if test "${with_hardcoded_pam_service_name+set}" = set; then
!   withval=$with_hardcoded_pam_service_name;
  else
    with_hardcoded_pam_service_name=cvs
! fi
! 
  
  if test "x$with_hardcoded_pam_service_name" = xno ||
     test "x$with_hardcoded_pam_service_name" = xprogram_name; then
***************
*** 40926,40939 ****
  
  
  
! # Check whether --with-tmpdir or --without-tmpdir was given.
  if test "${with_tmpdir+set}" = set; then
!   withval="$with_tmpdir"
  
- fi;
  
! echo "$as_me:$LINENO: checking for temporary directory" >&5
! echo $ECHO_N "checking for temporary directory... $ECHO_C" >&6
  if test -z "$with_tmpdir" || test yes = "$with_tmpdir"; then
    for with_tmpdir in /tmp /var/tmp no; do
      if test -d "$with_tmpdir" && test -x "$with_tmpdir" \
--- 41156,41169 ----
  
  
  
! # Check whether --with-tmpdir was given.
  if test "${with_tmpdir+set}" = set; then
!   withval=$with_tmpdir;
! fi
  
  
! { echo "$as_me:$LINENO: checking for temporary directory" >&5
! echo $ECHO_N "checking for temporary directory... $ECHO_C" >&6; }
  if test -z "$with_tmpdir" || test yes = "$with_tmpdir"; then
    for with_tmpdir in /tmp /var/tmp no; do
      if test -d "$with_tmpdir" && test -x "$with_tmpdir" \
***************
*** 40946,40963 ****
  echo "$as_me: WARNING: Failed to find usable temporary directory.  Using '/tmp'." >&2;}
      with_tmpdir=/tmp
    fi
!   echo "$as_me:$LINENO: result: $with_tmpdir" >&5
! echo "${ECHO_T}$with_tmpdir" >&6
  elif ! echo "$with_tmpdir" |grep '^[\\/]'; then
!   echo "$as_me:$LINENO: result: $with_tmpdir" >&5
! echo "${ECHO_T}$with_tmpdir" >&6
    { { echo "$as_me:$LINENO: error: --with-tmpdir requires an absolute path." >&5
  echo "$as_me: error: --with-tmpdir requires an absolute path." >&2;}
     { (exit 1); exit 1; }; }
  elif ! test -d "$with_tmpdir" || ! test -x "$with_tmpdir" \
          || ! test -w "$with_tmpdir" || ! test -r "$with_tmpdir"; then
!   echo "$as_me:$LINENO: result: $with_tmpdir" >&5
! echo "${ECHO_T}$with_tmpdir" >&6
    { echo "$as_me:$LINENO: WARNING: User supplied temporary directory ('$with_tmpdir') does not
       exist or lacks sufficient permissions for read/write." >&5
  echo "$as_me: WARNING: User supplied temporary directory ('$with_tmpdir') does not
--- 41176,41193 ----
  echo "$as_me: WARNING: Failed to find usable temporary directory.  Using '/tmp'." >&2;}
      with_tmpdir=/tmp
    fi
!   { echo "$as_me:$LINENO: result: $with_tmpdir" >&5
! echo "${ECHO_T}$with_tmpdir" >&6; }
  elif ! echo "$with_tmpdir" |grep '^[\\/]'; then
!   { echo "$as_me:$LINENO: result: $with_tmpdir" >&5
! echo "${ECHO_T}$with_tmpdir" >&6; }
    { { echo "$as_me:$LINENO: error: --with-tmpdir requires an absolute path." >&5
  echo "$as_me: error: --with-tmpdir requires an absolute path." >&2;}
     { (exit 1); exit 1; }; }
  elif ! test -d "$with_tmpdir" || ! test -x "$with_tmpdir" \
          || ! test -w "$with_tmpdir" || ! test -r "$with_tmpdir"; then
!   { echo "$as_me:$LINENO: result: $with_tmpdir" >&5
! echo "${ECHO_T}$with_tmpdir" >&6; }
    { echo "$as_me:$LINENO: WARNING: User supplied temporary directory ('$with_tmpdir') does not
       exist or lacks sufficient permissions for read/write." >&5
  echo "$as_me: WARNING: User supplied temporary directory ('$with_tmpdir') does not
***************
*** 40974,40984 ****
  
  
  
! # Check whether --with-umask or --without-umask was given.
  if test "${with_umask+set}" = set; then
!   withval="$with_umask"
  
- fi;
  
  if test -z "$with_umask" || test yes = "$with_umask"; then
    with_umask=002
--- 41204,41214 ----
  
  
  
! # Check whether --with-umask was given.
  if test "${with_umask+set}" = set; then
!   withval=$with_umask;
! fi
  
  
  if test -z "$with_umask" || test yes = "$with_umask"; then
    with_umask=002
***************
*** 40994,41006 ****
  
  
  
! # Check whether --with-cvs-admin-group or --without-cvs-admin-group was given.
  if test "${with_cvs_admin_group+set}" = set; then
!   withval="$with_cvs_admin_group"
! 
  else
    with_cvs_admin_group=cvsadmin
! fi;
  
  if test yes = "$with_cvs_admin_group"; then
    with_cvs_admin_group=cvsadmin
--- 41224,41236 ----
  
  
  
! # Check whether --with-cvs-admin-group was given.
  if test "${with_cvs_admin_group+set}" = set; then
!   withval=$with_cvs_admin_group;
  else
    with_cvs_admin_group=cvsadmin
! fi
! 
  
  if test yes = "$with_cvs_admin_group"; then
    with_cvs_admin_group=cvsadmin
***************
*** 41014,41026 ****
  fi
  
  
! # Check whether --enable-cvs-ndbm or --disable-cvs-ndbm was given.
  if test "${enable_cvs_ndbm+set}" = set; then
!   enableval="$enable_cvs_ndbm"
! 
  else
    enable_cvs_ndbm=yes
! fi;
  if test no != "$enable_cvs_ndbm"; then
  
  cat >>confdefs.h <<\_ACEOF
--- 41244,41256 ----
  fi
  
  
! # Check whether --enable-cvs-ndbm was given.
  if test "${enable_cvs_ndbm+set}" = set; then
!   enableval=$enable_cvs_ndbm;
  else
    enable_cvs_ndbm=yes
! fi
! 
  if test no != "$enable_cvs_ndbm"; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 41039,41187 ****
  
  # Check for options requesting client and server feature. If none are
  # given and we have connect(), we want the full client & server arrangement.
! # Check whether --enable-client or --disable-client was given.
  if test "${enable_client+set}" = set; then
!   enableval="$enable_client"
! 
  else
    enable_client=$ac_cv_search_connect
- fi;
- if test no != "$enable_client"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define CLIENT_SUPPORT 1
- _ACEOF
- 
  fi
  
! 
! 
! # Check whether --enable-password-authenticated-client or --disable-password-authenticated-client was given.
! if test "${enable_password_authenticated_client+set}" = set; then
!   enableval="$enable_password_authenticated_client"
! 
! else
!   enable_password_authenticated_client=$enable_client
! fi;
! 
! if test xno != "x$enable_password_authenticated_client"; then
!   if test xno != "x$enable_client"; then
  
  cat >>confdefs.h <<\_ACEOF
! #define AUTH_CLIENT_SUPPORT 1
  _ACEOF
  
-   else
-     { echo "$as_me:$LINENO: WARNING: --enable-password-authenticated-client is meaningless with
-        the CVS client disabled (--disable-client)" >&5
- echo "$as_me: WARNING: --enable-password-authenticated-client is meaningless with
-        the CVS client disabled (--disable-client)" >&2;}
-   fi
  fi
  
  
! 
! 
! # Check whether --enable-server or --disable-server was given.
! if test "${enable_server+set}" = set; then
!   enableval="$enable_server"
! 
! else
!   enable_server=$ac_cv_search_connect
! fi;
! 
! if test no != "$enable_server"; then
! 
! cat >>confdefs.h <<\_ACEOF
! #define SERVER_SUPPORT 1
! _ACEOF
! 
! 
!             echo "$as_me:$LINENO: checking for library containing crypt" >&5
! echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6
! if test "${ac_cv_search_crypt+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   ac_func_search_save_LIBS=$LIBS
! ac_cv_search_crypt=no
! cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h.  */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h.  */
! 
! /* Override any gcc2 internal prototype to avoid an error.  */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
!    builtin and then its argument prototype would still apply.  */
! char crypt ();
! int
! main ()
! {
! crypt ();
!   ;
!   return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
!   (eval $ac_link) 2>conftest.er1
!   ac_status=$?
!   grep -v '^ *+' conftest.er1 >conftest.err
!   rm -f conftest.er1
!   cat conftest.err >&5
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); } &&
! 	 { ac_try='test -z "$ac_c_werror_flag"
! 			 || test ! -s conftest.err'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; } &&
! 	 { ac_try='test -s conftest$ac_exeext'
!   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
!   (eval $ac_try) 2>&5
!   ac_status=$?
!   echo "$as_me:$LINENO: \$? = $ac_status" >&5
!   (exit $ac_status); }; }; then
!   ac_cv_search_crypt="none required"
  else
!   echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
! rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
! if test "$ac_cv_search_crypt" = no; then
!   for ac_lib in crypt; do
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!     cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char crypt ();
  int
  main ()
  {
! crypt ();
    ;
    return 0;
  }
  _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
--- 41269,41368 ----
  
  # Check for options requesting client and server feature. If none are
  # given and we have connect(), we want the full client & server arrangement.
! # Check whether --enable-client was given.
  if test "${enable_client+set}" = set; then
!   enableval=$enable_client;
  else
    enable_client=$ac_cv_search_connect
  fi
  
! if test no != "$enable_client"; then
  
  cat >>confdefs.h <<\_ACEOF
! #define CLIENT_SUPPORT 1
  _ACEOF
  
  fi
  
  
! 
! # Check whether --enable-password-authenticated-client was given.
! if test "${enable_password_authenticated_client+set}" = set; then
!   enableval=$enable_password_authenticated_client;
  else
!   enable_password_authenticated_client=$enable_client
! fi
! 
! 
! if test xno != "x$enable_password_authenticated_client"; then
!   if test xno != "x$enable_client"; then
! 
! cat >>confdefs.h <<\_ACEOF
! #define AUTH_CLIENT_SUPPORT 1
! _ACEOF
! 
!   else
!     { echo "$as_me:$LINENO: WARNING: --enable-password-authenticated-client is meaningless with
!        the CVS client disabled (--disable-client)" >&5
! echo "$as_me: WARNING: --enable-password-authenticated-client is meaningless with
!        the CVS client disabled (--disable-client)" >&2;}
!   fi
! fi
! 
! 
  
+ 
+ # Check whether --enable-server was given.
+ if test "${enable_server+set}" = set; then
+   enableval=$enable_server;
+ else
+   enable_server=$ac_cv_search_connect
  fi
! 
! 
! if test no != "$enable_server"; then
! 
! cat >>confdefs.h <<\_ACEOF
! #define SERVER_SUPPORT 1
! _ACEOF
! 
! 
!             { echo "$as_me:$LINENO: checking for library containing crypt" >&5
! echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6; }
! if test "${ac_cv_search_crypt+set}" = set; then
!   echo $ECHO_N "(cached) $ECHO_C" >&6
! else
!   ac_func_search_save_LIBS=$LIBS
! cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char crypt ();
  int
  main ()
  {
! return crypt ();
    ;
    return 0;
  }
  _ACEOF
! for ac_lib in '' crypt; do
!   if test -z "$ac_lib"; then
!     ac_res="none required"
!   else
!     ac_res=-l$ac_lib
!     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
!   fi
!   rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    (eval $ac_link) 2>conftest.er1
    ac_status=$?
***************
*** 41203,41225 ****
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_crypt="-l$ac_lib"
! break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext conftest.$ac_ext
!   done
  fi
  LIBS=$ac_func_search_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
! echo "${ECHO_T}$ac_cv_search_crypt" >&6
! if test "$ac_cv_search_crypt" != no; then
!   test "$ac_cv_search_crypt" = "none required" || LIBS="$ac_cv_search_crypt $LIBS"
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_CRYPT 1
--- 41384,41416 ----
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_search_crypt=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+ 
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
!       conftest$ac_exeext
!   if test "${ac_cv_search_crypt+set}" = set; then
!   break
! fi
! done
! if test "${ac_cv_search_crypt+set}" = set; then
!   :
! else
!   ac_cv_search_crypt=no
  fi
+ rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
! echo "${ECHO_T}$ac_cv_search_crypt" >&6; }
! ac_res=$ac_cv_search_crypt
! if test "$ac_res" != no; then
!   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_CRYPT 1
***************
*** 41232,41246 ****
  
  fi
  
!           # Check whether --enable-server-flow-control or --disable-server-flow-control was given.
  if test "${enable_server_flow_control+set}" = set; then
!   enableval="$enable_server_flow_control"
!   if test yes = $enable_server_flow_control; then
         enable_server_flow_control=1M,2M
       fi
  else
    enable_server_flow_control=1M,2M
! fi;
    if test no != $enable_server_flow_control; then
      ccvs_lwm=`expr "$enable_server_flow_control" : '\(.*\),'`
      ccvs_hwm=`expr "$enable_server_flow_control" : '.*,\(.*\)'`
--- 41423,41437 ----
  
  fi
  
!           # Check whether --enable-server-flow-control was given.
  if test "${enable_server_flow_control+set}" = set; then
!   enableval=$enable_server_flow_control; if test yes = $enable_server_flow_control; then
         enable_server_flow_control=1M,2M
       fi
  else
    enable_server_flow_control=1M,2M
! fi
! 
    if test no != $enable_server_flow_control; then
      ccvs_lwm=`expr "$enable_server_flow_control" : '\(.*\),'`
      ccvs_hwm=`expr "$enable_server_flow_control" : '.*,\(.*\)'`
***************
*** 41294,41310 ****
  
  
  
! # Check whether --enable-proxy or --disable-proxy was given.
  if test "${enable_proxy+set}" = set; then
!   enableval="$enable_proxy"
! 
  else
    if test xno != "x$enable_client" && test xno != "x$enable_server"; then
       enable_proxy=yes
     else
       enable_proxy=no
     fi
! fi;
  
  if test no != "$enable_proxy"; then
    if test xno = "x$enable_client" || test xno = "x$enable_server"; then
--- 41485,41501 ----
  
  
  
! # Check whether --enable-proxy was given.
  if test "${enable_proxy+set}" = set; then
!   enableval=$enable_proxy;
  else
    if test xno != "x$enable_client" && test xno != "x$enable_server"; then
       enable_proxy=yes
     else
       enable_proxy=no
     fi
! fi
! 
  
  if test no != "$enable_proxy"; then
    if test xno = "x$enable_client" || test xno = "x$enable_server"; then
***************
*** 41323,41352 ****
  
  
  
! # Check whether --enable-pam or --disable-pam was given.
  if test "${enable_pam+set}" = set; then
!   enableval="$enable_pam"
! 
  else
    enable_pam=no
  
! fi;
  
  if test yes = $enable_pam; then
    ac_pam_header_available=
  
    if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
!   echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
! echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6
  if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
! echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5
! echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 41514,41543 ----
  
  
  
! # Check whether --enable-pam was given.
  if test "${enable_pam+set}" = set; then
!   enableval=$enable_pam;
  else
    enable_pam=no
  
! fi
! 
  
  if test yes = $enable_pam; then
    ac_pam_header_available=
  
    if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
!   { echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
! echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6; }
  if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
! echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5
! echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 41383,41397 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5
! echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 41574,41589 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5
! echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 41425,41433 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 41617,41626 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 41461,41475 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
! echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6
  if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_cv_header_security_pam_appl_h=$ac_header_preproc
  fi
! echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
! echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6
  
  fi
  if test $ac_cv_header_security_pam_appl_h = yes; then
--- 41654,41668 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
! echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6; }
  if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_cv_header_security_pam_appl_h=$ac_header_preproc
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
! echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6; }
  
  fi
  if test $ac_cv_header_security_pam_appl_h = yes; then
***************
*** 41486,41502 ****
  
    if test -z "$ac_pam_header_available"; then
    if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then
!   echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5
! echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6
  if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! echo "$as_me:$LINENO: result: $ac_cv_header_pam_pam_appl_h" >&5
! echo "${ECHO_T}$ac_cv_header_pam_pam_appl_h" >&6
  else
    # Is the header compilable?
! echo "$as_me:$LINENO: checking pam/pam_appl.h usability" >&5
! echo $ECHO_N "checking pam/pam_appl.h usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 41679,41695 ----
  
    if test -z "$ac_pam_header_available"; then
    if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then
!   { echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5
! echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6; }
  if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_header_pam_pam_appl_h" >&5
! echo "${ECHO_T}$ac_cv_header_pam_pam_appl_h" >&6; }
  else
    # Is the header compilable?
! { echo "$as_me:$LINENO: checking pam/pam_appl.h usability" >&5
! echo $ECHO_N "checking pam/pam_appl.h usability... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 41533,41547 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_header_compiler=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6
  
  # Is the header present?
! echo "$as_me:$LINENO: checking pam/pam_appl.h presence" >&5
! echo $ECHO_N "checking pam/pam_appl.h presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 41726,41741 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_header_compiler=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
! echo "${ECHO_T}$ac_header_compiler" >&6; }
  
  # Is the header present?
! { echo "$as_me:$LINENO: checking pam/pam_appl.h presence" >&5
! echo $ECHO_N "checking pam/pam_appl.h presence... $ECHO_C" >&6; }
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
***************
*** 41575,41583 ****
  
    ac_header_preproc=no
  fi
  rm -f conftest.err conftest.$ac_ext
! echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--- 41769,41778 ----
  
    ac_header_preproc=no
  fi
+ 
  rm -f conftest.err conftest.$ac_ext
! { echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
! echo "${ECHO_T}$ac_header_preproc" >&6; }
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
***************
*** 41611,41625 ****
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5
! echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6
  if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_cv_header_pam_pam_appl_h=$ac_header_preproc
  fi
! echo "$as_me:$LINENO: result: $ac_cv_header_pam_pam_appl_h" >&5
! echo "${ECHO_T}$ac_cv_header_pam_pam_appl_h" >&6
  
  fi
  if test $ac_cv_header_pam_pam_appl_h = yes; then
--- 41806,41820 ----
        sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
! { echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5
! echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6; }
  if test "${ac_cv_header_pam_pam_appl_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_cv_header_pam_pam_appl_h=$ac_header_preproc
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_header_pam_pam_appl_h" >&5
! echo "${ECHO_T}$ac_cv_header_pam_pam_appl_h" >&6; }
  
  fi
  if test $ac_cv_header_pam_pam_appl_h = yes; then
***************
*** 41645,41652 ****
  #define HAVE_PAM 1
  _ACEOF
  
!     echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
! echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6
  if test "${ac_cv_lib_pam_pam_start+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 41840,41847 ----
  #define HAVE_PAM 1
  _ACEOF
  
!     { echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
! echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6; }
  if test "${ac_cv_lib_pam_pam_start+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 41659,41675 ****
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
  #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
  char pam_start ();
  int
  main ()
  {
! pam_start ();
    ;
    return 0;
  }
--- 41854,41870 ----
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
! /* Override any GCC internal prototype to avoid an error.
!    Use char because int might match the return type of a GCC
!    builtin and then its argument prototype would still apply.  */
  #ifdef __cplusplus
  extern "C"
  #endif
  char pam_start ();
  int
  main ()
  {
! return pam_start ();
    ;
    return 0;
  }
***************
*** 41701,41714 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_lib_pam_pam_start=no
  fi
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
! echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6
  if test $ac_cv_lib_pam_pam_start = yes; then
    LIBS="${LIBS} -lpam"
  else
--- 41896,41910 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ac_cv_lib_pam_pam_start=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext \
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$ac_check_lib_save_LIBS
  fi
! { echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
! echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6; }
  if test $ac_cv_lib_pam_pam_start = yes; then
    LIBS="${LIBS} -lpam"
  else
***************
*** 41728,41737 ****
  
  
  
! # Check whether --enable-case-sensitivity or --disable-case-sensitivity was given.
  if test "${enable_case_sensitivity+set}" = set; then
!   enableval="$enable_case_sensitivity"
!   case "$enable_case_sensitivity" in
         yes | no | auto) ;;
         *)
            { { echo "$as_me:$LINENO: error: Unrecognized argument to --enable-case-sensitivity: \`$enable_case_sensitivity'.  Acceptable values are \`yes', \`no', and \`auto'." >&5
--- 41924,41932 ----
  
  
  
! # Check whether --enable-case-sensitivity was given.
  if test "${enable_case_sensitivity+set}" = set; then
!   enableval=$enable_case_sensitivity; case "$enable_case_sensitivity" in
         yes | no | auto) ;;
         *)
            { { echo "$as_me:$LINENO: error: Unrecognized argument to --enable-case-sensitivity: \`$enable_case_sensitivity'.  Acceptable values are \`yes', \`no', and \`auto'." >&5
***************
*** 41741,41751 ****
       esac
  else
    enable_case_sensitivity=auto
! fi;
  
  acx_forced=' (forced)'
! echo "$as_me:$LINENO: checking for a case sensitive file system" >&5
! echo $ECHO_N "checking for a case sensitive file system... $ECHO_C" >&6
  if test $enable_case_sensitivity = auto; then
          if test "${acx_cv_case_sensitive+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
--- 41936,41947 ----
       esac
  else
    enable_case_sensitivity=auto
! fi
! 
  
  acx_forced=' (forced)'
! { echo "$as_me:$LINENO: checking for a case sensitive file system" >&5
! echo $ECHO_N "checking for a case sensitive file system... $ECHO_C" >&6; }
  if test $enable_case_sensitivity = auto; then
          if test "${acx_cv_case_sensitive+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
***************
*** 41764,41771 ****
    enable_case_sensitivity=$acx_cv_case_sensitive
    acx_forced=
  fi
! echo "$as_me:$LINENO: result: $enable_case_sensitivity$acx_forced" >&5
! echo "${ECHO_T}$enable_case_sensitivity$acx_forced" >&6
  if test $enable_case_sensitivity = no; then
  
  cat >>confdefs.h <<\_ACEOF
--- 41960,41967 ----
    enable_case_sensitivity=$acx_cv_case_sensitive
    acx_forced=
  fi
! { echo "$as_me:$LINENO: result: $enable_case_sensitivity$acx_forced" >&5
! echo "${ECHO_T}$enable_case_sensitivity$acx_forced" >&6; }
  if test $enable_case_sensitivity = no; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 41777,41783 ****
    *" fncase.$ac_objext"   | \
      "fncase.$ac_objext "* | \
    *" fncase.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS fncase.$ac_objext" ;;
  esac
  
  fi
--- 41973,41980 ----
    *" fncase.$ac_objext"   | \
      "fncase.$ac_objext "* | \
    *" fncase.$ac_objext "* ) ;;
!   *) LIBOBJS="$LIBOBJS fncase.$ac_objext"
!  ;;
  esac
  
  fi
***************
*** 41785,41797 ****
  
  
  
! # Check whether --enable-encryption or --disable-encryption was given.
  if test "${enable_encryption+set}" = set; then
!   enableval="$enable_encryption"
! 
  else
    enable_encryption=no
! fi;
  if test "x$enable_encryption" = xyes; then
    if test xno = "x$with_client" && test xno = "x$with_server"; then
      { echo "$as_me:$LINENO: WARNING: --enable-encryption is meaningless when neither the CVS client
--- 41982,41994 ----
  
  
  
! # Check whether --enable-encryption was given.
  if test "${enable_encryption+set}" = set; then
!   enableval=$enable_encryption;
  else
    enable_encryption=no
! fi
! 
  if test "x$enable_encryption" = xyes; then
    if test xno = "x$with_client" && test xno = "x$with_server"; then
      { echo "$as_me:$LINENO: WARNING: --enable-encryption is meaningless when neither the CVS client
***************
*** 41810,41822 ****
  
  
  
! # Check whether --enable-force-editor or --disable-force-editor was given.
  if test "${enable_force_editor+set}" = set; then
!   enableval="$enable_force_editor"
! 
  else
    enable_force_editor=no
! fi;
  
  if test yes = "$enable_force_editor"; then
  
--- 42007,42019 ----
  
  
  
! # Check whether --enable-force-editor was given.
  if test "${enable_force_editor+set}" = set; then
!   enableval=$enable_force_editor;
  else
    enable_force_editor=no
! fi
! 
  
  if test yes = "$enable_force_editor"; then
  
***************
*** 41831,41843 ****
  
  # Check for options requesting client and server feature. If none are
  # given and we have connect(), we want the full client & server arrangement.
! # Check whether --enable-lock-compatibility or --disable-lock-compatibility was given.
  if test "${enable_lock_compatibility+set}" = set; then
!   enableval="$enable_lock_compatibility"
! 
  else
    enable_lock_compatibility=yes
! fi;
  
  if test x$enable_lock_compatibility = xyes; then
  
--- 42028,42040 ----
  
  # Check for options requesting client and server feature. If none are
  # given and we have connect(), we want the full client & server arrangement.
! # Check whether --enable-lock-compatibility was given.
  if test "${enable_lock_compatibility+set}" = set; then
!   enableval=$enable_lock_compatibility;
  else
    enable_lock_compatibility=yes
! fi
! 
  
  if test x$enable_lock_compatibility = xyes; then
  
***************
*** 41850,41862 ****
  
  
  
! # Check whether --enable-rootcommit or --disable-rootcommit was given.
  if test "${enable_rootcommit+set}" = set; then
!   enableval="$enable_rootcommit"
! 
  else
    enable_rootcommit=no
! fi;
  if test "$enable_rootcommit" = no; then
  
  cat >>confdefs.h <<\_ACEOF
--- 42047,42059 ----
  
  
  
! # Check whether --enable-rootcommit was given.
  if test "${enable_rootcommit+set}" = set; then
!   enableval=$enable_rootcommit;
  else
    enable_rootcommit=no
! fi
! 
  if test "$enable_rootcommit" = no; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 41866,41878 ****
  fi
  
  
! # Check whether --enable-old-info-support or --disable-old-info-support was given.
  if test "${enable_old_info_support+set}" = set; then
!   enableval="$enable_old_info_support"
! 
  else
    enable_old_info_format_support=yes
! fi;
  if test "$enable_old_info_format_support" = yes; then
  
  cat >>confdefs.h <<\_ACEOF
--- 42063,42075 ----
  fi
  
  
! # Check whether --enable-old-info-support was given.
  if test "${enable_old_info_support+set}" = set; then
!   enableval=$enable_old_info_support;
  else
    enable_old_info_format_support=yes
! fi
! 
  if test "$enable_old_info_format_support" = yes; then
  
  cat >>confdefs.h <<\_ACEOF
***************
*** 41884,41893 ****
  
  
  
! # Check whether --enable-config-override or --disable-config-override was given.
  if test "${enable_config_override+set}" = set; then
!   enableval="$enable_config_override"
! 
  else
    # $sysconfdir may still contain variable references.  By default, this will
     # be to $prefix, and $prefix won't be set to its default value until later.
--- 42081,42089 ----
  
  
  
! # Check whether --enable-config-override was given.
  if test "${enable_config_override+set}" = set; then
!   enableval=$enable_config_override;
  else
    # $sysconfdir may still contain variable references.  By default, this will
     # be to $prefix, and $prefix won't be set to its default value until later.
***************
*** 41898,41904 ****
     fi
     eval enable_config_override=`echo $sysconfdir/cvs.conf,$sysconfdir/cvs/`
     prefix=$cvs_save_prefix
! fi;
  
  if test x"$enable_config_override" = xyes; then
    enable_config_override=/
--- 42094,42101 ----
     fi
     eval enable_config_override=`echo $sysconfdir/cvs.conf,$sysconfdir/cvs/`
     prefix=$cvs_save_prefix
! fi
! 
  
  if test x"$enable_config_override" = xyes; then
    enable_config_override=/
***************
*** 41941,41948 ****
  
  
  
! echo "$as_me:$LINENO: checking for cygwin32" >&5
! echo $ECHO_N "checking for cygwin32... $ECHO_C" >&6
  if test "${ccvs_cv_sys_cygwin32+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 42138,42145 ----
  
  
  
! { echo "$as_me:$LINENO: checking for cygwin32" >&5
! echo $ECHO_N "checking for cygwin32... $ECHO_C" >&6; }
  if test "${ccvs_cv_sys_cygwin32+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
***************
*** 41988,41999 ****
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ccvs_cv_sys_cygwin32=no
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! echo "$as_me:$LINENO: result: $ccvs_cv_sys_cygwin32" >&5
! echo "${ECHO_T}$ccvs_cv_sys_cygwin32" >&6
  if test $ccvs_cv_sys_cygwin32 = yes; then
    LIBS="$LIBS -ladvapi32"
  
--- 42185,42197 ----
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! 	ccvs_cv_sys_cygwin32=no
  fi
+ 
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
! { echo "$as_me:$LINENO: result: $ccvs_cv_sys_cygwin32" >&5
! echo "${ECHO_T}$ccvs_cv_sys_cygwin32" >&6; }
  if test $ccvs_cv_sys_cygwin32 = yes; then
    LIBS="$LIBS -ladvapi32"
  
***************
*** 42015,42050 ****
  
  fi
  
!           ac_config_files="$ac_config_files contrib/validate_repo"
  
!           ac_config_files="$ac_config_files contrib/clmerge"
  
!           ac_config_files="$ac_config_files contrib/cln_hist"
  
!           ac_config_files="$ac_config_files contrib/commit_prep"
  
!           ac_config_files="$ac_config_files contrib/cvs_acls"
  
!           ac_config_files="$ac_config_files contrib/log"
  
!           ac_config_files="$ac_config_files contrib/log_accum"
  
!           ac_config_files="$ac_config_files contrib/mfpipe"
  
!           ac_config_files="$ac_config_files contrib/pvcs2rcs"
  
!           ac_config_files="$ac_config_files contrib/rcs2log:contrib/rcs2log.sh"
  
!           ac_config_files="$ac_config_files contrib/rcslock"
  
!           ac_config_files="$ac_config_files contrib/sccs2rcs"
  
!           ac_config_files="$ac_config_files doc/mkman:doc/mkman.pl"
  
!           ac_config_files="$ac_config_files src/cvsbug"
  
  
!                                                                                                                                                                                                         ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/pam/Makefile cvs.spec diff/Makefile doc/Makefile doc/i18n/Makefile doc/i18n/pt_BR/Makefile emx/Makefile lib/Makefile maint-aux/Makefile man/Makefile os2/Makefile src/Makefile src/sanity.config.sh tools/Makefile vms/Makefile windows-NT/Makefile windows-NT/SCC/Makefile zlib/Makefile"
  
  
  cat >confcache <<\_ACEOF
--- 42213,42248 ----
  
  fi
  
! ac_config_files="$ac_config_files contrib/validate_repo"
  
! ac_config_files="$ac_config_files contrib/clmerge"
  
! ac_config_files="$ac_config_files contrib/cln_hist"
  
! ac_config_files="$ac_config_files contrib/commit_prep"
  
! ac_config_files="$ac_config_files contrib/cvs_acls"
  
! ac_config_files="$ac_config_files contrib/log"
  
! ac_config_files="$ac_config_files contrib/log_accum"
  
! ac_config_files="$ac_config_files contrib/mfpipe"
  
! ac_config_files="$ac_config_files contrib/pvcs2rcs"
  
! ac_config_files="$ac_config_files contrib/rcs2log:contrib/rcs2log.sh"
  
! ac_config_files="$ac_config_files contrib/rcslock"
  
! ac_config_files="$ac_config_files contrib/sccs2rcs"
  
! ac_config_files="$ac_config_files doc/mkman:doc/mkman.pl"
  
! ac_config_files="$ac_config_files src/cvsbug"
  
  
! ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/pam/Makefile cvs.spec diff/Makefile doc/Makefile doc/i18n/Makefile doc/i18n/pt_BR/Makefile emx/Makefile lib/Makefile maint-aux/Makefile man/Makefile os2/Makefile src/Makefile src/sanity.config.sh tools/Makefile vms/Makefile windows-NT/Makefile windows-NT/SCC/Makefile zlib/Makefile"
  
  
  cat >confcache <<\_ACEOF
***************
*** 42087,42097 ****
  } |
    sed '
       t clear
!      : clear
       s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
       t end
       /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
!      : end' >>confcache
  if diff $cache_file confcache >/dev/null 2>&1; then :; else
    if test -w $cache_file; then
      test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
--- 42285,42295 ----
  } |
    sed '
       t clear
!      :clear
       s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
       t end
       /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
!      :end' >>confcache
  if diff $cache_file confcache >/dev/null 2>&1; then :; else
    if test -w $cache_file; then
      test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
***************
*** 42106,42137 ****
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
- # VPATH may cause trouble with some makes, so we remove $(srcdir),
- # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
- # trailing colons and then remove the whole line if VPATH becomes empty
- # (actually we leave an empty line to preserve line numbers).
- if test "x$srcdir" = x.; then
-   ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
- s/:*\$(srcdir):*/:/;
- s/:*\${srcdir}:*/:/;
- s/:*@srcdir@:*/:/;
- s/^\([^=]*=[	 ]*\):*/\1/;
- s/:*$//;
- s/^[^=]*=[	 ]*$//;
- }'
- fi
- 
  DEFS=-DHAVE_CONFIG_H
  
  ac_libobjs=
  ac_ltlibobjs=
  for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    # 1. Remove the extension, and $U if already installed.
!   ac_i=`echo "$ac_i" |
! 	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
!   # 2. Add them.
!   ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
!   ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
  done
  LIBOBJS=$ac_libobjs
  
--- 42304,42321 ----
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
  DEFS=-DHAVE_CONFIG_H
  
  ac_libobjs=
  ac_ltlibobjs=
  for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    # 1. Remove the extension, and $U if already installed.
!   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
!   ac_i=`echo "$ac_i" | sed "$ac_script"`
!   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
!   #    will be set to the directory where LIBOBJS objects are built.
!   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
!   ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
  done
  LIBOBJS=$ac_libobjs
  
***************
*** 42204,42214 ****
    # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
! elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
    set -o posix
  fi
  DUALCASE=1; export DUALCASE # for MKS sh
  
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
    as_unset=unset
--- 42388,42422 ----
    # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
!   setopt NO_GLOB_SUBST
! elif (set -o posix) >/dev/null 2>&1; then
    set -o posix
  fi
+ BIN_SH=xpg4; export BIN_SH # for Tru64
  DUALCASE=1; export DUALCASE # for MKS sh
  
+ 
+ # PATH needs CR
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+ as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+ as_cr_digits='0123456789'
+ as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+   echo "#! /bin/sh" >conf$$.sh
+   echo  "exit 0"   >>conf$$.sh
+   chmod +x conf$$.sh
+   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+     PATH_SEPARATOR=';'
+   else
+     PATH_SEPARATOR=:
+   fi
+   rm -f conf$$.sh
+ fi
+ 
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
    as_unset=unset
***************
*** 42217,42224 ****
  fi
  
  
  # Work around bugs in pre-3.0 UWIN ksh.
! $as_unset ENV MAIL MAILPATH
  PS1='$ '
  PS2='> '
  PS4='+ '
--- 42425,42458 ----
  fi
  
  
+ # Find who we are.  Look in the path if we contain no path at all
+ # relative or not.
+ case $0 in
+   *[\\/]* ) as_myself=$0 ;;
+   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+ 
+      ;;
+ esac
+ # We did not find ourselves, most probably we were run as `sh COMMAND'
+ # in which case we are not to be found in the path.
+ if test "x$as_myself" = x; then
+   as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+   { echo "$as_me: error: cannot find myself; rerun with an absolute file name" >&2
+    { (exit 1); exit 1; }; }
+ fi
+ 
  # Work around bugs in pre-3.0 UWIN ksh.
! for as_var in ENV MAIL MAILPATH
! do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
! done
  PS1='$ '
  PS2='> '
  PS4='+ '
***************
*** 42232,42238 ****
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
!     $as_unset $as_var
    fi
  done
  
--- 42466,42472 ----
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
!     ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
    fi
  done
  
***************
*** 42263,42368 ****
    	  s/.*/./; q'`
  
  
- # PATH needs CR, and LINENO needs CR and PATH.
- # Avoid depending upon Character Ranges.
- as_cr_letters='abcdefghijklmnopqrstuvwxyz'
- as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
- as_cr_Letters=$as_cr_letters$as_cr_LETTERS
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
- # The user is always right.
- if test "${PATH_SEPARATOR+set}" != set; then
-   echo "#! /bin/sh" >conf$$.sh
-   echo  "exit 0"   >>conf$$.sh
-   chmod +x conf$$.sh
-   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-     PATH_SEPARATOR=';'
-   else
-     PATH_SEPARATOR=:
-   fi
-   rm -f conf$$.sh
- fi
- 
  
-   as_lineno_1=$LINENO
-   as_lineno_2=$LINENO
-   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
-   test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-   # Find who we are.  Look in the path if we contain no path at all
-   # relative or not.
-   case $0 in
-     *[\\/]* ) as_myself=$0 ;;
-     *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
- done
  
-        ;;
-   esac
-   # We did not find ourselves, most probably we were run as `sh COMMAND'
-   # in which case we are not to be found in the path.
-   if test "x$as_myself" = x; then
-     as_myself=$0
-   fi
-   if test ! -f "$as_myself"; then
-     { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
- echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-    { (exit 1); exit 1; }; }
-   fi
-   case $CONFIG_SHELL in
-   '')
-     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for as_base in sh bash ksh sh5; do
- 	 case $as_dir in
- 	 /*)
- 	   if ("$as_dir/$as_base" -c '
    as_lineno_1=$LINENO
    as_lineno_2=$LINENO
-   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
    test "x$as_lineno_1" != "x$as_lineno_2" &&
!   test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
! 	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
! 	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
! 	     CONFIG_SHELL=$as_dir/$as_base
! 	     export CONFIG_SHELL
! 	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
! 	   fi;;
! 	 esac
!        done
! done
! ;;
!   esac
  
    # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
    # uniformly replaced by the line number.  The first 'sed' inserts a
!   # line-number line before each line; the second 'sed' does the real
!   # work.  The second script uses 'N' to pair each line-number line
!   # with the numbered line, and appends trailing '-' during
!   # substitution so that $LINENO is not a special case at line end.
    # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
!   # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
!   sed '=' <$as_myself |
      sed '
        N
!       s,$,-,
!       : loop
!       s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
        t loop
!       s,-$,,
!       s,^['$as_cr_digits']*\n,,
      ' >$as_me.lineno &&
    chmod +x $as_me.lineno ||
!     { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
! echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
     { (exit 1); exit 1; }; }
  
    # Don't try to exec as it changes $[0], causing all sort of problems
--- 42497,42536 ----
    	  s/.*/./; q'`
  
  
  
  
    as_lineno_1=$LINENO
    as_lineno_2=$LINENO
    test "x$as_lineno_1" != "x$as_lineno_2" &&
!   test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
  
    # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
    # uniformly replaced by the line number.  The first 'sed' inserts a
!   # line-number line after each line using $LINENO; the second 'sed'
!   # does the real work.  The second script uses 'N' to pair each
!   # line-number line with the line containing $LINENO, and appends
!   # trailing '-' during substitution so that $LINENO is not a special
!   # case at line end.
    # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
!   # scripts with optimization help from Paolo Bonzini.  Blame Lee
!   # E. McMahon (1931-1989) for sed's syntax.  :-)
!   sed -n '
!     p
!     /[$]LINENO/=
!   ' <$as_myself |
      sed '
+       s,[$]LINENO.*,&-,
+       t lineno
+       b
+       :lineno
        N
!       :loop
!       s,[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\),\2\1\2,
        t loop
!       s,-\n.*,,
      ' >$as_me.lineno &&
    chmod +x $as_me.lineno ||
!     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
     { (exit 1); exit 1; }; }
  
    # Don't try to exec as it changes $[0], causing all sort of problems
***************
*** 42374,42384 ****
  }
  
  
! case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
!   *c*,-n*) ECHO_N= ECHO_C='
! ' ECHO_T='	' ;;
!   *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
!   *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
  esac
  
  if expr a : '\(a\)' >/dev/null 2>&1; then
--- 42542,42556 ----
  }
  
  
! ECHO_C= ECHO_N= ECHO_T=
! case `echo -n x` in
! -n*)
!   case `echo 'x\c'` in
!   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
!   *)   ECHO_C='\c';;
!   esac;;
! *)
!   ECHO_N='-n';;
  esac
  
  if expr a : '\(a\)' >/dev/null 2>&1; then
***************
*** 42412,42418 ****
    as_mkdir_p=false
  fi
  
! as_executable_p="test -f"
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
--- 42584,42602 ----
    as_mkdir_p=false
  fi
  
! # Find out whether ``test -x'' works.  Don't use a zero-byte file, as
! # systems may use methods other than mode bits to determine executability.
! cat >conf$$.file <<_ASEOF
! #! /bin/sh
! exit 0
! _ASEOF
! chmod +x conf$$.file
! if test -x conf$$.file >/dev/null 2>&1; then
!   as_executable_p="test -x"
! else
!   as_executable_p=:
! fi
! rm -f conf$$.file
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
***************
*** 42432,42451 ****
  
  exec 6>&1
  
! # Open the log real soon, to keep \$[0] and so on meaningful, and to
  # report actual input values of CONFIG_FILES etc. instead of their
! # values after options handling.  Logging --version etc. is OK.
! exec 5>>config.log
! {
!   echo
!   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
! ## Running $as_me. ##
! _ASBOX
! } >&5
! cat >&5 <<_CSEOF
! 
  This file was extended by Concurrent Versions System (CVS) $as_me 1.12.13, which was
! generated by GNU Autoconf 2.59.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
--- 42616,42627 ----
  
  exec 6>&1
  
! # Save the log message, to keep $[0] and so on meaningful, and to
  # report actual input values of CONFIG_FILES etc. instead of their
! # values after options handling.
! ac_log="
  This file was extended by Concurrent Versions System (CVS) $as_me 1.12.13, which was
! generated by GNU Autoconf 2.59cvs-20051231.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
***************
*** 42453,42482 ****
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
! _CSEOF
! echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
! echo >&5
  _ACEOF
  
  # Files that config.status was made for.
! if test -n "$ac_config_files"; then
!   echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
! fi
! 
! if test -n "$ac_config_headers"; then
!   echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
! fi
  
! if test -n "$ac_config_links"; then
!   echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
! fi
! 
! if test -n "$ac_config_commands"; then
!   echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
! fi
  
  cat >>$CONFIG_STATUS <<\_ACEOF
- 
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
--- 42629,42648 ----
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
! on `(hostname || uname -n) 2>/dev/null | sed 1q`
! "
! 
  _ACEOF
  
+ cat >>$CONFIG_STATUS <<_ACEOF
  # Files that config.status was made for.
! config_files="$ac_config_files"
! config_headers="$ac_config_headers"
! config_commands="$ac_config_commands"
  
! _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
***************
*** 42503,42521 ****
  $config_commands
  
  Report bugs to <bug-autoconf@gnu.org>."
- _ACEOF
  
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
  Concurrent Versions System (CVS) config.status 1.12.13
! configured by $0, generated by GNU Autoconf 2.59,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  
! Copyright (C) 2003 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
! srcdir=$srcdir
! INSTALL="$INSTALL"
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
--- 42669,42690 ----
  $config_commands
  
  Report bugs to <bug-autoconf@gnu.org>."
  
+ _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
  Concurrent Versions System (CVS) config.status 1.12.13
! configured by $0, generated by GNU Autoconf 2.59cvs-20051231,
    with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
  
! Copyright (C) 2005 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
! 
! ac_pwd='$ac_pwd'
! srcdir='$srcdir'
! INSTALL='$INSTALL'
! 
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
***************
*** 42526,42564 ****
  do
    case $1 in
    --*=*)
!     ac_option=`expr "x$1" : 'x\([^=]*\)='`
!     ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
      ac_shift=:
      ;;
!   -*)
      ac_option=$1
      ac_optarg=$2
      ac_shift=shift
      ;;
-   *) # This is not an option, so the user has probably given explicit
-      # arguments.
-      ac_option=$1
-      ac_need_defaults=false;;
    esac
  
    case $ac_option in
    # Handling of the options.
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
      ac_cs_recheck=: ;;
!   --version | --vers* | -V )
!     echo "$ac_cs_version"; exit 0 ;;
!   --he | --h)
!     # Conflict between --help and --header
!     { { echo "$as_me:$LINENO: error: ambiguous option: $1
! Try \`$0 --help' for more information." >&5
! echo "$as_me: error: ambiguous option: $1
! Try \`$0 --help' for more information." >&2;}
!    { (exit 1); exit 1; }; };;
!   --help | --hel | -h )
!     echo "$ac_cs_usage"; exit 0 ;;
!   --debug | --d* | -d )
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
--- 42695,42718 ----
  do
    case $1 in
    --*=*)
!     ac_option=`expr "X$1" : 'X\([^=]*\)='`
!     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
      ac_shift=:
      ;;
!   *)
      ac_option=$1
      ac_optarg=$2
      ac_shift=shift
      ;;
    esac
  
    case $ac_option in
    # Handling of the options.
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
      ac_cs_recheck=: ;;
!   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
!     echo "$ac_cs_version"; exit ;;
!   --debug | --debu | --deb | --de | --d | -d )
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
***************
*** 42568,42585 ****
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil | --si | --s)
      ac_cs_silent=: ;;
  
    # This is an error.
!   -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
! Try \`$0 --help' for more information." >&5
! echo "$as_me: error: unrecognized option: $1
! Try \`$0 --help' for more information." >&2;}
     { (exit 1); exit 1; }; } ;;
  
!   *) ac_config_targets="$ac_config_targets $1" ;;
  
    esac
    shift
--- 42722,42745 ----
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
+   --he | --h)
+     # Conflict between --help and --header
+     { echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2
+    { (exit 1); exit 1; }; };;
+   --help | --hel | -h )
+     echo "$ac_cs_usage"; exit ;;
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil | --si | --s)
      ac_cs_silent=: ;;
  
    # This is an error.
!   -*) { echo "$as_me: error: unrecognized option: $1
! Try \`$0 --help' for more information." >&2
     { (exit 1); exit 1; }; } ;;
  
!   *) ac_config_targets="$ac_config_targets $1"
!      ac_need_defaults=false ;;
  
    esac
    shift
***************
*** 42592,42611 ****
    ac_configure_extra_args="$ac_configure_extra_args --silent"
  fi
  
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
!   echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
    exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
  fi
- 
- _ACEOF
- 
- cat >>$CONFIG_STATUS <<_ACEOF
  #
! # INIT-COMMANDS section.
  #
- 
  AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
  # Capture the value of obsolete ALL_LINGUAS because we need it to compute
      # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
--- 42752,42777 ----
    ac_configure_extra_args="$ac_configure_extra_args --silent"
  fi
  
+ exec 5>>config.log
+ {
+   echo
+   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+ ## Running $as_me. ##
+ _ASBOX
+   echo "$ac_log"
+ } >&5
+ 
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
!   echo "running CONFIG_SHELL=$SHELL $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
!   CONFIG_SHELL=$SHELL
!   export CONFIG_SHELL
    exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
  fi
  #
! # INIT-COMMANDS
  #
  AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
  # Capture the value of obsolete ALL_LINGUAS because we need it to compute
      # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
***************
*** 42617,42672 ****
  
  _ACEOF
  
- 
- 
  cat >>$CONFIG_STATUS <<\_ACEOF
  for ac_config_target in $ac_config_targets
  do
!   case "$ac_config_target" in
!   # Handling of arguments.
!   "contrib/validate_repo" ) CONFIG_FILES="$CONFIG_FILES contrib/validate_repo" ;;
!   "contrib/clmerge" ) CONFIG_FILES="$CONFIG_FILES contrib/clmerge" ;;
!   "contrib/cln_hist" ) CONFIG_FILES="$CONFIG_FILES contrib/cln_hist" ;;
!   "contrib/commit_prep" ) CONFIG_FILES="$CONFIG_FILES contrib/commit_prep" ;;
!   "contrib/cvs_acls" ) CONFIG_FILES="$CONFIG_FILES contrib/cvs_acls" ;;
!   "contrib/log" ) CONFIG_FILES="$CONFIG_FILES contrib/log" ;;
!   "contrib/log_accum" ) CONFIG_FILES="$CONFIG_FILES contrib/log_accum" ;;
!   "contrib/mfpipe" ) CONFIG_FILES="$CONFIG_FILES contrib/mfpipe" ;;
!   "contrib/pvcs2rcs" ) CONFIG_FILES="$CONFIG_FILES contrib/pvcs2rcs" ;;
!   "contrib/rcs2log" ) CONFIG_FILES="$CONFIG_FILES contrib/rcs2log:contrib/rcs2log.sh" ;;
!   "contrib/rcslock" ) CONFIG_FILES="$CONFIG_FILES contrib/rcslock" ;;
!   "contrib/sccs2rcs" ) CONFIG_FILES="$CONFIG_FILES contrib/sccs2rcs" ;;
!   "doc/mkman" ) CONFIG_FILES="$CONFIG_FILES doc/mkman:doc/mkman.pl" ;;
!   "src/cvsbug" ) CONFIG_FILES="$CONFIG_FILES src/cvsbug" ;;
!   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
!   "contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
!   "contrib/pam/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/pam/Makefile" ;;
!   "cvs.spec" ) CONFIG_FILES="$CONFIG_FILES cvs.spec" ;;
!   "diff/Makefile" ) CONFIG_FILES="$CONFIG_FILES diff/Makefile" ;;
!   "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
!   "doc/i18n/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/i18n/Makefile" ;;
!   "doc/i18n/pt_BR/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/i18n/pt_BR/Makefile" ;;
!   "emx/Makefile" ) CONFIG_FILES="$CONFIG_FILES emx/Makefile" ;;
!   "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
!   "maint-aux/Makefile" ) CONFIG_FILES="$CONFIG_FILES maint-aux/Makefile" ;;
!   "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
!   "os2/Makefile" ) CONFIG_FILES="$CONFIG_FILES os2/Makefile" ;;
!   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
!   "src/sanity.config.sh" ) CONFIG_FILES="$CONFIG_FILES src/sanity.config.sh" ;;
!   "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
!   "vms/Makefile" ) CONFIG_FILES="$CONFIG_FILES vms/Makefile" ;;
!   "windows-NT/Makefile" ) CONFIG_FILES="$CONFIG_FILES windows-NT/Makefile" ;;
!   "windows-NT/SCC/Makefile" ) CONFIG_FILES="$CONFIG_FILES windows-NT/SCC/Makefile" ;;
!   "zlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES zlib/Makefile" ;;
!   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
!   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
!   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
     { (exit 1); exit 1; }; };;
    esac
  done
  
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
--- 42783,42840 ----
  
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+ # Handling of arguments.
  for ac_config_target in $ac_config_targets
  do
!   case $ac_config_target in
!     config.h) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
!     emx-new/common.h) CONFIG_HEADERS="$CONFIG_HEADERS emx-new/common.h" ;;
!     depfiles) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
!     default-1) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
!     contrib/validate_repo) CONFIG_FILES="$CONFIG_FILES contrib/validate_repo" ;;
!     contrib/clmerge) CONFIG_FILES="$CONFIG_FILES contrib/clmerge" ;;
!     contrib/cln_hist) CONFIG_FILES="$CONFIG_FILES contrib/cln_hist" ;;
!     contrib/commit_prep) CONFIG_FILES="$CONFIG_FILES contrib/commit_prep" ;;
!     contrib/cvs_acls) CONFIG_FILES="$CONFIG_FILES contrib/cvs_acls" ;;
!     contrib/log) CONFIG_FILES="$CONFIG_FILES contrib/log" ;;
!     contrib/log_accum) CONFIG_FILES="$CONFIG_FILES contrib/log_accum" ;;
!     contrib/mfpipe) CONFIG_FILES="$CONFIG_FILES contrib/mfpipe" ;;
!     contrib/pvcs2rcs) CONFIG_FILES="$CONFIG_FILES contrib/pvcs2rcs" ;;
!     contrib/rcs2log) CONFIG_FILES="$CONFIG_FILES contrib/rcs2log:contrib/rcs2log.sh" ;;
!     contrib/rcslock) CONFIG_FILES="$CONFIG_FILES contrib/rcslock" ;;
!     contrib/sccs2rcs) CONFIG_FILES="$CONFIG_FILES contrib/sccs2rcs" ;;
!     doc/mkman) CONFIG_FILES="$CONFIG_FILES doc/mkman:doc/mkman.pl" ;;
!     src/cvsbug) CONFIG_FILES="$CONFIG_FILES src/cvsbug" ;;
!     Makefile) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
!     contrib/Makefile) CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
!     contrib/pam/Makefile) CONFIG_FILES="$CONFIG_FILES contrib/pam/Makefile" ;;
!     cvs.spec) CONFIG_FILES="$CONFIG_FILES cvs.spec" ;;
!     diff/Makefile) CONFIG_FILES="$CONFIG_FILES diff/Makefile" ;;
!     doc/Makefile) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
!     doc/i18n/Makefile) CONFIG_FILES="$CONFIG_FILES doc/i18n/Makefile" ;;
!     doc/i18n/pt_BR/Makefile) CONFIG_FILES="$CONFIG_FILES doc/i18n/pt_BR/Makefile" ;;
!     emx/Makefile) CONFIG_FILES="$CONFIG_FILES emx/Makefile" ;;
!     lib/Makefile) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
!     maint-aux/Makefile) CONFIG_FILES="$CONFIG_FILES maint-aux/Makefile" ;;
!     man/Makefile) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
!     os2/Makefile) CONFIG_FILES="$CONFIG_FILES os2/Makefile" ;;
!     src/Makefile) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
!     src/sanity.config.sh) CONFIG_FILES="$CONFIG_FILES src/sanity.config.sh" ;;
!     tools/Makefile) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
!     vms/Makefile) CONFIG_FILES="$CONFIG_FILES vms/Makefile" ;;
!     windows-NT/Makefile) CONFIG_FILES="$CONFIG_FILES windows-NT/Makefile" ;;
!     windows-NT/SCC/Makefile) CONFIG_FILES="$CONFIG_FILES windows-NT/SCC/Makefile" ;;
!     zlib/Makefile) CONFIG_FILES="$CONFIG_FILES zlib/Makefile" ;;
! 
    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
     { (exit 1); exit 1; }; };;
    esac
  done
  
+ 
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
***************
*** 42678,42914 ****
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
! # simply because there is no reason to put it here, and in addition,
  # creating and moving files from /tmp can sometimes cause problems.
! # Create a temporary directory, and hook for its removal unless debugging.
  $debug ||
  {
!   trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
    trap '{ (exit 1); exit 1; }' 1 2 13 15
  }
- 
  # Create a (secure) tmp directory for tmp files.
  
  {
!   tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
    test -n "$tmp" && test -d "$tmp"
  }  ||
  {
!   tmp=./confstat$$-$RANDOM
!   (umask 077 && mkdir $tmp)
  } ||
  {
     echo "$me: cannot create a temporary directory in ." >&2
     { (exit 1); exit 1; }
  }
  
- _ACEOF
- 
- cat >>$CONFIG_STATUS <<_ACEOF
- 
  #
! # CONFIG_FILES section.
  #
  
  # No need to generate the scripts if there are no CONFIG_FILES.
  # This happens for instance when ./config.status config.h
! if test -n "\$CONFIG_FILES"; then
!   # Protect against being on the right side of a sed subst in config.status.
!   sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
!    s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
! s,@SHELL@,$SHELL,;t t
! s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
! s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
! s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
! s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
! s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
! s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
! s,@exec_prefix@,$exec_prefix,;t t
! s,@prefix@,$prefix,;t t
! s,@program_transform_name@,$program_transform_name,;t t
! s,@bindir@,$bindir,;t t
! s,@sbindir@,$sbindir,;t t
! s,@libexecdir@,$libexecdir,;t t
! s,@datadir@,$datadir,;t t
! s,@sysconfdir@,$sysconfdir,;t t
! s,@sharedstatedir@,$sharedstatedir,;t t
! s,@localstatedir@,$localstatedir,;t t
! s,@libdir@,$libdir,;t t
! s,@includedir@,$includedir,;t t
! s,@oldincludedir@,$oldincludedir,;t t
! s,@infodir@,$infodir,;t t
! s,@mandir@,$mandir,;t t
! s,@build_alias@,$build_alias,;t t
! s,@host_alias@,$host_alias,;t t
! s,@target_alias@,$target_alias,;t t
! s,@DEFS@,$DEFS,;t t
! s,@ECHO_C@,$ECHO_C,;t t
! s,@ECHO_N@,$ECHO_N,;t t
! s,@ECHO_T@,$ECHO_T,;t t
! s,@LIBS@,$LIBS,;t t
! s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
! s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
! s,@INSTALL_DATA@,$INSTALL_DATA,;t t
! s,@CYGPATH_W@,$CYGPATH_W,;t t
! s,@PACKAGE@,$PACKAGE,;t t
! s,@VERSION@,$VERSION,;t t
! s,@ACLOCAL@,$ACLOCAL,;t t
! s,@AUTOCONF@,$AUTOCONF,;t t
! s,@AUTOMAKE@,$AUTOMAKE,;t t
! s,@AUTOHEADER@,$AUTOHEADER,;t t
! s,@MAKEINFO@,$MAKEINFO,;t t
! s,@install_sh@,$install_sh,;t t
! s,@STRIP@,$STRIP,;t t
! s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
! s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
! s,@mkdir_p@,$mkdir_p,;t t
! s,@AWK@,$AWK,;t t
! s,@SET_MAKE@,$SET_MAKE,;t t
! s,@am__leading_dot@,$am__leading_dot,;t t
! s,@AMTAR@,$AMTAR,;t t
! s,@am__tar@,$am__tar,;t t
! s,@am__untar@,$am__untar,;t t
! s,@ac_prefix_program@,$ac_prefix_program,;t t
! s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
! s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
! s,@MAINT@,$MAINT,;t t
! s,@CC@,$CC,;t t
! s,@CFLAGS@,$CFLAGS,;t t
! s,@LDFLAGS@,$LDFLAGS,;t t
! s,@CPPFLAGS@,$CPPFLAGS,;t t
! s,@ac_ct_CC@,$ac_ct_CC,;t t
! s,@EXEEXT@,$EXEEXT,;t t
! s,@OBJEXT@,$OBJEXT,;t t
! s,@DEPDIR@,$DEPDIR,;t t
! s,@am__include@,$am__include,;t t
! s,@am__quote@,$am__quote,;t t
! s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
! s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
! s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
! s,@CCDEPMODE@,$CCDEPMODE,;t t
! s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
! s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
! s,@CPP@,$CPP,;t t
! s,@EGREP@,$EGREP,;t t
! s,@RANLIB@,$RANLIB,;t t
! s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
! s,@LN_S@,$LN_S,;t t
! s,@PERL@,$PERL,;t t
! s,@CSH@,$CSH,;t t
! s,@MKTEMP@,$MKTEMP,;t t
! s,@SENDMAIL@,$SENDMAIL,;t t
! s,@PR@,$PR,;t t
! s,@ROFF@,$ROFF,;t t
! s,@PS2PDF@,$PS2PDF,;t t
! s,@TEXI2DVI@,$TEXI2DVI,;t t
! s,@MAKE_TARGETS_IN_VPATH_TRUE@,$MAKE_TARGETS_IN_VPATH_TRUE,;t t
! s,@MAKE_TARGETS_IN_VPATH_FALSE@,$MAKE_TARGETS_IN_VPATH_FALSE,;t t
! s,@LIBOBJS@,$LIBOBJS,;t t
! s,@ALLOCA@,$ALLOCA,;t t
! s,@ALLOCA_H@,$ALLOCA_H,;t t
! s,@STDBOOL_H@,$STDBOOL_H,;t t
! s,@HAVE__BOOL@,$HAVE__BOOL,;t t
! s,@FNMATCH_H@,$FNMATCH_H,;t t
! s,@YACC@,$YACC,;t t
! s,@YFLAGS@,$YFLAGS,;t t
! s,@LIB_CLOCK_GETTIME@,$LIB_CLOCK_GETTIME,;t t
! s,@GETOPT_H@,$GETOPT_H,;t t
! s,@GLOB_H@,$GLOB_H,;t t
! s,@LIB_NANOSLEEP@,$LIB_NANOSLEEP,;t t
! s,@HAVE_LONG_64BIT@,$HAVE_LONG_64BIT,;t t
! s,@HAVE_LONG_LONG_64BIT@,$HAVE_LONG_LONG_64BIT,;t t
! s,@STDINT_H@,$STDINT_H,;t t
! s,@EOVERFLOW@,$EOVERFLOW,;t t
! s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
! s,@USE_NLS@,$USE_NLS,;t t
! s,@MSGFMT@,$MSGFMT,;t t
! s,@GMSGFMT@,$GMSGFMT,;t t
! s,@XGETTEXT@,$XGETTEXT,;t t
! s,@MSGMERGE@,$MSGMERGE,;t t
! s,@build@,$build,;t t
! s,@build_cpu@,$build_cpu,;t t
! s,@build_vendor@,$build_vendor,;t t
! s,@build_os@,$build_os,;t t
! s,@host@,$host,;t t
! s,@host_cpu@,$host_cpu,;t t
! s,@host_vendor@,$host_vendor,;t t
! s,@host_os@,$host_os,;t t
! s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t
! s,@LIBICONV@,$LIBICONV,;t t
! s,@LTLIBICONV@,$LTLIBICONV,;t t
! s,@INTLLIBS@,$INTLLIBS,;t t
! s,@LIBINTL@,$LIBINTL,;t t
! s,@LTLIBINTL@,$LTLIBINTL,;t t
! s,@POSUB@,$POSUB,;t t
! s,@cvs_client_objects@,$cvs_client_objects,;t t
! s,@KRB4@,$KRB4,;t t
! s,@ZLIB_SUBDIRS@,$ZLIB_SUBDIRS,;t t
! s,@ZLIB_CPPFLAGS@,$ZLIB_CPPFLAGS,;t t
! s,@ZLIB_LIBS@,$ZLIB_LIBS,;t t
! s,@with_default_rsh@,$with_default_rsh,;t t
! s,@RSH_DFLT@,$RSH_DFLT,;t t
! s,@EDITOR@,$EDITOR,;t t
! s,@LTLIBOBJS@,$LTLIBOBJS,;t t
! /@MKTEMP_SH_FUNCTION@/r $MKTEMP_SH_FUNCTION
! s,@MKTEMP_SH_FUNCTION@,,;t t
! CEOF
! 
! _ACEOF
! 
!   cat >>$CONFIG_STATUS <<\_ACEOF
!   # Split the substitutions into bite-sized pieces for seds with
!   # small command number limits, like on Digital OSF/1 and HP-UX.
!   ac_max_sed_lines=48
!   ac_sed_frag=1 # Number of current file.
!   ac_beg=1 # First line for current file.
!   ac_end=$ac_max_sed_lines # Line after last line for current file.
!   ac_more_lines=:
!   ac_sed_cmds=
!   while $ac_more_lines; do
!     if test $ac_beg -gt 1; then
!       sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
!     else
!       sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
!     fi
!     if test ! -s $tmp/subs.frag; then
!       ac_more_lines=false
!     else
!       # The purpose of the label and of the branching condition is to
!       # speed up the sed processing (if there are no `@' at all, there
!       # is no need to browse any of the substitutions).
!       # These are the two extra sed commands mentioned above.
!       (echo ':t
!   /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
!       if test -z "$ac_sed_cmds"; then
! 	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
!       else
! 	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
!       fi
!       ac_sed_frag=`expr $ac_sed_frag + 1`
!       ac_beg=$ac_end
!       ac_end=`expr $ac_end + $ac_max_sed_lines`
!     fi
!   done
!   if test -z "$ac_sed_cmds"; then
!     ac_sed_cmds=cat
    fi
! fi # test -n "$CONFIG_FILES"
  
  _ACEOF
  cat >>$CONFIG_STATUS <<\_ACEOF
! for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
!   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
!   case $ac_file in
!   - | *:- | *:-:* ) # input from stdin
! 	cat >$tmp/stdin
! 	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
! 	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
!   *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
! 	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
!   * )   ac_file_in=$ac_file.in ;;
    esac
  
-   # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
    ac_dir=`(dirname "$ac_file") 2>/dev/null ||
  $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  	 X"$ac_file" : 'X\(//\)[^/]' \| \
--- 42846,43201 ----
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
! # simply because there is no reason against having it here, and in addition,
  # creating and moving files from /tmp can sometimes cause problems.
! # Hook for its removal unless debugging.
! # Note that there is a small window in which the directory will not be cleaned:
! # after its creation but before its name has been assigned to `$tmp'.
  $debug ||
  {
!   tmp=
!   trap 'exit_status=$?
!   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
! ' 0
    trap '{ (exit 1); exit 1; }' 1 2 13 15
  }
  # Create a (secure) tmp directory for tmp files.
  
  {
!   tmp=`(umask 077 && mktemp -d -q "./confXXXXXX") 2>/dev/null` &&
    test -n "$tmp" && test -d "$tmp"
  }  ||
  {
!   tmp=./conf$$-$RANDOM
!   (umask 077 && mkdir "$tmp")
  } ||
  {
     echo "$me: cannot create a temporary directory in ." >&2
     { (exit 1); exit 1; }
  }
  
  #
! # Set up the sed scripts for CONFIG_FILES section.
  #
  
  # No need to generate the scripts if there are no CONFIG_FILES.
  # This happens for instance when ./config.status config.h
! if test -n "$CONFIG_FILES"; then
! 
! _ACEOF
! 
! # Create sed commands to just substitute file output variables.
! 
! # Remaining file output variables are in a fragment that also has non-file
! # output varibles.
! 
! 
! 
! ac_delim='%!_!# '
! for ac_last_try in false false false false false :; do
!   cat >conf$$subs.sed <<_ACEOF
! SHELL!$SHELL$ac_delim
! PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
! PACKAGE_NAME!$PACKAGE_NAME$ac_delim
! PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
! PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
! PACKAGE_STRING!$PACKAGE_STRING$ac_delim
! PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
! exec_prefix!$exec_prefix$ac_delim
! prefix!$prefix$ac_delim
! program_transform_name!$program_transform_name$ac_delim
! bindir!$bindir$ac_delim
! sbindir!$sbindir$ac_delim
! libexecdir!$libexecdir$ac_delim
! datarootdir!$datarootdir$ac_delim
! datadir!$datadir$ac_delim
! sysconfdir!$sysconfdir$ac_delim
! sharedstatedir!$sharedstatedir$ac_delim
! localstatedir!$localstatedir$ac_delim
! includedir!$includedir$ac_delim
! oldincludedir!$oldincludedir$ac_delim
! docdir!$docdir$ac_delim
! infodir!$infodir$ac_delim
! htmldir!$htmldir$ac_delim
! dvidir!$dvidir$ac_delim
! pdfdir!$pdfdir$ac_delim
! psdir!$psdir$ac_delim
! libdir!$libdir$ac_delim
! localedir!$localedir$ac_delim
! mandir!$mandir$ac_delim
! DEFS!$DEFS$ac_delim
! ECHO_C!$ECHO_C$ac_delim
! ECHO_N!$ECHO_N$ac_delim
! ECHO_T!$ECHO_T$ac_delim
! LIBS!$LIBS$ac_delim
! build_alias!$build_alias$ac_delim
! host_alias!$host_alias$ac_delim
! target_alias!$target_alias$ac_delim
! INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
! INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
! INSTALL_DATA!$INSTALL_DATA$ac_delim
! CYGPATH_W!$CYGPATH_W$ac_delim
! PACKAGE!$PACKAGE$ac_delim
! VERSION!$VERSION$ac_delim
! ACLOCAL!$ACLOCAL$ac_delim
! AUTOCONF!$AUTOCONF$ac_delim
! AUTOMAKE!$AUTOMAKE$ac_delim
! AUTOHEADER!$AUTOHEADER$ac_delim
! MAKEINFO!$MAKEINFO$ac_delim
! install_sh!$install_sh$ac_delim
! STRIP!$STRIP$ac_delim
! INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
! mkdir_p!$mkdir_p$ac_delim
! AWK!$AWK$ac_delim
! SET_MAKE!$SET_MAKE$ac_delim
! am__leading_dot!$am__leading_dot$ac_delim
! AMTAR!$AMTAR$ac_delim
! am__tar!$am__tar$ac_delim
! am__untar!$am__untar$ac_delim
! ac_prefix_program!$ac_prefix_program$ac_delim
! MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
! MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
! MAINT!$MAINT$ac_delim
! CC!$CC$ac_delim
! CFLAGS!$CFLAGS$ac_delim
! LDFLAGS!$LDFLAGS$ac_delim
! CPPFLAGS!$CPPFLAGS$ac_delim
! ac_ct_CC!$ac_ct_CC$ac_delim
! EXEEXT!$EXEEXT$ac_delim
! OBJEXT!$OBJEXT$ac_delim
! DEPDIR!$DEPDIR$ac_delim
! am__include!$am__include$ac_delim
! am__quote!$am__quote$ac_delim
! AMDEP_TRUE!$AMDEP_TRUE$ac_delim
! AMDEP_FALSE!$AMDEP_FALSE$ac_delim
! AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
! CCDEPMODE!$CCDEPMODE$ac_delim
! am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
! am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
! CPP!$CPP$ac_delim
! GREP!$GREP$ac_delim
! EGREP!$EGREP$ac_delim
! RANLIB!$RANLIB$ac_delim
! LN_S!$LN_S$ac_delim
! PERL!$PERL$ac_delim
! CSH!$CSH$ac_delim
! MKTEMP!$MKTEMP$ac_delim
! SENDMAIL!$SENDMAIL$ac_delim
! PR!$PR$ac_delim
! ROFF!$ROFF$ac_delim
! PS2PDF!$PS2PDF$ac_delim
! TEXI2DVI!$TEXI2DVI$ac_delim
! MAKE_TARGETS_IN_VPATH_TRUE!$MAKE_TARGETS_IN_VPATH_TRUE$ac_delim
! MAKE_TARGETS_IN_VPATH_FALSE!$MAKE_TARGETS_IN_VPATH_FALSE$ac_delim
! LIBOBJS!$LIBOBJS$ac_delim
! _ACEOF
! 
!   if test `grep -c "$ac_delim\$" conf$$subs.sed` = 94; then
!     break
!   elif $ac_last_try; then
!     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
! echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
!    { (exit 1); exit 1; }; }
!   else
!     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
    fi
! done
! 
! ac_eof=
! if grep '^CEOF$' conf$$subs.sed >/dev/null; then
!   ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
!   ac_eof=`expr 0$ac_eof + 1`
! fi
! 
! cat >>$CONFIG_STATUS <<_ACEOF
! cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
! /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
! /^[ 	]*@MKTEMP_SH_FUNCTION@[ 	]*$/{ r $MKTEMP_SH_FUNCTION
! d; }
! _ACEOF
! sed '
! s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
! s/^/s,@/; s/!/@,|#_!!_#|/
! :n
! t n
! s/'"$ac_delim"'$/,g/; t
! s/$/\\/; p
! N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
! ' >>$CONFIG_STATUS <conf$$subs.sed
! rm -f conf$$subs.sed
! cat >>$CONFIG_STATUS <<_ACEOF
! CEOF$ac_eof
! _ACEOF
! 
! 
! ac_delim='%!_!# '
! for ac_last_try in false false false false false :; do
!   cat >conf$$subs.sed <<_ACEOF
! ALLOCA!$ALLOCA$ac_delim
! ALLOCA_H!$ALLOCA_H$ac_delim
! STDBOOL_H!$STDBOOL_H$ac_delim
! HAVE__BOOL!$HAVE__BOOL$ac_delim
! FNMATCH_H!$FNMATCH_H$ac_delim
! YACC!$YACC$ac_delim
! YFLAGS!$YFLAGS$ac_delim
! LIB_CLOCK_GETTIME!$LIB_CLOCK_GETTIME$ac_delim
! GETOPT_H!$GETOPT_H$ac_delim
! GLOB_H!$GLOB_H$ac_delim
! LIB_NANOSLEEP!$LIB_NANOSLEEP$ac_delim
! HAVE_LONG_64BIT!$HAVE_LONG_64BIT$ac_delim
! HAVE_LONG_LONG_64BIT!$HAVE_LONG_LONG_64BIT$ac_delim
! STDINT_H!$STDINT_H$ac_delim
! EOVERFLOW!$EOVERFLOW$ac_delim
! MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
! USE_NLS!$USE_NLS$ac_delim
! MSGFMT!$MSGFMT$ac_delim
! GMSGFMT!$GMSGFMT$ac_delim
! XGETTEXT!$XGETTEXT$ac_delim
! MSGMERGE!$MSGMERGE$ac_delim
! build!$build$ac_delim
! build_cpu!$build_cpu$ac_delim
! build_vendor!$build_vendor$ac_delim
! build_os!$build_os$ac_delim
! host!$host$ac_delim
! host_cpu!$host_cpu$ac_delim
! host_vendor!$host_vendor$ac_delim
! host_os!$host_os$ac_delim
! INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
! LIBICONV!$LIBICONV$ac_delim
! LTLIBICONV!$LTLIBICONV$ac_delim
! INTLLIBS!$INTLLIBS$ac_delim
! LIBINTL!$LIBINTL$ac_delim
! LTLIBINTL!$LTLIBINTL$ac_delim
! POSUB!$POSUB$ac_delim
! cvs_client_objects!$cvs_client_objects$ac_delim
! KRB4!$KRB4$ac_delim
! ZLIB_SUBDIRS!$ZLIB_SUBDIRS$ac_delim
! ZLIB_CPPFLAGS!$ZLIB_CPPFLAGS$ac_delim
! ZLIB_LIBS!$ZLIB_LIBS$ac_delim
! with_default_rsh!$with_default_rsh$ac_delim
! RSH_DFLT!$RSH_DFLT$ac_delim
! EDITOR!$EDITOR$ac_delim
! LTLIBOBJS!$LTLIBOBJS$ac_delim
! _ACEOF
! 
!   if test `grep -c "$ac_delim\$" conf$$subs.sed` = 45; then
!     break
!   elif $ac_last_try; then
!     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
! echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
!    { (exit 1); exit 1; }; }
!   else
!     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
!   fi
! done
! 
! ac_eof=
! if grep '^CEOF$' conf$$subs.sed >/dev/null; then
!   ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF//p' conf$$subs.sed | sort -nru | sed 1q`
!   ac_eof=`expr 0$ac_eof + 1`
! fi
  
+ cat >>$CONFIG_STATUS <<_ACEOF
+ cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+ _ACEOF
+ sed '
+ s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+ s/^/s,@/; s/!/@,|#_!!_#|/
+ :n
+ t n
+ s/'"$ac_delim"'$/,g/; t
+ s/$/\\/; p
+ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+ ' >>$CONFIG_STATUS <conf$$subs.sed
+ rm -f conf$$subs.sed
+ cat >>$CONFIG_STATUS <<_ACEOF
+ :end
+ s/|#_!!_#|//g
+ CEOF$ac_eof
  _ACEOF
+ 
+ 
+ # VPATH may cause trouble with some makes, so we remove $(srcdir),
+ # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+ # (actually we leave an empty line to preserve line numbers).
+ if test "x$srcdir" = x.; then
+   ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+ s/:*\$(srcdir):*/:/;
+ s/:*\${srcdir}:*/:/;
+ s/:*@srcdir@:*/:/;
+ s/^\([^=]*=[	 ]*\):*/\1/;
+ s/:*$//;
+ s/^[^=]*=[	 ]*$//;
+ }'
+ fi
+ 
  cat >>$CONFIG_STATUS <<\_ACEOF
! fi # test -n "$CONFIG_FILES"
! 
! 
! for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
! do
!   case $ac_tag in
!   :[FHLC]) ac_mode=$ac_tag; continue;;
!   esac
!   case $ac_mode$ac_tag in
!   :[FHL]*:*);;
!   :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
! echo "$as_me: error: Invalid tag $ac_tag." >&2;}
!    { (exit 1); exit 1; }; };;
!   :[FH]-) ac_tag=-:-;;
!   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
!   esac
!   ac_save_IFS=$IFS
!   IFS=:
!   set x $ac_tag
!   IFS=$ac_save_IFS
!   shift
!   ac_file=$1
!   shift
! 
!   case $ac_mode in
!   :L) ac_source=$1;;
!   :[FH])
!     ac_file_inputs=
!     for ac_f
!     do
!       case $ac_f in
!       -) ac_f="$tmp/stdin";;
!       *) # Look for the file first in the build tree, then in the source tree
! 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
! 	 # because $ac_f cannot contain `:'.
! 	 test -f "$ac_f" ||
! 	   case $ac_f in
! 	   [\\/$]*) false;;
! 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
! 	   esac ||
! 	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
! echo "$as_me: error: cannot find input file: $ac_f" >&2;}
!    { (exit 1); exit 1; }; };;
!       esac
!       ac_file_inputs="$ac_file_inputs $ac_f"
!     done
! 
!     # Let's still pretend it is `configure' which instantiates (i.e., don't
!     # use $as_me), people would be surprised to read:
!     #    /* config.h.  Generated by config.status.  */
!     configure_input="Generated from "`IFS=:
! 	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
!     if test x"$ac_file" != x-; then
!       configure_input="$ac_file.  $configure_input"
!       { echo "$as_me:$LINENO: creating $ac_file" >&5
! echo "$as_me: creating $ac_file" >&6;}
!     fi
! 
!     case $ac_tag in
!     *:-:* | *:-) cat >"$tmp/stdin";;
!     esac
!     ;;
    esac
  
    ac_dir=`(dirname "$ac_file") 2>/dev/null ||
  $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  	 X"$ac_file" : 'X\(//\)[^/]' \| \
***************
*** 42922,42928 ****
    	  /^X\(\/\).*/{ s//\1/; q; }
    	  s/.*/./; q'`
    { if $as_mkdir_p; then
!     mkdir -p "$ac_dir"
    else
      as_dir="$ac_dir"
      as_dirs=
--- 43209,43215 ----
    	  /^X\(\/\).*/{ s//\1/; q; }
    	  s/.*/./; q'`
    { if $as_mkdir_p; then
!     test -d "$ac_dir" || mkdir -p "$ac_dir"
    else
      as_dir="$ac_dir"
      as_dirs=
***************
*** 42948,43066 ****
  
    ac_builddir=.
  
! if test "$ac_dir" != .; then
    ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
!   # A "../" for each directory in $ac_dir_suffix.
!   ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
! else
!   ac_dir_suffix= ac_top_builddir=
! fi
  
  case $srcdir in
!   .)  # No --srcdir option.  We are building in place.
      ac_srcdir=.
!     if test -z "$ac_top_builddir"; then
!        ac_top_srcdir=.
!     else
!        ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
!     fi ;;
!   [\\/]* | ?:[\\/]* )  # Absolute path.
      ac_srcdir=$srcdir$ac_dir_suffix;
!     ac_top_srcdir=$srcdir ;;
!   *) # Relative path.
!     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
!     ac_top_srcdir=$ac_top_builddir$srcdir ;;
  esac
  
- # Do not use `cd foo && pwd` to compute absolute paths, because
- # the directories may not exist.
- case `pwd` in
- .) ac_abs_builddir="$ac_dir";;
- *)
-   case "$ac_dir" in
-   .) ac_abs_builddir=`pwd`;;
-   [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-   *) ac_abs_builddir=`pwd`/"$ac_dir";;
-   esac;;
- esac
- case $ac_abs_builddir in
- .) ac_abs_top_builddir=${ac_top_builddir}.;;
- *)
-   case ${ac_top_builddir}. in
-   .) ac_abs_top_builddir=$ac_abs_builddir;;
-   [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-   *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-   esac;;
- esac
- case $ac_abs_builddir in
- .) ac_abs_srcdir=$ac_srcdir;;
- *)
-   case $ac_srcdir in
-   .) ac_abs_srcdir=$ac_abs_builddir;;
-   [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-   *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-   esac;;
- esac
- case $ac_abs_builddir in
- .) ac_abs_top_srcdir=$ac_top_srcdir;;
- *)
-   case $ac_top_srcdir in
-   .) ac_abs_top_srcdir=$ac_abs_builddir;;
-   [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-   *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-   esac;;
- esac
  
  
    case $INSTALL in
    [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
!   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
-   if test x"$ac_file" != x-; then
-     { echo "$as_me:$LINENO: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
-   #    /* config.h.  Generated by config.status.  */
-   if test x"$ac_file" = x-; then
-     configure_input=
-   else
-     configure_input="$ac_file.  "
-   fi
-   configure_input=$configure_input"Generated from `echo $ac_file_in |
- 				     sed 's,.*/,,'` by configure."
- 
-   # First look for the input files in the build tree, otherwise in the
-   # src tree.
-   ac_file_inputs=`IFS=:
-     for f in $ac_file_in; do
-       case $f in
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
- 	 # Absolute (can't be DOS-style, as IFS=:)
- 	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
- 	 echo "$f";;
-       *) # Relative
- 	 if test -f "$f"; then
- 	   # Build tree
- 	   echo "$f"
- 	 elif test -f "$srcdir/$f"; then
- 	   # Source tree
- 	   echo "$srcdir/$f"
- 	 else
- 	   # /dev/null tree
- 	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
- 	 fi;;
-       esac
-     done` || { (exit 1); exit 1; }
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
  $extrasub
--- 43235,43289 ----
  
    ac_builddir=.
  
! case "$ac_dir" in
! .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
! *)
    ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
!   # A ".." for each directory in $ac_dir_suffix.
!   ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
!   case $ac_top_builddir_sub in
!   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
!   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
!   esac ;;
! esac
! ac_abs_top_builddir=$ac_pwd
! ac_abs_builddir=$ac_pwd$ac_dir_suffix
! # for backward compatibility:
! ac_top_builddir=$ac_top_build_prefix
  
  case $srcdir in
!   .)  # We are building in place.
      ac_srcdir=.
!     ac_top_srcdir=$ac_top_builddir_sub
!     ac_abs_top_srcdir=$ac_pwd ;;
!   [\\/]* | ?:[\\/]* )  # Absolute name.
      ac_srcdir=$srcdir$ac_dir_suffix;
!     ac_top_srcdir=$srcdir
!     ac_abs_top_srcdir=$srcdir ;;
!   *) # Relative name.
!     ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
!     ac_top_srcdir=$ac_top_build_prefix$srcdir
!     ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
  esac
+ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
  
  
+   case $ac_mode in
+   :F)
+   #
+   # CONFIG_FILE
+   #
  
    case $INSTALL in
    [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
!   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
    esac
  
  _ACEOF
+ 
+ # Neutralize VPATH when `$srcdir' = `.'.
+ # Shell code in configure.ac might set extrasub.
+ # FIXME: do we really want to maintain this feature?
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
  $extrasub
***************
*** 43068,43332 ****
  cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
! s,@configure_input@,$configure_input,;t t
! s,@srcdir@,$ac_srcdir,;t t
! s,@abs_srcdir@,$ac_abs_srcdir,;t t
! s,@top_srcdir@,$ac_top_srcdir,;t t
! s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
! s,@builddir@,$ac_builddir,;t t
! s,@abs_builddir@,$ac_abs_builddir,;t t
! s,@top_builddir@,$ac_top_builddir,;t t
! s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
! s,@INSTALL@,$ac_INSTALL,;t t
! " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
!   rm -f $tmp/stdin
!   if test x"$ac_file" != x-; then
!     mv $tmp/out $ac_file
!   else
!     cat $tmp/out
!     rm -f $tmp/out
!   fi
! 
!   # Run the commands associated with the file.
!   case $ac_file in
!     contrib/validate_repo ) chmod +x contrib/validate_repo ;;
!     contrib/clmerge ) chmod +x contrib/clmerge ;;
!     contrib/cln_hist ) chmod +x contrib/cln_hist ;;
!     contrib/commit_prep ) chmod +x contrib/commit_prep ;;
!     contrib/cvs_acls ) chmod +x contrib/cvs_acls ;;
!     contrib/log ) chmod +x contrib/log ;;
!     contrib/log_accum ) chmod +x contrib/log_accum ;;
!     contrib/mfpipe ) chmod +x contrib/mfpipe ;;
!     contrib/pvcs2rcs ) chmod +x contrib/pvcs2rcs ;;
!     contrib/rcs2log ) chmod +x contrib/rcs2log ;;
!     contrib/rcslock ) chmod +x contrib/rcslock ;;
!     contrib/sccs2rcs ) chmod +x contrib/sccs2rcs ;;
!     doc/mkman ) chmod +x doc/mkman ;;
!     src/cvsbug ) chmod +x src/cvsbug ;;
!   esac
! done
! _ACEOF
! cat >>$CONFIG_STATUS <<\_ACEOF
! 
! #
! # CONFIG_HEADER section.
! #
! 
! # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
! # NAME is the cpp macro being defined and VALUE is the value it is being given.
! #
! # ac_d sets the value in "#define NAME VALUE" lines.
! ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
! ac_dB='[	 ].*$,\1#\2'
! ac_dC=' '
! ac_dD=',;t'
! # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
! ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
! ac_uB='$,\1#\2define\3'
! ac_uC=' '
! ac_uD=',;t'
  
! 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
!   - | *:- | *:-:* ) # input from stdin
! 	cat >$tmp/stdin
! 	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
! 	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
!   *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
! 	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
!   * )   ac_file_in=$ac_file.in ;;
    esac
  
!   test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
! echo "$as_me: creating $ac_file" >&6;}
! 
!   # First look for the input files in the build tree, otherwise in the
!   # src tree.
!   ac_file_inputs=`IFS=:
!     for f in $ac_file_in; do
!       case $f in
!       -) echo $tmp/stdin ;;
!       [\\/$]*)
! 	 # Absolute (can't be DOS-style, as IFS=:)
! 	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
! echo "$as_me: error: cannot find input file: $f" >&2;}
!    { (exit 1); exit 1; }; }
! 	 # Do quote $f, to prevent DOS paths from being IFS'd.
! 	 echo "$f";;
!       *) # Relative
! 	 if test -f "$f"; then
! 	   # Build tree
! 	   echo "$f"
! 	 elif test -f "$srcdir/$f"; then
! 	   # Source tree
! 	   echo "$srcdir/$f"
! 	 else
! 	   # /dev/null tree
! 	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
! echo "$as_me: error: cannot find input file: $f" >&2;}
!    { (exit 1); exit 1; }; }
! 	 fi;;
!       esac
!     done` || { (exit 1); exit 1; }
!   # Remove the trailing spaces.
!   sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
! 
! _ACEOF
! 
! # Transform confdefs.h into two sed scripts, `conftest.defines' and
! # `conftest.undefs', that substitutes the proper values into
! # config.h.in to produce config.h.  The first handles `#define'
! # templates, and the second `#undef' templates.
! # And first: Protect against being on the right side of a sed subst in
! # config.status.  Protect against being in an unquoted here document
! # in config.status.
! rm -f conftest.defines conftest.undefs
! # Using a here document instead of a string reduces the quoting nightmare.
! # Putting comments in sed scripts is not portable.
! #
! # `end' is used to avoid that the second main sed command (meant for
! # 0-ary CPP macros) applies to n-ary macro definitions.
! # See the Autoconf documentation for `clear'.
! cat >confdef2sed.sed <<\_ACEOF
! s/[\\&,]/\\&/g
! s,[\\$`],\\&,g
! t clear
! : clear
! s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
! t end
! s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
! : end
! _ACEOF
! # If some macros were called several times there might be several times
! # the same #defines, which is useless.  Nevertheless, we may not want to
! # sort them, since we want the *last* AC-DEFINE to be honored.
! uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
! sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
! rm -f confdef2sed.sed
  
! # This sed command replaces #undef with comments.  This is necessary, for
  # example, in the case of _POSIX_SOURCE, which is predefined and required
  # on some systems where configure will not decide to define it.
! cat >>conftest.undefs <<\_ACEOF
! s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
! _ACEOF
! 
! # Break up conftest.defines because some shells have a limit on the size
! # of here documents, and old seds have small limits too (100 cmds).
! echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
! echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
! echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
! echo '  :' >>$CONFIG_STATUS
! rm -f conftest.tail
! while grep . conftest.defines >/dev/null
! do
!   # Write a limited-size here document to $tmp/defines.sed.
!   echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
!   # Speed up: don't consider the non `#define' lines.
!   echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
!   # Work around the forget-to-reset-the-flag bug.
!   echo 't clr' >>$CONFIG_STATUS
!   echo ': clr' >>$CONFIG_STATUS
!   sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
    echo 'CEOF
!   sed -f $tmp/defines.sed $tmp/in >$tmp/out
!   rm -f $tmp/in
!   mv $tmp/out $tmp/in
! ' >>$CONFIG_STATUS
!   sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
    rm -f conftest.defines
    mv conftest.tail conftest.defines
  done
! rm -f conftest.defines
! echo '  fi # grep' >>$CONFIG_STATUS
! echo >>$CONFIG_STATUS
! 
! # Break up conftest.undefs because some shells have a limit on the size
! # of here documents, and old seds have small limits too (100 cmds).
! echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
! rm -f conftest.tail
! while grep . conftest.undefs >/dev/null
! do
!   # Write a limited-size here document to $tmp/undefs.sed.
!   echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
!   # Speed up: don't consider the non `#undef'
!   echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
!   # Work around the forget-to-reset-the-flag bug.
!   echo 't clr' >>$CONFIG_STATUS
!   echo ': clr' >>$CONFIG_STATUS
!   sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
!   echo 'CEOF
!   sed -f $tmp/undefs.sed $tmp/in >$tmp/out
!   rm -f $tmp/in
!   mv $tmp/out $tmp/in
! ' >>$CONFIG_STATUS
!   sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
!   rm -f conftest.undefs
!   mv conftest.tail conftest.undefs
! done
! rm -f conftest.undefs
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
-   #    /* config.h.  Generated by config.status.  */
-   if test x"$ac_file" = x-; then
-     echo "/* Generated by configure.  */" >$tmp/config.h
-   else
-     echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-   fi
-   cat $tmp/in >>$tmp/config.h
-   rm -f $tmp/in
    if test x"$ac_file" != x-; then
!     if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
        { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
  echo "$as_me: $ac_file is unchanged" >&6;}
      else
-       ac_dir=`(dirname "$ac_file") 2>/dev/null ||
- $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$ac_file" : 'X\(//\)[^/]' \| \
- 	 X"$ac_file" : 'X\(//\)$' \| \
- 	 X"$ac_file" : 'X\(/\)' \| \
- 	 .     : '\(.\)' 2>/dev/null ||
- echo X"$ac_file" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-   	  /^X\(\/\/\)$/{ s//\1/; q; }
-   	  /^X\(\/\).*/{ s//\1/; q; }
-   	  s/.*/./; q'`
-       { if $as_mkdir_p; then
-     mkdir -p "$ac_dir"
-   else
-     as_dir="$ac_dir"
-     as_dirs=
-     while test ! -d "$as_dir"; do
-       as_dirs="$as_dir $as_dirs"
-       as_dir=`(dirname "$as_dir") 2>/dev/null ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$as_dir" : 'X\(//\)[^/]' \| \
- 	 X"$as_dir" : 'X\(//\)$' \| \
- 	 X"$as_dir" : 'X\(/\)' \| \
- 	 .     : '\(.\)' 2>/dev/null ||
- echo X"$as_dir" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-   	  /^X\(\/\/\)$/{ s//\1/; q; }
-   	  /^X\(\/\).*/{ s//\1/; q; }
-   	  s/.*/./; q'`
-     done
-     test ! -n "$as_dirs" || mkdir $as_dirs
-   fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
- echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-    { (exit 1); exit 1; }; }; }
- 
        rm -f $ac_file
!       mv $tmp/config.h $ac_file
      fi
    else
!     cat $tmp/config.h
!     rm -f $tmp/config.h
    fi
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
--- 43291,43412 ----
  cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
! s&@configure_input@&$configure_input&;t t
! s&@top_builddir@&$ac_top_builddir_sub&;t t
! s&@srcdir@&$ac_srcdir&;t t
! s&@abs_srcdir@&$ac_abs_srcdir&;t t
! s&@top_srcdir@&$ac_top_srcdir&;t t
! s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
! s&@builddir@&$ac_builddir&;t t
! s&@abs_builddir@&$ac_abs_builddir&;t t
! s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
! s&@INSTALL@&$ac_INSTALL&;t t
! " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
  
!   rm -f "$tmp/stdin"
    case $ac_file in
!   -) cat "$tmp/out"; rm -f "$tmp/out";;
!   *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
    esac
+  ;;
+   :H)
+   #
+   # CONFIG_HEADER
+   #
  
!   # These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
!   # NAME is the cpp macro being defined, VALUE is the value it is being given.
!   # PARAMS is the parameter list in the macro definition--in most cases, it's
!   # just an empty string.
!   #
!   ac_dA='s,^\([	 ]*#[	 ]*\)[^	 ]*\([	 ][	 ]*'
!   ac_dB='\)[ 	(].*$,\1define\2'
!   ac_dC=' '
!   ac_dD=' ,'
! 
!   ac_word_regexp=[_$as_cr_Letters][_$as_cr_alnum]*
! _ACEOF
! 
! # Transform confdefs.h into a sed script `conftest.defines', that
! # substitutes the proper values into config.h.in to produce config.h.
! rm -f conftest.defines conftest.tail
! # First, append a space to every undef/define line, to ease matching.
! echo 's/$/ /' >conftest.defines
! # Then, protect against being on the right side of a sed subst, or in
! # an unquoted here document, in config.status.  If some macros were
! # called several times there might be several #defines for the same
! # symbol, which is useless.  But do not sort them, since the last
! # AC_DEFINE must be honored.
! ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
! uniq confdefs.h |
!   sed -n '
! 	t rset
! 	:rset
! 	s/^[ 	]*#[ 	]*define[ 	][	 ]*//
! 	t ok
! 	d
! 	:ok
! 	s/[\\&,]/\\&/g
! 	s/[\\$`]/\\&/g
! 	s/^\('"$ac_word_re"'\)\(([^()]*)\)[ 	]*\(.*\)/${ac_dA}\1$ac_dB\2${ac_dC}\3$ac_dD/p
! 	s/^\('"$ac_word_re"'\)[ 	]*\(.*\)/${ac_dA}\1$ac_dB${ac_dC}\2$ac_dD/p
!   ' >>conftest.defines
  
! # Remove the space that was appended to ease matching.
! # Then replace #undef with comments.  This is necessary, for
  # example, in the case of _POSIX_SOURCE, which is predefined and required
  # on some systems where configure will not decide to define it.
! # (The regexp can be short, since the line contains either #define or #undef.)
! echo 's/ $//
! s,^[	 #]*u.*,/* & */,' >>conftest.defines
! 
! # Break up conftest.defines:
! ac_max_sed_lines=97
! 
! # First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
! # Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
! # Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
! # et cetera.
! ac_in='$ac_file_inputs'
! ac_out='"$tmp/out1"'
! ac_nxt='"$tmp/out2"'
! 
! while :
! do
!   # Write a here document:
!     echo '    # First, check the format of the line:
!     cat >"$tmp/defines.sed" <<CEOF
! /^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_regexp[ 	]*$/!{
! /^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_regexp[( 	]/!b
! }' >>$CONFIG_STATUS
!   sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
    echo 'CEOF
!     sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
!   ac_in=$ac_out ac_out=$ac_nxt ac_nxt=$ac_in
!   sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
!   grep . conftest.tail >/dev/null || break
    rm -f conftest.defines
    mv conftest.tail conftest.defines
  done
! rm -f conftest.defines conftest.tail
  
+ echo "ac_result=$ac_in" >>$CONFIG_STATUS
  cat >>$CONFIG_STATUS <<\_ACEOF
    if test x"$ac_file" != x-; then
!     echo "/* $configure_input  */" >"$tmp/config.h"
!     cat "$ac_result" >>"$tmp/config.h"
!     if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
        { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
  echo "$as_me: $ac_file is unchanged" >&6;}
      else
        rm -f $ac_file
!       mv "$tmp/config.h" $ac_file
      fi
    else
!     echo "/* $configure_input  */"
!     cat "$ac_result"
    fi
+   rm -f "$tmp/out12"
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
***************
*** 43349,43471 ****
    	  /^X\(\/\/\)$/{ s//\1/; q; }
    	  /^X\(\/\).*/{ s//\1/; q; }
    	  s/.*/./; q'`/stamp-h$_am_stamp_count
! done
! _ACEOF
! cat >>$CONFIG_STATUS <<\_ACEOF
! 
! #
! # CONFIG_COMMANDS section.
! #
! for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
!   ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
!   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
!   ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
! $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
! 	 X"$ac_dest" : 'X\(//\)[^/]' \| \
! 	 X"$ac_dest" : 'X\(//\)$' \| \
! 	 X"$ac_dest" : 'X\(/\)' \| \
! 	 .     : '\(.\)' 2>/dev/null ||
! echo X"$ac_dest" |
!     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
!   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
!   	  /^X\(\/\/\)$/{ s//\1/; q; }
!   	  /^X\(\/\).*/{ s//\1/; q; }
!   	  s/.*/./; q'`
!   { if $as_mkdir_p; then
!     mkdir -p "$ac_dir"
!   else
!     as_dir="$ac_dir"
!     as_dirs=
!     while test ! -d "$as_dir"; do
!       as_dirs="$as_dir $as_dirs"
!       as_dir=`(dirname "$as_dir") 2>/dev/null ||
! $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
! 	 X"$as_dir" : 'X\(//\)[^/]' \| \
! 	 X"$as_dir" : 'X\(//\)$' \| \
! 	 X"$as_dir" : 'X\(/\)' \| \
! 	 .     : '\(.\)' 2>/dev/null ||
! echo X"$as_dir" |
!     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
!   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
!   	  /^X\(\/\/\)$/{ s//\1/; q; }
!   	  /^X\(\/\).*/{ s//\1/; q; }
!   	  s/.*/./; q'`
!     done
!     test ! -n "$as_dirs" || mkdir $as_dirs
!   fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
! echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
!    { (exit 1); exit 1; }; }; }
! 
!   ac_builddir=.
! 
! if test "$ac_dir" != .; then
!   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
!   # A "../" for each directory in $ac_dir_suffix.
!   ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
! else
!   ac_dir_suffix= ac_top_builddir=
! fi
! 
! case $srcdir in
!   .)  # No --srcdir option.  We are building in place.
!     ac_srcdir=.
!     if test -z "$ac_top_builddir"; then
!        ac_top_srcdir=.
!     else
!        ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
!     fi ;;
!   [\\/]* | ?:[\\/]* )  # Absolute path.
!     ac_srcdir=$srcdir$ac_dir_suffix;
!     ac_top_srcdir=$srcdir ;;
!   *) # Relative path.
!     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
!     ac_top_srcdir=$ac_top_builddir$srcdir ;;
! esac
  
! # Do not use `cd foo && pwd` to compute absolute paths, because
! # the directories may not exist.
! case `pwd` in
! .) ac_abs_builddir="$ac_dir";;
! *)
!   case "$ac_dir" in
!   .) ac_abs_builddir=`pwd`;;
!   [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
!   *) ac_abs_builddir=`pwd`/"$ac_dir";;
!   esac;;
! esac
! case $ac_abs_builddir in
! .) ac_abs_top_builddir=${ac_top_builddir}.;;
! *)
!   case ${ac_top_builddir}. in
!   .) ac_abs_top_builddir=$ac_abs_builddir;;
!   [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
!   *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
!   esac;;
! esac
! case $ac_abs_builddir in
! .) ac_abs_srcdir=$ac_srcdir;;
! *)
!   case $ac_srcdir in
!   .) ac_abs_srcdir=$ac_abs_builddir;;
!   [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
!   *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
!   esac;;
! esac
! case $ac_abs_builddir in
! .) ac_abs_top_srcdir=$ac_top_srcdir;;
! *)
!   case $ac_top_srcdir in
!   .) ac_abs_top_srcdir=$ac_abs_builddir;;
!   [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
!   *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
!   esac;;
! esac
  
  
!   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
! echo "$as_me: executing $ac_dest commands" >&6;}
!   case $ac_dest in
!     depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
    # Strip MF so we end up with the name of the file.
    mf=`echo "$mf" | sed -e 's/:.*$//'`
    # Check whether this is an Automake generated Makefile or not.
--- 43429,43444 ----
    	  /^X\(\/\/\)$/{ s//\1/; q; }
    	  /^X\(\/\).*/{ s//\1/; q; }
    	  s/.*/./; q'`/stamp-h$_am_stamp_count
!  ;;
  
!   :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
! echo "$as_me: executing $ac_file commands" >&6;}
!  ;;
!   esac
  
  
!   case $ac_file$ac_mode in
!     depfiles:C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
    # Strip MF so we end up with the name of the file.
    mf=`echo "$mf" | sed -e 's/:.*$//'`
    # Check whether this is an Automake generated Makefile or not.
***************
*** 43521,43527 ****
    	  /^X\(\/\).*/{ s//\1/; q; }
    	  s/.*/./; q'`
      { if $as_mkdir_p; then
!     mkdir -p $dirpart/$fdir
    else
      as_dir=$dirpart/$fdir
      as_dirs=
--- 43494,43500 ----
    	  /^X\(\/\).*/{ s//\1/; q; }
    	  s/.*/./; q'`
      { if $as_mkdir_p; then
!     test -d $dirpart/$fdir || mkdir -p $dirpart/$fdir
    else
      as_dir=$dirpart/$fdir
      as_dirs=
***************
*** 43550,43556 ****
    done
  done
   ;;
!     default-1 )
      for ac_file in $CONFIG_FILES; do
        # Support "outfile[:infile[:infile...]]"
        case "$ac_file" in
--- 43523,43529 ----
    done
  done
   ;;
!     default-1:C)
      for ac_file in $CONFIG_FILES; do
        # Support "outfile[:infile[:infile...]]"
        case "$ac_file" in
***************
*** 43662,43672 ****
          ;;
        esac
      done ;;
    esac
! done
! _ACEOF
  
- cat >>$CONFIG_STATUS <<\_ACEOF
  
  { (exit 0); exit 0; }
  _ACEOF
--- 43635,43658 ----
          ;;
        esac
      done ;;
+     contrib/validate_repo:F) chmod +x contrib/validate_repo ;;
+     contrib/clmerge:F) chmod +x contrib/clmerge ;;
+     contrib/cln_hist:F) chmod +x contrib/cln_hist ;;
+     contrib/commit_prep:F) chmod +x contrib/commit_prep ;;
+     contrib/cvs_acls:F) chmod +x contrib/cvs_acls ;;
+     contrib/log:F) chmod +x contrib/log ;;
+     contrib/log_accum:F) chmod +x contrib/log_accum ;;
+     contrib/mfpipe:F) chmod +x contrib/mfpipe ;;
+     contrib/pvcs2rcs:F) chmod +x contrib/pvcs2rcs ;;
+     contrib/rcs2log:F) chmod +x contrib/rcs2log ;;
+     contrib/rcslock:F) chmod +x contrib/rcslock ;;
+     contrib/sccs2rcs:F) chmod +x contrib/sccs2rcs ;;
+     doc/mkman:F) chmod +x doc/mkman ;;
+     src/cvsbug:F) chmod +x src/cvsbug ;;
+ 
    esac
! done # for ac_tag
  
  
  { (exit 0); exit 0; }
  _ACEOF
Index: configure.in
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/configure.in,v
retrieving revision 1.1.1.13
retrieving revision 1.1.3.1.4.9
diff -c -r1.1.1.13 -r1.1.3.1.4.9
*** configure.in	3 Oct 2005 03:34:26 -0000	1.1.1.13
--- configure.in	19 Jul 2006 17:44:57 -0000	1.1.3.1.4.9
***************
*** 24,29 ****
--- 24,30 ----
  
  AC_PREFIX_PROGRAM(cvs)
  AM_CONFIG_HEADER(config.h)
+ AM_CONFIG_HEADER(emx-new/common.h)
  AM_MAINTAINER_MODE
  
  dnl This needs to be called to enable certain system extensions before calling
***************
*** 708,714 ****
  # Set the default when --with-editor wasn't supplied or when it was supplied
  # without an argument.
  if test yes = $with_editor; then
!   with_editor="vim vi emacs nano pico edit"
  fi
  
  if echo $with_editor |grep ^/ >/dev/null; then
--- 709,715 ----
  # Set the default when --with-editor wasn't supplied or when it was supplied
  # without an argument.
  if test yes = $with_editor; then
!   with_editor="vim vi emacs nano pico edit e"
  fi
  
  if echo $with_editor |grep ^/ >/dev/null; then
Index: contrib/Makefile.in
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/contrib/Makefile.in,v
retrieving revision 1.1.1.12
retrieving revision 1.1.3.1.4.9
diff -c -r1.1.1.12 -r1.1.3.1.4.9
*** contrib/Makefile.in	3 Oct 2005 03:36:54 -0000	1.1.1.12
--- contrib/Makefile.in	19 Jul 2006 17:44:57 -0000	1.1.3.1.4.9
***************
*** 133,139 ****
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES = validate_repo clmerge cln_hist commit_prep \
  	cvs_acls log log_accum mfpipe pvcs2rcs rcs2log rcslock \
  	sccs2rcs
--- 133,140 ----
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h \
! 	$(top_builddir)/emx-new/common.h
  CONFIG_CLEAN_FILES = validate_repo clmerge cln_hist commit_prep \
  	cvs_acls log log_accum mfpipe pvcs2rcs rcs2log rcslock \
  	sccs2rcs
***************
*** 190,195 ****
--- 191,197 ----
  GETOPT_H = @GETOPT_H@
  GLOB_H = @GLOB_H@
  GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
  HAVE_LONG_64BIT = @HAVE_LONG_64BIT@
  HAVE_LONG_LONG_64BIT = @HAVE_LONG_LONG_64BIT@
  HAVE__BOOL = @HAVE__BOOL@
***************
*** 252,259 ****
  ZLIB_LIBS = @ZLIB_LIBS@
  ZLIB_SUBDIRS = @ZLIB_SUBDIRS@
  ac_ct_CC = @ac_ct_CC@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
  ac_prefix_program = @ac_prefix_program@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--- 254,259 ----
***************
*** 270,292 ****
--- 270,299 ----
  build_vendor = @build_vendor@
  cvs_client_objects = @cvs_client_objects@
  datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
+ htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
+ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
Index: contrib/cvs_acls.html
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/contrib/cvs_acls.html,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.2.1
diff -c -r1.1.1.2 -r1.1.1.2.2.1
*** contrib/cvs_acls.html	20 Jul 2005 00:39:54 -0000	1.1.1.2
--- contrib/cvs_acls.html	19 Jul 2006 17:44:57 -0000	1.1.1.2.2.1
***************
*** 211,217 ****
  <p>It was developed and tested under Red Hat Linux 9.0 using PERL 5.8.0.
  Additionally, it was built and tested under Red Hat Linux 7.3 using 
  PERL 5.6.1.</p>
! <p>$Id: cvs_acls.html,v 1.1.1.2 2005/07/20 00:39:54 root Exp $</p>
  <p>This version is based on the 1.11.13 version of cvs_acls
  <a href="mailto:peter.connolly@cnet.com">peter.connolly@cnet.com</a> (Peter Connolly)</p>
  <pre>
--- 211,217 ----
  <p>It was developed and tested under Red Hat Linux 9.0 using PERL 5.8.0.
  Additionally, it was built and tested under Red Hat Linux 7.3 using 
  PERL 5.6.1.</p>
! <p>$Id: cvs_acls.html,v 1.1.1.2.2.1 2006/07/19 17:44:57 andrew_belov Exp $</p>
  <p>This version is based on the 1.11.13 version of cvs_acls
  <a href="mailto:peter.connolly@cnet.com">peter.connolly@cnet.com</a> (Peter Connolly)</p>
  <pre>
Index: contrib/cvs_acls.in
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/contrib/cvs_acls.in,v
retrieving revision 1.1.1.4
retrieving revision 1.1.2.3
diff -c -r1.1.1.4 -r1.1.2.3
*** contrib/cvs_acls.in	1 Sep 2005 03:48:50 -0000	1.1.1.4
--- contrib/cvs_acls.in	19 Jul 2006 17:44:57 -0000	1.1.2.3
***************
*** 235,241 ****
  Additionally, it was built and tested under Red Hat Linux 7.3 using 
  PERL 5.6.1.
  
! $Id: cvs_acls.in,v 1.1.1.4 2005/09/01 03:48:50 root Exp $
  
  This version is based on the 1.11.13 version of cvs_acls
  peter.connolly@cnet.com (Peter Connolly) 
--- 235,241 ----
  Additionally, it was built and tested under Red Hat Linux 7.3 using 
  PERL 5.6.1.
  
! $Id: cvs_acls.in,v 1.1.2.3 2006/07/19 17:44:57 andrew_belov Exp $
  
  This version is based on the 1.11.13 version of cvs_acls
  peter.connolly@cnet.com (Peter Connolly) 
Index: contrib/rcs2log.sh
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/contrib/rcs2log.sh,v
retrieving revision 1.1.1.5
retrieving revision 1.1.3.2.4.5
diff -c -r1.1.1.5 -r1.1.3.2.4.5
*** contrib/rcs2log.sh	12 Jul 2005 04:12:46 -0000	1.1.1.5
--- contrib/rcs2log.sh	19 Jul 2006 17:44:57 -0000	1.1.3.2.4.5
***************
*** 41,47 ****
  
  Report bugs to <bug-gnu-emacs@gnu.org>.'
  
! Id='$Id: rcs2log.sh,v 1.1.1.5 2005/07/12 04:12:46 root Exp $'
  
  # Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2003
  #  Free Software Foundation, Inc.
--- 41,47 ----
  
  Report bugs to <bug-gnu-emacs@gnu.org>.'
  
! Id='$Id: rcs2log.sh,v 1.1.3.2.4.5 2006/07/19 17:44:57 andrew_belov Exp $'
  
  # Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2003
  #  Free Software Foundation, Inc.
Index: contrib/pam/Makefile.in
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/contrib/pam/Makefile.in,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.2.1
diff -c -r1.1.1.2 -r1.1.1.2.2.1
*** contrib/pam/Makefile.in	3 Oct 2005 03:37:00 -0000	1.1.1.2
--- contrib/pam/Makefile.in	19 Jul 2006 17:44:57 -0000	1.1.1.2.2.1
***************
*** 120,126 ****
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
--- 120,127 ----
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h \
! 	$(top_builddir)/emx-new/common.h
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
***************
*** 155,160 ****
--- 156,162 ----
  GETOPT_H = @GETOPT_H@
  GLOB_H = @GLOB_H@
  GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
  HAVE_LONG_64BIT = @HAVE_LONG_64BIT@
  HAVE_LONG_LONG_64BIT = @HAVE_LONG_LONG_64BIT@
  HAVE__BOOL = @HAVE__BOOL@
***************
*** 217,224 ****
  ZLIB_LIBS = @ZLIB_LIBS@
  ZLIB_SUBDIRS = @ZLIB_SUBDIRS@
  ac_ct_CC = @ac_ct_CC@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
  ac_prefix_program = @ac_prefix_program@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--- 219,224 ----
***************
*** 235,257 ****
--- 235,264 ----
  build_vendor = @build_vendor@
  cvs_client_objects = @cvs_client_objects@
  datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
+ htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
+ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
Index: diff/ChangeLog
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/diff/ChangeLog,v
retrieving revision 1.1.1.13
retrieving revision 1.1.3.2.4.8
diff -c -r1.1.1.13 -r1.1.3.2.4.8
*** diff/ChangeLog	4 Sep 2005 15:34:24 -0000	1.1.1.13
--- diff/ChangeLog	19 Jul 2006 17:44:57 -0000	1.1.3.2.4.8
***************
*** 361,366 ****
--- 361,378 ----
  
  	* Makefile.in: Some changes to support Automake targets
  
+ 2000-12-20  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* util.c, diff3.c, diff.c: Updated to version 1.11
+ 
+ 2000-12-19  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* util.c, diff.c, diff3.c: Imported the 1.11 release
+ 
+ 2000-12-03  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* diff.c: Applied the Halibut patches
+ 
  2000-10-26  Larry Jones  <larry.jones@sdrc.com>
  
  	* Makefile.in: Get PR_PROGRAM from autoconf instead of hard coding.
Index: diff/Makefile.in
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/diff/Makefile.in,v
retrieving revision 1.1.1.10
retrieving revision 1.1.3.1.4.7
diff -c -r1.1.1.10 -r1.1.3.1.4.7
*** diff/Makefile.in	3 Oct 2005 03:37:04 -0000	1.1.1.10
--- diff/Makefile.in	19 Jul 2006 17:44:57 -0000	1.1.3.1.4.7
***************
*** 109,115 ****
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LIBRARIES = $(noinst_LIBRARIES)
  AR = ar
--- 109,116 ----
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h \
! 	$(top_builddir)/emx-new/common.h
  CONFIG_CLEAN_FILES =
  LIBRARIES = $(noinst_LIBRARIES)
  AR = ar
***************
*** 122,128 ****
  	ifdef.$(OBJEXT) util.$(OBJEXT) dir.$(OBJEXT) version.$(OBJEXT) \
  	side.$(OBJEXT)
  libdiff_a_OBJECTS = $(am_libdiff_a_OBJECTS)
! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
  am__depfiles_maybe = depfiles
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--- 123,129 ----
  	ifdef.$(OBJEXT) util.$(OBJEXT) dir.$(OBJEXT) version.$(OBJEXT) \
  	side.$(OBJEXT)
  libdiff_a_OBJECTS = $(am_libdiff_a_OBJECTS)
! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/emx-new
  depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
  am__depfiles_maybe = depfiles
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
***************
*** 164,169 ****
--- 165,171 ----
  GETOPT_H = @GETOPT_H@
  GLOB_H = @GLOB_H@
  GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
  HAVE_LONG_64BIT = @HAVE_LONG_64BIT@
  HAVE_LONG_LONG_64BIT = @HAVE_LONG_LONG_64BIT@
  HAVE__BOOL = @HAVE__BOOL@
***************
*** 226,233 ****
  ZLIB_LIBS = @ZLIB_LIBS@
  ZLIB_SUBDIRS = @ZLIB_SUBDIRS@
  ac_ct_CC = @ac_ct_CC@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
  ac_prefix_program = @ac_prefix_program@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--- 228,233 ----
***************
*** 244,266 ****
--- 244,273 ----
  build_vendor = @build_vendor@
  cvs_client_objects = @cvs_client_objects@
  datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
+ htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
+ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
***************
*** 343,360 ****
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@
  
  .c.o:
! @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
! @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@	$(COMPILE) -c $<
  
  .c.obj:
! @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
! @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  uninstall-info-am:
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
--- 350,365 ----
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@
  
  .c.o:
! @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
  
  .c.obj:
! @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
  uninstall-info-am:
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
Index: diff/diff.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/diff/diff.c,v
retrieving revision 1.1.1.7
retrieving revision 1.1.3.2.4.6
diff -c -r1.1.1.7 -r1.1.3.2.4.6
*** diff/diff.c	25 May 2005 23:05:42 -0000	1.1.1.7
--- diff/diff.c	19 Jul 2006 17:44:57 -0000	1.1.3.2.4.6
***************
*** 23,28 ****
--- 23,29 ----
  #include <signal.h>
  #include "error.h"
  #include "getopt.h"
+ #include "../lib/getopt_compat.h"       /* EMX 4/1/2006, 11:36 */
  
  #ifdef HAVE_FNMATCH
  # include <fnmatch.h> /* This is supposed to be available on Posix systems */
***************
*** 1017,1022 ****
--- 1018,1039 ----
  	  else
  	    stat_result = stat (inf[i].name, &inf[i].stat);
  
+ 	  /* EMX bug - we can't stat("nul",&sb),
+ 	   * (but can fd = open("nul",...), fstat(fd,&sb)
+ 	   * - but that doesn't really help us pass death2-diff-2 in sanity.sh
+ 	   * The kludge below is from the emx port of GNU diffutils
+ 	   */
+ #ifdef __EMX__
+          /* HACK: Treat 'nul' as a nonexistent file. */
+          if (stat_result != 0 && errno == EINVAL
+ 	  && stricmp (inf[i].name, "nul") == 0)
+ 	    {
+              stat_result = 0;
+              inf[i].desc = -1;
+ 	    }
+ #endif /*__EMX__*/
+ 
+ 
  	  if (stat_result != 0)
  	    {
  	      perror_with_name (inf[i].name);
Index: diff/diff3.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/diff/diff3.c,v
retrieving revision 1.1.1.6
retrieving revision 1.1.3.2.4.5
diff -c -r1.1.1.6 -r1.1.3.2.4.5
*** diff/diff3.c	13 Jun 2003 05:08:20 -0000	1.1.1.6
--- diff/diff3.c	19 Jul 2006 17:44:57 -0000	1.1.3.2.4.5
***************
*** 20,25 ****
--- 20,26 ----
  #include <stdio.h>
  #include <setjmp.h>
  #include "getopt.h"
+ #include "../lib/getopt_compat.h"       /* EMX 4/1/2006, 11:36 */
  #include "diffrun.h"
  
  /* diff3.c has a real initialize_main function. */
Index: doc/.cvsignore
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/doc/.cvsignore,v
retrieving revision 1.1.1.4
retrieving revision 1.1.3.1.4.2
diff -c -r1.1.1.4 -r1.1.3.1.4.2
*** doc/.cvsignore	15 Nov 2004 04:56:20 -0000	1.1.1.4
--- doc/.cvsignore	19 Jul 2006 17:44:57 -0000	1.1.3.1.4.2
***************
*** 15,24 ****
  cvs.pdf
  cvs.pg
  cvs.ps
- cvs.tmp
  cvs.toc
  cvs.tp
- cvs.txt
  cvs.vr
  cvs.vrs
  cvsclient.info
--- 15,22 ----
***************
*** 36,42 ****
  cvsclient.ps
  cvsclient.toc
  cvsclient.tp
- cvsclient.txt
  cvsclient.vr
  getdate-cvs.texi
  stamp-gdt
--- 34,39 ----
Index: doc/ChangeLog
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/doc/ChangeLog,v
retrieving revision 1.1.1.15
retrieving revision 1.1.3.2.4.8
diff -c -r1.1.1.15 -r1.1.3.2.4.8
*** doc/ChangeLog	28 Sep 2005 05:25:54 -0000	1.1.1.15
--- doc/ChangeLog	19 Jul 2006 17:44:57 -0000	1.1.3.2.4.8
***************
*** 1508,1514 ****
  	* Makefile.in: Regenerated.
  	* stamp-1: New file.
  	* version-client.texi: Ditto.
! 	(Reported by Alexey Mahotkin <alexm@hsys.msk.ru>.)
  
  2001-09-04  Derek Price  <dprice@collab.net>
  
--- 1508,1514 ----
  	* Makefile.in: Regenerated.
  	* stamp-1: New file.
  	* version-client.texi: Ditto.
! 	(Reportred by Alexey Mahotkin <alexm@hsys.msk.ru>.)
  
  2001-09-04  Derek Price  <dprice@collab.net>
  
Index: doc/Makefile.am
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/doc/Makefile.am,v
retrieving revision 1.1.1.6
retrieving revision 1.1.2.4
diff -c -r1.1.1.6 -r1.1.2.4
*** doc/Makefile.am	28 Sep 2005 05:25:54 -0000	1.1.1.6
--- doc/Makefile.am	19 Jul 2006 17:44:57 -0000	1.1.2.4
***************
*** 21,32 ****
  info_TEXINFOS = cvs.texinfo cvsclient.texi
  man_MANS = $(srcdir)/cvs.1
  
! PSS = \
  	cvs.ps \
  	cvs-paper.ps \
  	cvsclient.ps
  
  PDFS = \
  	cvs.pdf \
  	$(srcdir)/cvs-paper.pdf \
  	cvsclient.pdf
--- 21,33 ----
  info_TEXINFOS = cvs.texinfo cvsclient.texi
  man_MANS = $(srcdir)/cvs.1
  
! POSTSCRIPTS = \
  	cvs.ps \
  	cvs-paper.ps \
  	cvsclient.ps
  
  PDFS = \
+ 	cvs-paper.pdf \
  	cvs.pdf \
  	$(srcdir)/cvs-paper.pdf \
  	cvsclient.pdf
***************
*** 72,79 ****
  # FIXME-AUTOMAKE:
  # For some reason if I remove version.texi, it doesn't get built automatically.
  # This needs to be fixed in automake.
! cvs.txt: cvs.texinfo $(srcdir)/version.texi
! cvsclient.txt: cvsclient.texi $(srcdir)/version-client.texi
  
  # The cvs-paper.pdf target needs to be very specific so that the other PDFs get
  # generated correctly.  If a more generic .ps.pdf implicit target is defined,
--- 73,80 ----
  # FIXME-AUTOMAKE:
  # For some reason if I remove version.texi, it doesn't get built automatically.
  # This needs to be fixed in automake.
! cvs.aux cvs.pdf cvs.txt: cvs.texinfo $(srcdir)/version.texi
! cvsclient.aux cvsclient.pdf cvsclient.txt: cvsclient.texi
  
  # The cvs-paper.pdf target needs to be very specific so that the other PDFs get
  # generated correctly.  If a more generic .ps.pdf implicit target is defined,
***************
*** 134,154 ****
  DISTCLEANFILES += stamp-gdt
  
  # texinfo based targets automake neglects to include
! SUFFIXES = .txt
  .texinfo.txt:
! 	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
! 	 --no-headers -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
  .txi.txt:
! 	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
! 	 --no-headers -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
  .texi.txt:
! 	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
! 	 --no-headers -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
  
  ##
  ## MAINTAINER Targets
  ##
  
  # for backwards compatibility with the old makefiles
  realclean: maintainer-clean
  .PHONY: realclean
--- 135,165 ----
  DISTCLEANFILES += stamp-gdt
  
  # texinfo based targets automake neglects to include
! .texinfo.pdf:
! 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
! 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) --pdf --batch $<
! .txi.pdf:
! 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
! 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) --pdf --batch $<
! .texi.pdf:
! 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
! 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) --pdf --batch $<
! 
  .texinfo.txt:
! 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
! 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(MAKEINFO) $< --no-headers -o $@
  .txi.txt:
! 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
! 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(MAKEINFO) $< --no-headers -o $@
  .texi.txt:
! 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
! 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(MAKEINFO) $< --no-headers -o $@
  
  ##
  ## MAINTAINER Targets
  ##
  
+ ## realclean ##
  # for backwards compatibility with the old makefiles
  realclean: maintainer-clean
  .PHONY: realclean
Index: doc/Makefile.in
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/doc/Makefile.in,v
retrieving revision 1.1.1.11
retrieving revision 1.1.3.1.4.7
diff -c -r1.1.1.11 -r1.1.3.1.4.7
*** doc/Makefile.in	3 Oct 2005 03:37:12 -0000	1.1.1.11
--- doc/Makefile.in	19 Jul 2006 17:44:57 -0000	1.1.3.1.4.7
***************
*** 127,133 ****
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES = mkman
  SOURCES =
  DIST_SOURCES =
--- 127,134 ----
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h \
! 	$(top_builddir)/emx-new/common.h
  CONFIG_CLEAN_FILES = mkman
  SOURCES =
  DIST_SOURCES =
***************
*** 135,140 ****
--- 136,142 ----
  TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
  am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux
  DVIS = cvs.dvi cvsclient.dvi
+ PSS = cvs.ps cvsclient.ps
  HTMLS = cvs.html cvsclient.html
  TEXINFOS = cvs.texinfo cvsclient.texi
  TEXI2PDF = $(TEXI2DVI) --pdf --batch
***************
*** 185,190 ****
--- 187,193 ----
  GETOPT_H = @GETOPT_H@
  GLOB_H = @GLOB_H@
  GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
  HAVE_LONG_64BIT = @HAVE_LONG_64BIT@
  HAVE_LONG_LONG_64BIT = @HAVE_LONG_LONG_64BIT@
  HAVE__BOOL = @HAVE__BOOL@
***************
*** 247,254 ****
  ZLIB_LIBS = @ZLIB_LIBS@
  ZLIB_SUBDIRS = @ZLIB_SUBDIRS@
  ac_ct_CC = @ac_ct_CC@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
  ac_prefix_program = @ac_prefix_program@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--- 250,255 ----
***************
*** 265,287 ****
--- 266,295 ----
  build_vendor = @build_vendor@
  cvs_client_objects = @cvs_client_objects@
  datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
+ htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
+ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
***************
*** 290,301 ****
  SUBDIRS = i18n
  info_TEXINFOS = cvs.texinfo cvsclient.texi
  man_MANS = $(srcdir)/cvs.1
! PSS = \
  	cvs.ps \
  	cvs-paper.ps \
  	cvsclient.ps
  
  PDFS = \
  	cvs.pdf \
  	$(srcdir)/cvs-paper.pdf \
  	cvsclient.pdf
--- 298,310 ----
  SUBDIRS = i18n
  info_TEXINFOS = cvs.texinfo cvsclient.texi
  man_MANS = $(srcdir)/cvs.1
! POSTSCRIPTS = \
  	cvs.ps \
  	cvs-paper.ps \
  	cvsclient.ps
  
  PDFS = \
+ 	cvs-paper.pdf \
  	cvs.pdf \
  	$(srcdir)/cvs-paper.pdf \
  	cvsclient.pdf
***************
*** 314,326 ****
  
  DISTCLEANFILES = stamp-gdt
  MAINTAINERCLEANFILES = $(PDFS) $(srcdir)/cvs.1
- 
- # texinfo based targets automake neglects to include
- SUFFIXES = .txt
  all: all-recursive
  
  .SUFFIXES:
! .SUFFIXES: .txt .dvi .html .info .pdf .ps .texi .texinfo .txi
  $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
--- 323,332 ----
  
  DISTCLEANFILES = stamp-gdt
  MAINTAINERCLEANFILES = $(PDFS) $(srcdir)/cvs.1
  all: all-recursive
  
  .SUFFIXES:
! .SUFFIXES: .dvi .html .info .pdf .ps .texi .texinfo .txi .txt
  $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
***************
*** 380,390 ****
  	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
  	$(TEXI2DVI) $<
  
- .texinfo.pdf:
- 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
- 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
- 	$(TEXI2PDF) $<
- 
  .texinfo.html:
  	rm -rf $(@:.html=.htp)
  	if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--- 386,391 ----
***************
*** 449,459 ****
  	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
  	$(TEXI2DVI) $<
  
- .texi.pdf:
- 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
- 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
- 	$(TEXI2PDF) $<
- 
  .texi.html:
  	rm -rf $(@:.html=.htp)
  	if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
--- 450,455 ----
***************
*** 918,925 ****
  # FIXME-AUTOMAKE:
  # For some reason if I remove version.texi, it doesn't get built automatically.
  # This needs to be fixed in automake.
! cvs.txt: cvs.texinfo $(srcdir)/version.texi
! cvsclient.txt: cvsclient.texi $(srcdir)/version-client.texi
  
  # The cvs-paper.pdf target needs to be very specific so that the other PDFs get
  # generated correctly.  If a more generic .ps.pdf implicit target is defined,
--- 914,921 ----
  # FIXME-AUTOMAKE:
  # For some reason if I remove version.texi, it doesn't get built automatically.
  # This needs to be fixed in automake.
! cvs.aux cvs.pdf cvs.txt: cvs.texinfo $(srcdir)/version.texi
! cvsclient.aux cvsclient.pdf cvsclient.txt: cvsclient.texi
  
  # The cvs-paper.pdf target needs to be very specific so that the other PDFs get
  # generated correctly.  If a more generic .ps.pdf implicit target is defined,
***************
*** 969,983 ****
  	      cp getdate-cvs.tmp $(srcdir)/getdate-cvs.texi)
  	-@rm -f getdate-cvs.tmp
  	@cp $(srcdir)/getdate-cvs.texi $@
  .texinfo.txt:
! 	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
! 	 --no-headers -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
  .txi.txt:
! 	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
! 	 --no-headers -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
  .texi.txt:
! 	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
! 	 --no-headers -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
  
  # for backwards compatibility with the old makefiles
  realclean: maintainer-clean
--- 965,991 ----
  	      cp getdate-cvs.tmp $(srcdir)/getdate-cvs.texi)
  	-@rm -f getdate-cvs.tmp
  	@cp $(srcdir)/getdate-cvs.texi $@
+ 
+ # texinfo based targets automake neglects to include
+ .texinfo.pdf:
+ 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
+ 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) --pdf --batch $<
+ .txi.pdf:
+ 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
+ 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) --pdf --batch $<
+ .texi.pdf:
+ 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
+ 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) --pdf --batch $<
+ 
  .texinfo.txt:
! 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
! 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(MAKEINFO) $< --no-headers -o $@
  .txi.txt:
! 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
! 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(MAKEINFO) $< --no-headers -o $@
  .texi.txt:
! 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
! 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(MAKEINFO) $< --no-headers -o $@
  
  # for backwards compatibility with the old makefiles
  realclean: maintainer-clean
Index: doc/cvsclient.texi
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/doc/cvsclient.texi,v
retrieving revision 1.1.1.8
retrieving revision 1.1.3.2.4.5
diff -c -r1.1.1.8 -r1.1.3.2.4.5
*** doc/cvsclient.texi	20 Jul 2005 00:39:54 -0000	1.1.1.8
--- doc/cvsclient.texi	19 Jul 2006 17:44:57 -0000	1.1.3.2.4.5
***************
*** 3,12 ****
  @setfilename cvsclient.info
  @include version-client.texi
  
! @dircategory Programming
! @direntry
  * cvsclient: (cvsclient).      The CVS client/server protocol.
! @end direntry
  
  @node Top
  @top CVS Client/Server
--- 3,14 ----
  @setfilename cvsclient.info
  @include version-client.texi
  
! @ifinfo
! @format
! START-INFO-DIR-ENTRY
  * cvsclient: (cvsclient).      The CVS client/server protocol.
! END-INFO-DIR-ENTRY
! @end format
  
  @node Top
  @top CVS Client/Server
***************
*** 967,982 ****
  situations where the user specifies a filename and the client does not
  know about that file).
  
- Though this request will be supported into the forseeable future, it has been
- the source of numerous bug reports in the past due to the complexity of testing
- this functionality via the test suite and client developers are encouraged not
- to use it.  Instead, please consider munging conflicting names and maintaining
- a map for communicating with the server.  For example, suppose the server sends
- files @file{case}, @file{CASE}, and @file{CaSe}.  The client could write all
- three files to names such as, @file{case}, @file{case_prefix_case}, and
- @file{case_prefix_2_case} and maintain a mapping between the file names in, for
- instance a new @file{CVS/Map} file.
- 
  @item Argument @var{text} \n
  Response expected: no.
  Save argument for use in a subsequent command.  Arguments
--- 969,974 ----
***************
*** 1120,1126 ****
  
  @item ci \n
  @itemx diff \n
- @itemx list \n
  @itemx tag \n
  @itemx status \n
  @itemx admin \n
--- 1112,1117 ----
***************
*** 1208,1225 ****
  line in the @code{Created} response must indicate whether the file is
  binary or text, so the client can create it correctly.
  
! @item ls \n
! @itemx rannotate \n
  @itemx rdiff \n
- @itemx rlist \n
  @itemx rlog \n
  @itemx rtag \n
  Response expected: yes.  Actually do a cvs command.  This uses any
  previous @code{Argument} requests, if they have been sent.  The client
  should not send @code{Directory}, @code{Entry}, or @code{Modified}
  requests for these commands; they are not used.  Arguments to these
! commands are module names, as described for @code{co}.  @code{ls} is a
! synonym for @code{rlist}, for compatibility with CVSNT.
  
  @item init @var{root-name} \n
  Response expected: yes.  If it doesn't already exist, create a @sc{cvs}
--- 1199,1213 ----
  line in the @code{Created} response must indicate whether the file is
  binary or text, so the client can create it correctly.
  
! @item rannotate \n
  @itemx rdiff \n
  @itemx rlog \n
  @itemx rtag \n
  Response expected: yes.  Actually do a cvs command.  This uses any
  previous @code{Argument} requests, if they have been sent.  The client
  should not send @code{Directory}, @code{Entry}, or @code{Modified}
  requests for these commands; they are not used.  Arguments to these
! commands are module names, as described for @code{co}.
  
  @item init @var{root-name} \n
  Response expected: yes.  If it doesn't already exist, create a @sc{cvs}
***************
*** 1361,1374 ****
  Response expected: yes.  Note that a @code{cvs release} command has
  taken place and update the history file accordingly.
  
- @item global-list-quiet \n
- Response expected: yes.  This request is a synonym for noop, but its existance
- notifies the client that a @code{-q} option to @code{list} and @code{rlist}
- will be rejected.  This, in a reverse-logic sort of way, is here so that when
- it @emph{isn't} received, as for instance from CVSNT, the client will know that
- the quiet option has to be sent as a command option rather than a global
- option.
- 
  @item noop \n
  Response expected: yes.  This request is a null command in the sense
  that it doesn't do anything, but merely (as with any other requests
--- 1349,1354 ----
Index: doc/i18n/Makefile.in
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/doc/i18n/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -c -r1.1.1.1 -r1.1.1.1.2.1
*** doc/i18n/Makefile.in	3 Oct 2005 03:37:16 -0000	1.1.1.1
--- doc/i18n/Makefile.in	19 Jul 2006 17:44:57 -0000	1.1.1.1.2.1
***************
*** 119,125 ****
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
--- 119,126 ----
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h \
! 	$(top_builddir)/emx-new/common.h
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
***************
*** 163,168 ****
--- 164,170 ----
  GETOPT_H = @GETOPT_H@
  GLOB_H = @GLOB_H@
  GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
  HAVE_LONG_64BIT = @HAVE_LONG_64BIT@
  HAVE_LONG_LONG_64BIT = @HAVE_LONG_LONG_64BIT@
  HAVE__BOOL = @HAVE__BOOL@
***************
*** 225,232 ****
  ZLIB_LIBS = @ZLIB_LIBS@
  ZLIB_SUBDIRS = @ZLIB_SUBDIRS@
  ac_ct_CC = @ac_ct_CC@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
  ac_prefix_program = @ac_prefix_program@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--- 227,232 ----
***************
*** 243,265 ****
--- 243,272 ----
  build_vendor = @build_vendor@
  cvs_client_objects = @cvs_client_objects@
  datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
+ htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
+ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
Index: doc/i18n/pt_BR/Makefile.in
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/doc/i18n/pt_BR/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -c -r1.1.1.1 -r1.1.1.1.2.1
*** doc/i18n/pt_BR/Makefile.in	3 Oct 2005 03:37:18 -0000	1.1.1.1
--- doc/i18n/pt_BR/Makefile.in	19 Jul 2006 17:44:57 -0000	1.1.1.1.2.1
***************
*** 119,125 ****
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
--- 119,126 ----
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h \
! 	$(top_builddir)/emx-new/common.h
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
***************
*** 154,159 ****
--- 155,161 ----
  GETOPT_H = @GETOPT_H@
  GLOB_H = @GLOB_H@
  GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
  HAVE_LONG_64BIT = @HAVE_LONG_64BIT@
  HAVE_LONG_LONG_64BIT = @HAVE_LONG_LONG_64BIT@
  HAVE__BOOL = @HAVE__BOOL@
***************
*** 216,223 ****
  ZLIB_LIBS = @ZLIB_LIBS@
  ZLIB_SUBDIRS = @ZLIB_SUBDIRS@
  ac_ct_CC = @ac_ct_CC@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
  ac_prefix_program = @ac_prefix_program@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--- 218,223 ----
***************
*** 234,256 ****
--- 234,263 ----
  build_vendor = @build_vendor@
  cvs_client_objects = @cvs_client_objects@
  datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
+ htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
+ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
Index: emx/config.h
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/emx/config.h,v
retrieving revision 1.1.1.5
retrieving revision 1.1.3.1.4.5
diff -c -r1.1.1.5 -r1.1.3.1.4.5
*** emx/config.h	1 Mar 2005 04:40:46 -0000	1.1.1.5
--- emx/config.h	19 Jul 2006 17:44:58 -0000	1.1.3.1.4.5
***************
*** 239,249 ****
  /* Define if you have the socket library (-lsocket).  */
  #define HAVE_LIBSOCKET 1
  
- /* Under OS/2, filenames are case-insensitive, and both / and \
-    are path component separators.  */
- #define FOLD_FN_CHAR(c) (OS2_filename_classes[(unsigned char) (c)])
- extern unsigned char OS2_filename_classes[];
- 
  /* Is the character C a path name separator?  Under OS/2, you can use
     either / or \.  */
  #define ISDIRSEP(c) (FOLD_FN_CHAR(c) == '/')
--- 239,244 ----
Index: lib/ChangeLog
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/lib/ChangeLog,v
retrieving revision 1.1.1.12
retrieving revision 1.1.3.1.4.9
diff -c -r1.1.1.12 -r1.1.3.1.4.9
*** lib/ChangeLog	2 Oct 2005 05:17:38 -0000	1.1.1.12
--- lib/ChangeLog	19 Jul 2006 18:27:59 -0000	1.1.3.1.4.9
***************
*** 1,3 ****
--- 1,8 ----
+ 2006-07-19  Andrew Belov  <andrew_belov@newmail.ru>
+ 
+ 	* .cvsignore, Makefile.am, Makefile.gnulib, Makefile.in, __fpending.c, __fpending.h, alloca.c, alloca_.h, allocsa.c, allocsa.h, allocsa.valgrind, argmatch.c, asnprintf.c, asprintf.c, atexit.c, basename.c, canon-host.c, canon-host.h, canonicalize.c, canonicalize.h, chdir-long.c, chdir-long.h, closeout.c, closeout.h, cycle-check.c, cycle-check.h, dev-ino.h, dirname.c, dirname.h, dup-safer.c, dup2.c, error.c, error.h, exit.h, exitfail.c, exitfail.h, fd-safer.c, filenamecat.c, filenamecat.h, fncase.c, fnmatch.c, fnmatch_.h, fnmatch_loop.c, ftruncate.c, gai_strerror.c, getaddrinfo.c, getaddrinfo.h, getcwd.c, getcwd.h, getdate.c, getdate.h, getdate.y, getdelim.c, getdelim.h, gethostname.c, getline.c, getline.h, getlogin_r.c, getlogin_r.h, getndelim2.c, getndelim2.h, getnline.c, getnline.h, getopt.c, getopt.h, getopt1.c, getopt_.h, getopt_int.h, getpagesize.h, getpass.c, getpass.h, gettext.h, gettime.c, gettimeofday.c, glob-libc.h, glob.c, glob_.h, libcvs.dep, libcvs.dsp, libcvs.mak, lstat.c, lstat.h, malloc.c, mbchar.c, mbchar.h, mbuiter.h, md5.c, md5.h, memchr.c, memmove.c, mempcpy.c, mempcpy.h, memrchr.c, memrchr.h, minmax.h, mkdir.c, mkstemp.c, mktime.c, nanosleep.c, openat.c, openat.h, pagealign_alloc.c, pagealign_alloc.h, pathmax.h, pipe-safer.c, printf-args.c, printf-args.h, printf-parse.c, printf-parse.h, progname.c, quotearg.c, quotearg.h, readlink.c, realloc.c, regcomp.c, regex.c, regex.h, regex_internal.c, regex_internal.h, regexec.c, rename.c, rpmatch.c, save-cwd.c, save-cwd.h, savecwd.c, savecwd.h, setenv.c, setenv.h, size_max.h, stat-macros.h, stat.c, stdbool_.h, stdint_.h, strcase.h, strcasecmp.c, strdup.c, strdup.h, strerror.c, strftime.c, strftime.h, stripslash.c, strncasecmp.c, strnlen1.c, strnlen1.h, strstr.c, strstr.h, strtol.c, strtoul.c, sunos57-select.c, system.h, tempname.c, test-getdate.sh, time_r.c, time_r.h, timespec.h, unistd--.h, unistd-safer.h, unlocked-io.h, unsetenv.c, valloc.c, vasnprintf.c, vasnprintf.h, vasprintf.c, vasprintf.h, xalloc-die.c, xalloc.h, xgetcwd.c, xgetcwd.h, xgethostname.c, xgethostname.h, xgetwd.c, xmalloc.c, xreadlink.c, xreadlink.h, xsize.h, xstrdup.c, xtime.h, yesno.c, yesno.h:
+ 	Finalizing 1.12.13
+ 
  2005-09-29  Derek Price  <derek@ximbiot.com>
  
  	* system.h: #define fd_select select when not already defined.
***************
*** 1932,1937 ****
--- 1937,1946 ----
  
  	* rename.c: replace calls to unlink() with CVS_UNLINK() for VMS
  
+ 2000-12-31  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* getdate.c, getdate.y: Fixed detection of negative timestamps
+ 
  2000-12-22  Derek Price  <derek.price@openavenue.com>
  
  	* Makefile.am (INCLUDES): Fixed typo
***************
*** 1948,1953 ****
--- 1957,1972 ----
  	* Makefile.am: New file needed by Automake
  	* Makefile.in: Regenerated
  
+ 2000-12-20  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* sighandle.c, regex.h, savecwd.c, regex.c, getline.c, getline.h, getdate.c, getdate.y, Makefile.in:
+ 	Updated to version 1.11
+ 
+ 2000-12-19  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* savecwd.c, sighandle.c, regex.h, regex.c, Makefile.in, getline.c, getline.h, getdate.y, getdate.c:
+ 	Imported the 1.11 release
+ 
  2000-11-15  Derek Price  <derek.price@openavenue.com>
  
  	* system.h:  Added CVS_FDOPEN to conform to CVS_FOPEN precedent
Index: lib/Makefile.in
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/lib/Makefile.in,v
retrieving revision 1.1.1.11
retrieving revision 1.1.3.1.4.8
diff -c -r1.1.1.11 -r1.1.3.1.4.8
*** lib/Makefile.in	3 Oct 2005 03:37:26 -0000	1.1.1.11
--- lib/Makefile.in	19 Jul 2006 17:44:58 -0000	1.1.3.1.4.8
***************
*** 149,155 ****
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LIBRARIES = $(noinst_LIBRARIES)
  AR = ar
--- 149,156 ----
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h \
! 	$(top_builddir)/emx-new/common.h
  CONFIG_CLEAN_FILES =
  LIBRARIES = $(noinst_LIBRARIES)
  AR = ar
***************
*** 168,174 ****
  am__DEPENDENCIES_2 =
  getdate_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
  	$(am__DEPENDENCIES_2)
! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
  am__depfiles_maybe = depfiles
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--- 169,175 ----
  am__DEPENDENCIES_2 =
  getdate_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
  	$(am__DEPENDENCIES_2)
! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/emx-new
  depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
  am__depfiles_maybe = depfiles
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
***************
*** 212,217 ****
--- 213,219 ----
  GETOPT_H = @GETOPT_H@
  GLOB_H = @GLOB_H@
  GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
  HAVE_LONG_64BIT = @HAVE_LONG_64BIT@
  HAVE_LONG_LONG_64BIT = @HAVE_LONG_LONG_64BIT@
  HAVE__BOOL = @HAVE__BOOL@
***************
*** 274,281 ****
  ZLIB_LIBS = @ZLIB_LIBS@
  ZLIB_SUBDIRS = @ZLIB_SUBDIRS@
  ac_ct_CC = @ac_ct_CC@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
  ac_prefix_program = @ac_prefix_program@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--- 276,281 ----
***************
*** 292,314 ****
--- 292,321 ----
  build_vendor = @build_vendor@
  cvs_client_objects = @cvs_client_objects@
  datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
+ htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
+ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
***************
*** 499,558 ****
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xreadlink.Po@am__quote@
  
  .c.o:
! @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
! @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@	$(COMPILE) -c $<
  
  .c.obj:
! @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
! @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
  getdate-error.o: error.c
! @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getdate-error.o -MD -MP -MF "$(DEPDIR)/getdate-error.Tpo" -c -o getdate-error.o `test -f 'error.c' || echo '$(srcdir)/'`error.c; \
! @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/getdate-error.Tpo" "$(DEPDIR)/getdate-error.Po"; else rm -f "$(DEPDIR)/getdate-error.Tpo"; exit 1; fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='error.c' object='getdate-error.o' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getdate-error.o `test -f 'error.c' || echo '$(srcdir)/'`error.c
  
  getdate-error.obj: error.c
! @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getdate-error.obj -MD -MP -MF "$(DEPDIR)/getdate-error.Tpo" -c -o getdate-error.obj `if test -f 'error.c'; then $(CYGPATH_W) 'error.c'; else $(CYGPATH_W) '$(srcdir)/error.c'; fi`; \
! @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/getdate-error.Tpo" "$(DEPDIR)/getdate-error.Po"; else rm -f "$(DEPDIR)/getdate-error.Tpo"; exit 1; fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='error.c' object='getdate-error.obj' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getdate-error.obj `if test -f 'error.c'; then $(CYGPATH_W) 'error.c'; else $(CYGPATH_W) '$(srcdir)/error.c'; fi`
  
  getdate-getdate.o: getdate.c
! @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getdate-getdate.o -MD -MP -MF "$(DEPDIR)/getdate-getdate.Tpo" -c -o getdate-getdate.o `test -f 'getdate.c' || echo '$(srcdir)/'`getdate.c; \
! @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/getdate-getdate.Tpo" "$(DEPDIR)/getdate-getdate.Po"; else rm -f "$(DEPDIR)/getdate-getdate.Tpo"; exit 1; fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='getdate.c' object='getdate-getdate.o' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getdate-getdate.o `test -f 'getdate.c' || echo '$(srcdir)/'`getdate.c
  
  getdate-getdate.obj: getdate.c
! @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getdate-getdate.obj -MD -MP -MF "$(DEPDIR)/getdate-getdate.Tpo" -c -o getdate-getdate.obj `if test -f 'getdate.c'; then $(CYGPATH_W) 'getdate.c'; else $(CYGPATH_W) '$(srcdir)/getdate.c'; fi`; \
! @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/getdate-getdate.Tpo" "$(DEPDIR)/getdate-getdate.Po"; else rm -f "$(DEPDIR)/getdate-getdate.Tpo"; exit 1; fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='getdate.c' object='getdate-getdate.obj' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getdate-getdate.obj `if test -f 'getdate.c'; then $(CYGPATH_W) 'getdate.c'; else $(CYGPATH_W) '$(srcdir)/getdate.c'; fi`
  
  getdate-progname.o: progname.c
! @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getdate-progname.o -MD -MP -MF "$(DEPDIR)/getdate-progname.Tpo" -c -o getdate-progname.o `test -f 'progname.c' || echo '$(srcdir)/'`progname.c; \
! @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/getdate-progname.Tpo" "$(DEPDIR)/getdate-progname.Po"; else rm -f "$(DEPDIR)/getdate-progname.Tpo"; exit 1; fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='progname.c' object='getdate-progname.o' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getdate-progname.o `test -f 'progname.c' || echo '$(srcdir)/'`progname.c
  
  getdate-progname.obj: progname.c
! @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getdate-progname.obj -MD -MP -MF "$(DEPDIR)/getdate-progname.Tpo" -c -o getdate-progname.obj `if test -f 'progname.c'; then $(CYGPATH_W) 'progname.c'; else $(CYGPATH_W) '$(srcdir)/progname.c'; fi`; \
! @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/getdate-progname.Tpo" "$(DEPDIR)/getdate-progname.Po"; else rm -f "$(DEPDIR)/getdate-progname.Tpo"; exit 1; fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='progname.c' object='getdate-progname.obj' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getdate-progname.obj `if test -f 'progname.c'; then $(CYGPATH_W) 'progname.c'; else $(CYGPATH_W) '$(srcdir)/progname.c'; fi`
  
  .y.c:
  	$(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
--- 506,557 ----
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xreadlink.Po@am__quote@
  
  .c.o:
! @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
  
  .c.obj:
! @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
  
  getdate-error.o: error.c
! @AMDEP_TRUE@	source='error.c' object='getdate-error.o' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@	depfile='$(DEPDIR)/getdate-error.Po' tmpdepfile='$(DEPDIR)/getdate-error.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getdate-error.o `test -f 'error.c' || echo '$(srcdir)/'`error.c
  
  getdate-error.obj: error.c
! @AMDEP_TRUE@	source='error.c' object='getdate-error.obj' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@	depfile='$(DEPDIR)/getdate-error.Po' tmpdepfile='$(DEPDIR)/getdate-error.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getdate-error.obj `test -f 'error.c' || echo '$(srcdir)/'`error.c
  
  getdate-getdate.o: getdate.c
! @AMDEP_TRUE@	source='getdate.c' object='getdate-getdate.o' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@	depfile='$(DEPDIR)/getdate-getdate.Po' tmpdepfile='$(DEPDIR)/getdate-getdate.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getdate-getdate.o `test -f 'getdate.c' || echo '$(srcdir)/'`getdate.c
  
  getdate-getdate.obj: getdate.c
! @AMDEP_TRUE@	source='getdate.c' object='getdate-getdate.obj' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@	depfile='$(DEPDIR)/getdate-getdate.Po' tmpdepfile='$(DEPDIR)/getdate-getdate.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getdate-getdate.obj `test -f 'getdate.c' || echo '$(srcdir)/'`getdate.c
  
  getdate-progname.o: progname.c
! @AMDEP_TRUE@	source='progname.c' object='getdate-progname.o' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@	depfile='$(DEPDIR)/getdate-progname.Po' tmpdepfile='$(DEPDIR)/getdate-progname.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getdate-progname.o `test -f 'progname.c' || echo '$(srcdir)/'`progname.c
  
  getdate-progname.obj: progname.c
! @AMDEP_TRUE@	source='progname.c' object='getdate-progname.obj' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@	depfile='$(DEPDIR)/getdate-progname.Po' tmpdepfile='$(DEPDIR)/getdate-progname.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(getdate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getdate-progname.obj `test -f 'progname.c' || echo '$(srcdir)/'`progname.c
  
  .y.c:
  	$(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
Index: lib/canonicalize.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/lib/canonicalize.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -c -r1.1.1.1 -r1.1.1.1.2.1
*** lib/canonicalize.c	10 Jun 2005 10:30:40 -0000	1.1.1.1
--- lib/canonicalize.c	19 Jul 2006 17:44:58 -0000	1.1.1.1.2.1
***************
*** 90,96 ****
    /* All known hosts with resolvepath (e.g. Solaris 7) don't turn
       relative names into absolute ones, so prepend the working
       directory if the file name is not absolute.  */
!   if (name[0] != '/')
      {
        char *wd;
  
--- 90,96 ----
    /* All known hosts with resolvepath (e.g. Solaris 7) don't turn
       relative names into absolute ones, so prepend the working
       directory if the file name is not absolute.  */
!   if (ISSLASH(name[0]))
      {
        char *wd;
  
***************
*** 146,151 ****
--- 146,154 ----
    char const *start;
    char const *end;
    char const *rname_limit;
+ #if FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX
+   size_t prefix_len;
+ #endif
    size_t extra_len = 0;
    struct cycle_check_state cycle_state;
  
***************
*** 161,167 ****
        return NULL;
      }
  
!   if (name[0] != '/')
      {
        rname = xgetcwd ();
        if (!rname)
--- 164,170 ----
        return NULL;
      }
  
!   if (!ISABSOLUTE(name))
      {
        rname = xgetcwd ();
        if (!rname)
***************
*** 183,197 ****
      {
        rname = xmalloc (PATH_MAX);
        rname_limit = rname + PATH_MAX;
        rname[0] = '/';
        dest = rname + 1;
      }
  
    cycle_check_init (&cycle_state);
    for (start = end = name; *start; start = end)
      {
        /* Skip sequence of multiple file name separators.  */
!       while (*start == '/')
  	++start;
  
        /* Find end of component.  */
--- 186,207 ----
      {
        rname = xmalloc (PATH_MAX);
        rname_limit = rname + PATH_MAX;
+ #if FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX
+       prefix_len = FILESYSTEM_PREFIX_LEN (name);
+       memmove (rname, name, prefix_len);
+       name += prefix_len;
+       dest = rname + prefix_len;
+ #else
        rname[0] = '/';
        dest = rname + 1;
+ #endif
      }
  
    cycle_check_init (&cycle_state);
    for (start = end = name; *start; start = end)
      {
        /* Skip sequence of multiple file name separators.  */
!       while (ISSLASH(*start))
  	++start;
  
        /* Find end of component.  */
***************
*** 212,218 ****
  	{
  	  struct stat st;
  
! 	  if (dest[-1] != '/')
  	    *dest++ = '/';
  
  	  if (dest + (end - start) >= rname_limit)
--- 222,228 ----
  	{
  	  struct stat st;
  
! 	  if (!(ISSLASH(dest[-1])))
  	    *dest++ = '/';
  
  	  if (dest + (end - start) >= rname_limit)
***************
*** 285,296 ****
  	      memmove (&extra_buf[n], end, len + 1);
  	      name = end = memcpy (extra_buf, buf, n);
  
! 	      if (buf[0] == '/')
  		dest = rname + 1;	/* It's an absolute symlink */
  	      else
  		/* Back up to previous component, ignore if at root already: */
  		if (dest > rname + 1)
! 		  while ((--dest)[-1] != '/');
  
  	      free (buf);
  	    }
--- 295,311 ----
  	      memmove (&extra_buf[n], end, len + 1);
  	      name = end = memcpy (extra_buf, buf, n);
  
! 	      if (ISSLASH(buf[0]))
  		dest = rname + 1;	/* It's an absolute symlink */
  	      else
  		/* Back up to previous component, ignore if at root already: */
  		if (dest > rname + 1)
!                 {
!                   do
!                   {
!                     --dest;
!                   } while (!ISSLASH(dest[-1]));
!                 }
  
  	      free (buf);
  	    }
***************
*** 304,310 ****
  	    }
  	}
      }
!   if (dest > rname + 1 && dest[-1] == '/')
      --dest;
    *dest = '\0';
  
--- 319,325 ----
  	    }
  	}
      }
!   if (dest > rname + 1 && ISSLASH(dest[-1]))
      --dest;
    *dest = '\0';
  
Index: lib/getcwd.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/lib/getcwd.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -c -r1.1.1.1 -r1.1.1.1.2.1
*** lib/getcwd.c	19 Sep 2005 11:12:40 -0000	1.1.1.1
--- lib/getcwd.c	19 Jul 2006 17:44:58 -0000	1.1.1.1.2.1
***************
*** 77,82 ****
--- 77,90 ----
  
  #include <limits.h>
  
+ /* EMX support added 5/1/2006, 19:34. We'll reuse most of the framework this
+    module provides but will come up with our own implementation of getcwd()
+    which simply overloads the EMX one by prepending a drive letter to the
+    path. */
+ #ifdef __EMX__
+ # include <os2emx.h>
+ #endif
+ 
  #ifdef ENAMETOOLONG
  # define is_ENAMETOOLONG(x) ((x) == ENAMETOOLONG)
  #else
***************
*** 121,126 ****
--- 129,135 ----
  char *
  __getcwd (char *buf, size_t size)
  {
+ #ifndef __EMX__
    /* Lengths of big file name components and entire file names, and a
       deep level of file name nesting.  These numbers are not upper
       bounds; they are merely large values suitable for initial
***************
*** 400,405 ****
--- 409,453 ----
      __set_errno (save);
    }
    return NULL;
+ #else                                   /* __EMX__ */
+   unsigned long curdisk = 0, dt[32];
+   char *dir = NULL, *ptr, *rc;
+ 
+   if (buf != NULL)
+     dir = buf;
+   else
+   {
+     if (! (dir = malloc (size = CCHMAXPATH)))
+     {
+       __set_errno (ENOMEM);
+       return NULL;
+     }
+   }
+   ptr = dir;
+   if(! DosQueryCurrentDisk (&curdisk, dt))
+   {
+     *ptr++ = (char)curdisk + 0x40;
+     *ptr++ = ':';
+     size -= ptr - dir;
+   }
+ # undef getcwd
+   if (! getcwd (ptr, size))
+   {
+     if (dir != NULL)
+       free (dir);
+     return NULL;
+   }
+   /* Return the user-supplied buffer, or readjust our allocated buffer
+      and return it instead */
+   if (dir == NULL)
+       rc = buf;
+   else
+   {
+     if (! (rc = realloc (dir, strlen (dir) + 1)))
+       rc = dir;
+   }
+   return rc;
+ #endif                                  /* __EMX__ */
  }
  
  #ifdef weak_alias
Index: lib/getdate.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/lib/getdate.c,v
retrieving revision 1.1.1.9
retrieving revision 1.1.3.2.4.6
diff -c -r1.1.1.9 -r1.1.3.2.4.6
*** lib/getdate.c	9 Oct 2005 12:14:50 -0000	1.1.1.9
--- lib/getdate.c	19 Jul 2006 17:44:58 -0000	1.1.3.2.4.6
***************
*** 1,7 ****
! /* A Bison parser, made by GNU Bison 1.875c.  */
  
  /* Skeleton parser for Yacc-like parsing with Bison,
!    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--- 1,7 ----
! /* A Bison parser, made by GNU Bison 2.1.  */
  
  /* Skeleton parser for Yacc-like parsing with Bison,
!    Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
***************
*** 15,22 ****
  
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
!    Foundation, Inc., 59 Temple Place - Suite 330,
!    Boston, MA 02111-1307, USA.  */
  
  /* As a special exception, when this file is copied by Bison into a
     Bison output file, you may use that output file without restriction.
--- 15,22 ----
  
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
!    Foundation, Inc., 51 Franklin Street, Fifth Floor,
!    Boston, MA 02110-1301, USA.  */
  
  /* As a special exception, when this file is copied by Bison into a
     Bison output file, you may use that output file without restriction.
***************
*** 36,41 ****
--- 36,44 ----
  /* Identify Bison output.  */
  #define YYBISON 1
  
+ /* Bison version.  */
+ #define YYBISON_VERSION "2.1"
+ 
  /* Skeleton name.  */
  #define YYSKELETON_NAME "yacc.c"
  
***************
*** 74,79 ****
--- 77,83 ----
       tUDECIMAL_NUMBER = 276
     };
  #endif
+ /* Tokens.  */
  #define tAGO 258
  #define tDST 259
  #define tDAY 260
***************
*** 98,104 ****
  
  
  /* Copy the first part of user declarations.  */
! #line 1 "getdate.y"
  
  /* Parse a string into an internal time stamp.
  
--- 102,108 ----
  
  
  /* Copy the first part of user declarations.  */
! #line 1 "../lib/getdate.y"
  
  /* Parse a string into an internal time stamp.
  
***************
*** 310,324 ****
  # define YYERROR_VERBOSE 0
  #endif
  
  #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
! #line 209 "getdate.y"
  typedef union YYSTYPE {
    long int intval;
    textint textintval;
    struct timespec timespec;
  } YYSTYPE;
! /* Line 191 of yacc.c.  */
! #line 322 "getdate.c"
  # define yystype YYSTYPE /* obsolescent; will be withdrawn */
  # define YYSTYPE_IS_DECLARED 1
  # define YYSTYPE_IS_TRIVIAL 1
--- 314,333 ----
  # define YYERROR_VERBOSE 0
  #endif
  
+ /* Enabling the token table.  */
+ #ifndef YYTOKEN_TABLE
+ # define YYTOKEN_TABLE 0
+ #endif
+ 
  #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
! #line 209 "../lib/getdate.y"
  typedef union YYSTYPE {
    long int intval;
    textint textintval;
    struct timespec timespec;
  } YYSTYPE;
! /* Line 196 of yacc.c.  */
! #line 331 "y.tab.c"
  # define yystype YYSTYPE /* obsolescent; will be withdrawn */
  # define YYSTYPE_IS_DECLARED 1
  # define YYSTYPE_IS_TRIVIAL 1
***************
*** 329,358 ****
  /* Copy the second part of user declarations.  */
  
  
! /* Line 214 of yacc.c.  */
! #line 334 "getdate.c"
  
! #if ! defined (yyoverflow) || YYERROR_VERBOSE
  
! # ifndef YYFREE
! #  define YYFREE free
  # endif
! # ifndef YYMALLOC
! #  define YYMALLOC malloc
  # endif
  
  /* The parser invokes alloca or malloc; define the necessary symbols.  */
  
  # ifdef YYSTACK_USE_ALLOCA
  #  if YYSTACK_USE_ALLOCA
- #   define YYSTACK_ALLOC alloca
- #  endif
- # else
- #  if defined (alloca) || defined (_ALLOCA_H)
- #   define YYSTACK_ALLOC alloca
- #  else
  #   ifdef __GNUC__
  #    define YYSTACK_ALLOC __builtin_alloca
  #   endif
  #  endif
  # endif
--- 338,386 ----
  /* Copy the second part of user declarations.  */
  
  
! /* Line 219 of yacc.c.  */
! #line 343 "y.tab.c"
  
! #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
! # define YYSIZE_T __SIZE_TYPE__
! #endif
! #if ! defined (YYSIZE_T) && defined (size_t)
! # define YYSIZE_T size_t
! #endif
! #if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus))
! # include <stddef.h> /* INFRINGES ON USER NAME SPACE */
! # define YYSIZE_T size_t
! #endif
! #if ! defined (YYSIZE_T)
! # define YYSIZE_T unsigned int
! #endif
  
! #ifndef YY_
! # if YYENABLE_NLS
! #  if ENABLE_NLS
! #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
! #   define YY_(msgid) dgettext ("bison-runtime", msgid)
! #  endif
  # endif
! # ifndef YY_
! #  define YY_(msgid) msgid
  # endif
+ #endif
+ 
+ #if ! defined (yyoverflow) || YYERROR_VERBOSE
  
  /* The parser invokes alloca or malloc; define the necessary symbols.  */
  
  # ifdef YYSTACK_USE_ALLOCA
  #  if YYSTACK_USE_ALLOCA
  #   ifdef __GNUC__
  #    define YYSTACK_ALLOC __builtin_alloca
+ #   else
+ #    define YYSTACK_ALLOC alloca
+ #    if defined (__STDC__) || defined (__cplusplus)
+ #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+ #     define YYINCLUDED_STDLIB_H
+ #    endif
  #   endif
  #  endif
  # endif
***************
*** 360,372 ****
  # ifdef YYSTACK_ALLOC
     /* Pacify GCC's `empty if-body' warning. */
  #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
! # else
! #  if defined (__STDC__) || defined (__cplusplus)
! #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
! #   define YYSIZE_T size_t
  #  endif
  #  define YYSTACK_ALLOC YYMALLOC
  #  define YYSTACK_FREE YYFREE
  # endif
  #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
  
--- 388,426 ----
  # ifdef YYSTACK_ALLOC
     /* Pacify GCC's `empty if-body' warning. */
  #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
! #  ifndef YYSTACK_ALLOC_MAXIMUM
!     /* The OS might guarantee only one guard page at the bottom of the stack,
!        and a page size can be as small as 4096 bytes.  So we cannot safely
!        invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
!        to allow for a few compiler-allocated temporary stack slots.  */
! #   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */
  #  endif
+ # else
  #  define YYSTACK_ALLOC YYMALLOC
  #  define YYSTACK_FREE YYFREE
+ #  ifndef YYSTACK_ALLOC_MAXIMUM
+ #   define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
+ #  endif
+ #  ifdef __cplusplus
+ extern "C" {
+ #  endif
+ #  ifndef YYMALLOC
+ #   define YYMALLOC malloc
+ #   if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
+ 	&& (defined (__STDC__) || defined (__cplusplus)))
+ void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+ #   endif
+ #  endif
+ #  ifndef YYFREE
+ #   define YYFREE free
+ #   if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \
+ 	&& (defined (__STDC__) || defined (__cplusplus)))
+ void free (void *); /* INFRINGES ON USER NAME SPACE */
+ #   endif
+ #  endif
+ #  ifdef __cplusplus
+ }
+ #  endif
  # endif
  #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
  
***************
*** 378,384 ****
  /* A type that is properly aligned for any stack member.  */
  union yyalloc
  {
!   short yyss;
    YYSTYPE yyvs;
    };
  
--- 432,438 ----
  /* A type that is properly aligned for any stack member.  */
  union yyalloc
  {
!   short int yyss;
    YYSTYPE yyvs;
    };
  
***************
*** 388,394 ****
  /* The size of an array large to enough to hold all stacks, each with
     N elements.  */
  # define YYSTACK_BYTES(N) \
!      ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
        + YYSTACK_GAP_MAXIMUM)
  
  /* Copy COUNT objects from FROM to TO.  The source and destination do
--- 442,448 ----
  /* The size of an array large to enough to hold all stacks, each with
     N elements.  */
  # define YYSTACK_BYTES(N) \
!      ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
        + YYSTACK_GAP_MAXIMUM)
  
  /* Copy COUNT objects from FROM to TO.  The source and destination do
***************
*** 401,407 ****
  #   define YYCOPY(To, From, Count)		\
        do					\
  	{					\
! 	  register YYSIZE_T yyi;		\
  	  for (yyi = 0; yyi < (Count); yyi++)	\
  	    (To)[yyi] = (From)[yyi];		\
  	}					\
--- 455,461 ----
  #   define YYCOPY(To, From, Count)		\
        do					\
  	{					\
! 	  YYSIZE_T yyi;				\
  	  for (yyi = 0; yyi < (Count); yyi++)	\
  	    (To)[yyi] = (From)[yyi];		\
  	}					\
***************
*** 430,436 ****
  #if defined (__STDC__) || defined (__cplusplus)
     typedef signed char yysigned_char;
  #else
!    typedef short yysigned_char;
  #endif
  
  /* YYFINAL -- State number of the termination state. */
--- 484,490 ----
  #if defined (__STDC__) || defined (__cplusplus)
     typedef signed char yysigned_char;
  #else
!    typedef short int yysigned_char;
  #endif
  
  /* YYFINAL -- State number of the termination state. */
***************
*** 451,457 ****
  #define YYUNDEFTOK  2
  #define YYMAXUTOK   276
  
! #define YYTRANSLATE(YYX) 						\
    ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
  
  /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
--- 505,511 ----
  #define YYUNDEFTOK  2
  #define YYMAXUTOK   276
  
! #define YYTRANSLATE(YYX)						\
    ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
  
  /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
***************
*** 531,537 ****
  };
  
  /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
! static const unsigned short yyrline[] =
  {
         0,   230,   230,   231,   235,   242,   244,   248,   250,   252,
       254,   256,   258,   260,   264,   272,   280,   290,   297,   309,
--- 585,591 ----
  };
  
  /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
! static const unsigned short int yyrline[] =
  {
         0,   230,   230,   231,   235,   242,   244,   248,   250,   252,
       254,   256,   258,   260,   264,   272,   280,   290,   297,   309,
***************
*** 544,551 ****
  };
  #endif
  
! #if YYDEBUG || YYERROR_VERBOSE
! /* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
     First, the terminals, then, starting at YYNTOKENS, nonterminals. */
  static const char *const yytname[] =
  {
--- 598,605 ----
  };
  #endif
  
! #if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
! /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
     First, the terminals, then, starting at YYNTOKENS, nonterminals. */
  static const char *const yytname[] =
  {
***************
*** 563,569 ****
  # ifdef YYPRINT
  /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
     token YYLEX-NUM.  */
! static const unsigned short yytoknum[] =
  {
         0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
       265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
--- 617,623 ----
  # ifdef YYPRINT
  /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
     token YYLEX-NUM.  */
! static const unsigned short int yytoknum[] =
  {
         0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
       265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
***************
*** 692,713 ****
        43,    41,    19,    18,    44,    43
  };
  
- #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
- # define YYSIZE_T __SIZE_TYPE__
- #endif
- #if ! defined (YYSIZE_T) && defined (size_t)
- # define YYSIZE_T size_t
- #endif
- #if ! defined (YYSIZE_T)
- # if defined (__STDC__) || defined (__cplusplus)
- #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
- #  define YYSIZE_T size_t
- # endif
- #endif
- #if ! defined (YYSIZE_T)
- # define YYSIZE_T unsigned int
- #endif
- 
  #define yyerrok		(yyerrstatus = 0)
  #define yyclearin	(yychar = YYEMPTY)
  #define YYEMPTY		(-2)
--- 746,751 ----
***************
*** 737,762 ****
        goto yybackup;						\
      }								\
    else								\
!     { 								\
!       yyerror (pc, "syntax error: cannot back up");\
        YYERROR;							\
      }								\
  while (0)
  
  #define YYTERROR	1
  #define YYERRCODE	256
  
- /* YYLLOC_DEFAULT -- Compute the default location (before the actions
-    are run).  */
  
  #ifndef YYLLOC_DEFAULT
! # define YYLLOC_DEFAULT(Current, Rhs, N)		\
!    ((Current).first_line   = (Rhs)[1].first_line,	\
!     (Current).first_column = (Rhs)[1].first_column,	\
!     (Current).last_line    = (Rhs)[N].last_line,	\
!     (Current).last_column  = (Rhs)[N].last_column)
  #endif
  
  /* YYLEX -- calling `yylex' with the right arguments.  */
  
  #ifdef YYLEX_PARAM
--- 775,833 ----
        goto yybackup;						\
      }								\
    else								\
!     {								\
!       yyerror (pc, YY_("syntax error: cannot back up")); \
        YYERROR;							\
      }								\
  while (0)
  
+ 
  #define YYTERROR	1
  #define YYERRCODE	256
  
  
+ /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+    If N is 0, then set CURRENT to the empty location which ends
+    the previous symbol: RHS[0] (always defined).  */
+ 
+ #define YYRHSLOC(Rhs, K) ((Rhs)[K])
  #ifndef YYLLOC_DEFAULT
! # define YYLLOC_DEFAULT(Current, Rhs, N)				\
!     do									\
!       if (N)								\
! 	{								\
! 	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
! 	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
! 	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
! 	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
! 	}								\
!       else								\
! 	{								\
! 	  (Current).first_line   = (Current).last_line   =		\
! 	    YYRHSLOC (Rhs, 0).last_line;				\
! 	  (Current).first_column = (Current).last_column =		\
! 	    YYRHSLOC (Rhs, 0).last_column;				\
! 	}								\
!     while (0)
! #endif
! 
! 
! /* YY_LOCATION_PRINT -- Print the location on the stream.
!    This macro was not mandated originally: define only if we know
!    we won't break user code: when these are the locations we know.  */
! 
! #ifndef YY_LOCATION_PRINT
! # if YYLTYPE_IS_TRIVIAL
! #  define YY_LOCATION_PRINT(File, Loc)			\
!      fprintf (File, "%d.%d-%d.%d",			\
!               (Loc).first_line, (Loc).first_column,	\
!               (Loc).last_line,  (Loc).last_column)
! # else
! #  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
! # endif
  #endif
  
+ 
  /* YYLEX -- calling `yylex' with the right arguments.  */
  
  #ifdef YYLEX_PARAM
***************
*** 779,797 ****
      YYFPRINTF Args;				\
  } while (0)
  
! # define YYDSYMPRINT(Args)			\
! do {						\
!   if (yydebug)					\
!     yysymprint Args;				\
! } while (0)
! 
! # define YYDSYMPRINTF(Title, Token, Value, Location)		\
  do {								\
    if (yydebug)							\
      {								\
        YYFPRINTF (stderr, "%s ", Title);				\
!       yysymprint (stderr, 					\
!                   Token, Value);	\
        YYFPRINTF (stderr, "\n");					\
      }								\
  } while (0)
--- 850,862 ----
      YYFPRINTF Args;				\
  } while (0)
  
! # define YY_SYMBOL_PRINT(Title, Type, Value, Location)		\
  do {								\
    if (yydebug)							\
      {								\
        YYFPRINTF (stderr, "%s ", Title);				\
!       yysymprint (stderr,					\
!                   Type, Value);	\
        YYFPRINTF (stderr, "\n");					\
      }								\
  } while (0)
***************
*** 803,814 ****
  
  #if defined (__STDC__) || defined (__cplusplus)
  static void
! yy_stack_print (short *bottom, short *top)
  #else
  static void
  yy_stack_print (bottom, top)
!     short *bottom;
!     short *top;
  #endif
  {
    YYFPRINTF (stderr, "Stack now");
--- 868,879 ----
  
  #if defined (__STDC__) || defined (__cplusplus)
  static void
! yy_stack_print (short int *bottom, short int *top)
  #else
  static void
  yy_stack_print (bottom, top)
!     short int *bottom;
!     short int *top;
  #endif
  {
    YYFPRINTF (stderr, "Stack now");
***************
*** 838,850 ****
  #endif
  {
    int yyi;
!   unsigned int yylno = yyrline[yyrule];
!   YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
               yyrule - 1, yylno);
    /* Print the symbols being reduced, and their result.  */
    for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
!     YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
!   YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
  }
  
  # define YY_REDUCE_PRINT(Rule)		\
--- 903,915 ----
  #endif
  {
    int yyi;
!   unsigned long int yylno = yyrline[yyrule];
!   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ",
               yyrule - 1, yylno);
    /* Print the symbols being reduced, and their result.  */
    for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
!     YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
!   YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]);
  }
  
  # define YY_REDUCE_PRINT(Rule)		\
***************
*** 858,865 ****
  int yydebug;
  #else /* !YYDEBUG */
  # define YYDPRINTF(Args)
! # define YYDSYMPRINT(Args)
! # define YYDSYMPRINTF(Title, Token, Value, Location)
  # define YY_STACK_PRINT(Bottom, Top)
  # define YY_REDUCE_PRINT(Rule)
  #endif /* !YYDEBUG */
--- 923,929 ----
  int yydebug;
  #else /* !YYDEBUG */
  # define YYDPRINTF(Args)
! # define YY_SYMBOL_PRINT(Title, Type, Value, Location)
  # define YY_STACK_PRINT(Bottom, Top)
  # define YY_REDUCE_PRINT(Rule)
  #endif /* !YYDEBUG */
***************
*** 874,886 ****
     if the built-in stack extension method is used).
  
     Do not make this value too large; the results are undefined if
!    SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
     evaluated with infinite-precision integer arithmetic.  */
  
- #if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
- # undef YYMAXDEPTH
- #endif
- 
  #ifndef YYMAXDEPTH
  # define YYMAXDEPTH 10000
  #endif
--- 938,946 ----
     if the built-in stack extension method is used).
  
     Do not make this value too large; the results are undefined if
!    YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
     evaluated with infinite-precision integer arithmetic.  */
  
  #ifndef YYMAXDEPTH
  # define YYMAXDEPTH 10000
  #endif
***************
*** 902,908 ****
       const char *yystr;
  #   endif
  {
!   register const char *yys = yystr;
  
    while (*yys++ != '\0')
      continue;
--- 962,968 ----
       const char *yystr;
  #   endif
  {
!   const char *yys = yystr;
  
    while (*yys++ != '\0')
      continue;
***************
*** 927,934 ****
       const char *yysrc;
  #   endif
  {
!   register char *yyd = yydest;
!   register const char *yys = yysrc;
  
    while ((*yyd++ = *yys++) != '\0')
      continue;
--- 987,994 ----
       const char *yysrc;
  #   endif
  {
!   char *yyd = yydest;
!   const char *yys = yysrc;
  
    while ((*yyd++ = *yys++) != '\0')
      continue;
***************
*** 938,944 ****
  #  endif
  # endif
  
! #endif /* !YYERROR_VERBOSE */
  
  
  
--- 998,1052 ----
  #  endif
  # endif
  
! # ifndef yytnamerr
! /* Copy to YYRES the contents of YYSTR after stripping away unnecessary
!    quotes and backslashes, so that it's suitable for yyerror.  The
!    heuristic is that double-quoting is unnecessary unless the string
!    contains an apostrophe, a comma, or backslash (other than
!    backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
!    null, do not copy; instead, return the length of what the result
!    would have been.  */
! static YYSIZE_T
! yytnamerr (char *yyres, const char *yystr)
! {
!   if (*yystr == '"')
!     {
!       size_t yyn = 0;
!       char const *yyp = yystr;
! 
!       for (;;)
! 	switch (*++yyp)
! 	  {
! 	  case '\'':
! 	  case ',':
! 	    goto do_not_strip_quotes;
! 
! 	  case '\\':
! 	    if (*++yyp != '\\')
! 	      goto do_not_strip_quotes;
! 	    /* Fall through.  */
! 	  default:
! 	    if (yyres)
! 	      yyres[yyn] = *yyp;
! 	    yyn++;
! 	    break;
! 
! 	  case '"':
! 	    if (yyres)
! 	      yyres[yyn] = '\0';
! 	    return yyn;
! 	  }
!     do_not_strip_quotes: ;
!     }
! 
!   if (! yyres)
!     return yystrlen (yystr);
! 
!   return yystpcpy (yyres, yystr) - yyres;
! }
! # endif
! 
! #endif /* YYERROR_VERBOSE */
  
  
  
***************
*** 962,976 ****
    (void) yyvaluep;
  
    if (yytype < YYNTOKENS)
!     {
!       YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
! # ifdef YYPRINT
!       YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
! # endif
!     }
    else
      YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
  
    switch (yytype)
      {
        default:
--- 1070,1084 ----
    (void) yyvaluep;
  
    if (yytype < YYNTOKENS)
!     YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
    else
      YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
  
+ 
+ # ifdef YYPRINT
+   if (yytype < YYNTOKENS)
+     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+ # endif
    switch (yytype)
      {
        default:
***************
*** 986,995 ****
  
  #if defined (__STDC__) || defined (__cplusplus)
  static void
! yydestruct (int yytype, YYSTYPE *yyvaluep)
  #else
  static void
! yydestruct (yytype, yyvaluep)
      int yytype;
      YYSTYPE *yyvaluep;
  #endif
--- 1094,1104 ----
  
  #if defined (__STDC__) || defined (__cplusplus)
  static void
! yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
  #else
  static void
! yydestruct (yymsg, yytype, yyvaluep)
!     const char *yymsg;
      int yytype;
      YYSTYPE *yyvaluep;
  #endif
***************
*** 997,1002 ****
--- 1106,1115 ----
    /* Pacify ``unused variable'' warnings.  */
    (void) yyvaluep;
  
+   if (!yymsg)
+     yymsg = "Deleting";
+   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+ 
    switch (yytype)
      {
  
***************
*** 1016,1022 ****
  # endif
  #else /* ! YYPARSE_PARAM */
  #if defined (__STDC__) || defined (__cplusplus)
! int yyparse ( parser_control *pc );
  #else
  int yyparse ();
  #endif
--- 1129,1135 ----
  # endif
  #else /* ! YYPARSE_PARAM */
  #if defined (__STDC__) || defined (__cplusplus)
! int yyparse (parser_control *pc);
  #else
  int yyparse ();
  #endif
***************
*** 1041,1069 ****
  #else /* ! YYPARSE_PARAM */
  #if defined (__STDC__) || defined (__cplusplus)
  int
! yyparse ( parser_control *pc )
  #else
  int
  yyparse (pc)
!      parser_control *pc ;
  #endif
  #endif
  {
!   /* The lookahead symbol.  */
  int yychar;
  
! /* The semantic value of the lookahead symbol.  */
  YYSTYPE yylval;
  
  /* Number of syntax errors so far.  */
  int yynerrs;
  
!   register int yystate;
!   register int yyn;
    int yyresult;
    /* Number of tokens to shift before error messages enabled.  */
    int yyerrstatus;
!   /* Lookahead token as an internal (translated) token number.  */
    int yytoken = 0;
  
    /* Three stacks and their tools:
--- 1154,1182 ----
  #else /* ! YYPARSE_PARAM */
  #if defined (__STDC__) || defined (__cplusplus)
  int
! yyparse (parser_control *pc)
  #else
  int
  yyparse (pc)
!     parser_control *pc;
  #endif
  #endif
  {
!   /* The look-ahead symbol.  */
  int yychar;
  
! /* The semantic value of the look-ahead symbol.  */
  YYSTYPE yylval;
  
  /* Number of syntax errors so far.  */
  int yynerrs;
  
!   int yystate;
!   int yyn;
    int yyresult;
    /* Number of tokens to shift before error messages enabled.  */
    int yyerrstatus;
!   /* Look-ahead token as an internal (translated) token number.  */
    int yytoken = 0;
  
    /* Three stacks and their tools:
***************
*** 1075,1088 ****
       to reallocate them elsewhere.  */
  
    /* The state stack.  */
!   short	yyssa[YYINITDEPTH];
!   short *yyss = yyssa;
!   register short *yyssp;
  
    /* The semantic value stack.  */
    YYSTYPE yyvsa[YYINITDEPTH];
    YYSTYPE *yyvs = yyvsa;
!   register YYSTYPE *yyvsp;
  
  
  
--- 1188,1201 ----
       to reallocate them elsewhere.  */
  
    /* The state stack.  */
!   short int yyssa[YYINITDEPTH];
!   short int *yyss = yyssa;
!   short int *yyssp;
  
    /* The semantic value stack.  */
    YYSTYPE yyvsa[YYINITDEPTH];
    YYSTYPE *yyvs = yyvsa;
!   YYSTYPE *yyvsp;
  
  
  
***************
*** 1139,1152 ****
  	   these so that the &'s don't force the real ones into
  	   memory.  */
  	YYSTYPE *yyvs1 = yyvs;
! 	short *yyss1 = yyss;
  
  
  	/* Each stack pointer address is followed by the size of the
  	   data in use in that stack, in bytes.  This used to be a
  	   conditional around just the two extra args, but that might
  	   be undefined if yyoverflow is a macro.  */
! 	yyoverflow ("parser stack overflow",
  		    &yyss1, yysize * sizeof (*yyssp),
  		    &yyvs1, yysize * sizeof (*yyvsp),
  
--- 1252,1265 ----
  	   these so that the &'s don't force the real ones into
  	   memory.  */
  	YYSTYPE *yyvs1 = yyvs;
! 	short int *yyss1 = yyss;
  
  
  	/* Each stack pointer address is followed by the size of the
  	   data in use in that stack, in bytes.  This used to be a
  	   conditional around just the two extra args, but that might
  	   be undefined if yyoverflow is a macro.  */
! 	yyoverflow (YY_("memory exhausted"),
  		    &yyss1, yysize * sizeof (*yyssp),
  		    &yyvs1, yysize * sizeof (*yyvsp),
  
***************
*** 1157,1177 ****
        }
  #else /* no yyoverflow */
  # ifndef YYSTACK_RELOCATE
!       goto yyoverflowlab;
  # else
        /* Extend the stack our own way.  */
        if (YYMAXDEPTH <= yystacksize)
! 	goto yyoverflowlab;
        yystacksize *= 2;
        if (YYMAXDEPTH < yystacksize)
  	yystacksize = YYMAXDEPTH;
  
        {
! 	short *yyss1 = yyss;
  	union yyalloc *yyptr =
  	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
  	if (! yyptr)
! 	  goto yyoverflowlab;
  	YYSTACK_RELOCATE (yyss);
  	YYSTACK_RELOCATE (yyvs);
  
--- 1270,1290 ----
        }
  #else /* no yyoverflow */
  # ifndef YYSTACK_RELOCATE
!       goto yyexhaustedlab;
  # else
        /* Extend the stack our own way.  */
        if (YYMAXDEPTH <= yystacksize)
! 	goto yyexhaustedlab;
        yystacksize *= 2;
        if (YYMAXDEPTH < yystacksize)
  	yystacksize = YYMAXDEPTH;
  
        {
! 	short int *yyss1 = yyss;
  	union yyalloc *yyptr =
  	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
  	if (! yyptr)
! 	  goto yyexhaustedlab;
  	YYSTACK_RELOCATE (yyss);
  	YYSTACK_RELOCATE (yyvs);
  
***************
*** 1203,1220 ****
  yybackup:
  
  /* Do appropriate processing given the current state.  */
! /* Read a lookahead token if we need one and don't already have one.  */
  /* yyresume: */
  
!   /* First try to decide what to do without reference to lookahead token.  */
  
    yyn = yypact[yystate];
    if (yyn == YYPACT_NINF)
      goto yydefault;
  
!   /* Not known => get a lookahead token if don't already have one.  */
  
!   /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
    if (yychar == YYEMPTY)
      {
        YYDPRINTF ((stderr, "Reading a token: "));
--- 1316,1333 ----
  yybackup:
  
  /* Do appropriate processing given the current state.  */
! /* Read a look-ahead token if we need one and don't already have one.  */
  /* yyresume: */
  
!   /* First try to decide what to do without reference to look-ahead token.  */
  
    yyn = yypact[yystate];
    if (yyn == YYPACT_NINF)
      goto yydefault;
  
!   /* Not known => get a look-ahead token if don't already have one.  */
  
!   /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
    if (yychar == YYEMPTY)
      {
        YYDPRINTF ((stderr, "Reading a token: "));
***************
*** 1229,1235 ****
    else
      {
        yytoken = YYTRANSLATE (yychar);
!       YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
      }
  
    /* If the proper action on seeing token YYTOKEN is to reduce or to
--- 1342,1348 ----
    else
      {
        yytoken = YYTRANSLATE (yychar);
!       YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
      }
  
    /* If the proper action on seeing token YYTOKEN is to reduce or to
***************
*** 1249,1256 ****
    if (yyn == YYFINAL)
      YYACCEPT;
  
!   /* Shift the lookahead token.  */
!   YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
  
    /* Discard the token being shifted unless it is eof.  */
    if (yychar != YYEOF)
--- 1362,1369 ----
    if (yyn == YYFINAL)
      YYACCEPT;
  
!   /* Shift the look-ahead token.  */
!   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
  
    /* Discard the token being shifted unless it is eof.  */
    if (yychar != YYEOF)
***************
*** 1300,1571 ****
    switch (yyn)
      {
          case 4:
! #line 236 "getdate.y"
      {
! 	pc->seconds = yyvsp[0].timespec;
  	pc->timespec_seen = true;
        }
      break;
  
    case 7:
! #line 249 "getdate.y"
      { pc->times_seen++; }
      break;
  
    case 8:
! #line 251 "getdate.y"
      { pc->local_zones_seen++; }
      break;
  
    case 9:
! #line 253 "getdate.y"
      { pc->zones_seen++; }
      break;
  
    case 10:
! #line 255 "getdate.y"
      { pc->dates_seen++; }
      break;
  
    case 11:
! #line 257 "getdate.y"
      { pc->days_seen++; }
      break;
  
    case 12:
! #line 259 "getdate.y"
      { pc->rels_seen = true; }
      break;
  
    case 14:
! #line 265 "getdate.y"
      {
! 	pc->hour = yyvsp[-1].textintval.value;
  	pc->minutes = 0;
  	pc->seconds.tv_sec = 0;
  	pc->seconds.tv_nsec = 0;
! 	pc->meridian = yyvsp[0].intval;
        }
      break;
  
    case 15:
! #line 273 "getdate.y"
      {
! 	pc->hour = yyvsp[-3].textintval.value;
! 	pc->minutes = yyvsp[-1].textintval.value;
  	pc->seconds.tv_sec = 0;
  	pc->seconds.tv_nsec = 0;
! 	pc->meridian = yyvsp[0].intval;
        }
      break;
  
    case 16:
! #line 281 "getdate.y"
      {
! 	pc->hour = yyvsp[-4].textintval.value;
! 	pc->minutes = yyvsp[-2].textintval.value;
  	pc->seconds.tv_sec = 0;
  	pc->seconds.tv_nsec = 0;
  	pc->meridian = MER24;
  	pc->zones_seen++;
! 	pc->time_zone = time_zone_hhmm (yyvsp[-1].textintval, yyvsp[0].intval);
        }
      break;
  
    case 17:
! #line 291 "getdate.y"
      {
! 	pc->hour = yyvsp[-5].textintval.value;
! 	pc->minutes = yyvsp[-3].textintval.value;
! 	pc->seconds = yyvsp[-1].timespec;
! 	pc->meridian = yyvsp[0].intval;
        }
      break;
  
    case 18:
! #line 298 "getdate.y"
      {
! 	pc->hour = yyvsp[-6].textintval.value;
! 	pc->minutes = yyvsp[-4].textintval.value;
! 	pc->seconds = yyvsp[-2].timespec;
  	pc->meridian = MER24;
  	pc->zones_seen++;
! 	pc->time_zone = time_zone_hhmm (yyvsp[-1].textintval, yyvsp[0].intval);
        }
      break;
  
    case 19:
! #line 310 "getdate.y"
      {
! 	pc->local_isdst = yyvsp[0].intval;
! 	pc->dsts_seen += (0 < yyvsp[0].intval);
        }
      break;
  
    case 20:
! #line 315 "getdate.y"
      {
  	pc->local_isdst = 1;
! 	pc->dsts_seen += (0 < yyvsp[-1].intval) + 1;
        }
      break;
  
    case 21:
! #line 323 "getdate.y"
!     { pc->time_zone = yyvsp[0].intval; }
      break;
  
    case 22:
! #line 325 "getdate.y"
!     { pc->time_zone = yyvsp[-1].intval; pc->rels_seen = true; }
      break;
  
    case 23:
! #line 327 "getdate.y"
!     { pc->time_zone = yyvsp[-2].intval + time_zone_hhmm (yyvsp[-1].textintval, yyvsp[0].intval); }
      break;
  
    case 24:
! #line 329 "getdate.y"
!     { pc->time_zone = yyvsp[0].intval + 60; }
      break;
  
    case 25:
! #line 331 "getdate.y"
!     { pc->time_zone = yyvsp[-1].intval + 60; }
      break;
  
    case 26:
! #line 336 "getdate.y"
      {
  	pc->day_ordinal = 1;
! 	pc->day_number = yyvsp[0].intval;
        }
      break;
  
    case 27:
! #line 341 "getdate.y"
      {
  	pc->day_ordinal = 1;
! 	pc->day_number = yyvsp[-1].intval;
        }
      break;
  
    case 28:
! #line 346 "getdate.y"
      {
! 	pc->day_ordinal = yyvsp[-1].intval;
! 	pc->day_number = yyvsp[0].intval;
        }
      break;
  
    case 29:
! #line 351 "getdate.y"
      {
! 	pc->day_ordinal = yyvsp[-1].textintval.value;
! 	pc->day_number = yyvsp[0].intval;
        }
      break;
  
    case 30:
! #line 359 "getdate.y"
      {
! 	pc->month = yyvsp[-2].textintval.value;
! 	pc->day = yyvsp[0].textintval.value;
        }
      break;
  
    case 31:
! #line 364 "getdate.y"
      {
  	/* Interpret as YYYY/MM/DD if the first value has 4 or more digits,
  	   otherwise as MM/DD/YY.
  	   The goal in recognizing YYYY/MM/DD is solely to support legacy
  	   machine-generated dates like those in an RCS log listing.  If
  	   you want portability, use the ISO 8601 format.  */
! 	if (4 <= yyvsp[-4].textintval.digits)
  	  {
! 	    pc->year = yyvsp[-4].textintval;
! 	    pc->month = yyvsp[-2].textintval.value;
! 	    pc->day = yyvsp[0].textintval.value;
  	  }
  	else
  	  {
! 	    pc->month = yyvsp[-4].textintval.value;
! 	    pc->day = yyvsp[-2].textintval.value;
! 	    pc->year = yyvsp[0].textintval;
  	  }
        }
      break;
  
    case 32:
! #line 384 "getdate.y"
      {
  	/* ISO 8601 format.  YYYY-MM-DD.  */
! 	pc->year = yyvsp[-2].textintval;
! 	pc->month = -yyvsp[-1].textintval.value;
! 	pc->day = -yyvsp[0].textintval.value;
        }
      break;
  
    case 33:
! #line 391 "getdate.y"
      {
  	/* e.g. 17-JUN-1992.  */
! 	pc->day = yyvsp[-2].textintval.value;
! 	pc->month = yyvsp[-1].intval;
! 	pc->year.value = -yyvsp[0].textintval.value;
! 	pc->year.digits = yyvsp[0].textintval.digits;
        }
      break;
  
    case 34:
! #line 399 "getdate.y"
      {
  	/* e.g. JUN-17-1992.  */
! 	pc->month = yyvsp[-2].intval;
! 	pc->day = -yyvsp[-1].textintval.value;
! 	pc->year.value = -yyvsp[0].textintval.value;
! 	pc->year.digits = yyvsp[0].textintval.digits;
        }
      break;
  
    case 35:
! #line 407 "getdate.y"
      {
! 	pc->month = yyvsp[-1].intval;
! 	pc->day = yyvsp[0].textintval.value;
        }
      break;
  
    case 36:
! #line 412 "getdate.y"
      {
! 	pc->month = yyvsp[-3].intval;
! 	pc->day = yyvsp[-2].textintval.value;
! 	pc->year = yyvsp[0].textintval;
        }
      break;
  
    case 37:
! #line 418 "getdate.y"
      {
! 	pc->day = yyvsp[-1].textintval.value;
! 	pc->month = yyvsp[0].intval;
        }
      break;
  
    case 38:
! #line 423 "getdate.y"
      {
! 	pc->day = yyvsp[-2].textintval.value;
! 	pc->month = yyvsp[-1].intval;
! 	pc->year = yyvsp[0].textintval;
        }
      break;
  
    case 39:
! #line 432 "getdate.y"
      {
  	pc->rel_ns = -pc->rel_ns;
  	pc->rel_seconds = -pc->rel_seconds;
--- 1413,1684 ----
    switch (yyn)
      {
          case 4:
! #line 236 "../lib/getdate.y"
      {
! 	pc->seconds = (yyvsp[0].timespec);
  	pc->timespec_seen = true;
        }
      break;
  
    case 7:
! #line 249 "../lib/getdate.y"
      { pc->times_seen++; }
      break;
  
    case 8:
! #line 251 "../lib/getdate.y"
      { pc->local_zones_seen++; }
      break;
  
    case 9:
! #line 253 "../lib/getdate.y"
      { pc->zones_seen++; }
      break;
  
    case 10:
! #line 255 "../lib/getdate.y"
      { pc->dates_seen++; }
      break;
  
    case 11:
! #line 257 "../lib/getdate.y"
      { pc->days_seen++; }
      break;
  
    case 12:
! #line 259 "../lib/getdate.y"
      { pc->rels_seen = true; }
      break;
  
    case 14:
! #line 265 "../lib/getdate.y"
      {
! 	pc->hour = (yyvsp[-1].textintval).value;
  	pc->minutes = 0;
  	pc->seconds.tv_sec = 0;
  	pc->seconds.tv_nsec = 0;
! 	pc->meridian = (yyvsp[0].intval);
        }
      break;
  
    case 15:
! #line 273 "../lib/getdate.y"
      {
! 	pc->hour = (yyvsp[-3].textintval).value;
! 	pc->minutes = (yyvsp[-1].textintval).value;
  	pc->seconds.tv_sec = 0;
  	pc->seconds.tv_nsec = 0;
! 	pc->meridian = (yyvsp[0].intval);
        }
      break;
  
    case 16:
! #line 281 "../lib/getdate.y"
      {
! 	pc->hour = (yyvsp[-4].textintval).value;
! 	pc->minutes = (yyvsp[-2].textintval).value;
  	pc->seconds.tv_sec = 0;
  	pc->seconds.tv_nsec = 0;
  	pc->meridian = MER24;
  	pc->zones_seen++;
! 	pc->time_zone = time_zone_hhmm ((yyvsp[-1].textintval), (yyvsp[0].intval));
        }
      break;
  
    case 17:
! #line 291 "../lib/getdate.y"
      {
! 	pc->hour = (yyvsp[-5].textintval).value;
! 	pc->minutes = (yyvsp[-3].textintval).value;
! 	pc->seconds = (yyvsp[-1].timespec);
! 	pc->meridian = (yyvsp[0].intval);
        }
      break;
  
    case 18:
! #line 298 "../lib/getdate.y"
      {
! 	pc->hour = (yyvsp[-6].textintval).value;
! 	pc->minutes = (yyvsp[-4].textintval).value;
! 	pc->seconds = (yyvsp[-2].timespec);
  	pc->meridian = MER24;
  	pc->zones_seen++;
! 	pc->time_zone = time_zone_hhmm ((yyvsp[-1].textintval), (yyvsp[0].intval));
        }
      break;
  
    case 19:
! #line 310 "../lib/getdate.y"
      {
! 	pc->local_isdst = (yyvsp[0].intval);
! 	pc->dsts_seen += (0 < (yyvsp[0].intval));
        }
      break;
  
    case 20:
! #line 315 "../lib/getdate.y"
      {
  	pc->local_isdst = 1;
! 	pc->dsts_seen += (0 < (yyvsp[-1].intval)) + 1;
        }
      break;
  
    case 21:
! #line 323 "../lib/getdate.y"
!     { pc->time_zone = (yyvsp[0].intval); }
      break;
  
    case 22:
! #line 325 "../lib/getdate.y"
!     { pc->time_zone = (yyvsp[-1].intval); pc->rels_seen = true; }
      break;
  
    case 23:
! #line 327 "../lib/getdate.y"
!     { pc->time_zone = (yyvsp[-2].intval) + time_zone_hhmm ((yyvsp[-1].textintval), (yyvsp[0].intval)); }
      break;
  
    case 24:
! #line 329 "../lib/getdate.y"
!     { pc->time_zone = (yyvsp[0].intval) + 60; }
      break;
  
    case 25:
! #line 331 "../lib/getdate.y"
!     { pc->time_zone = (yyvsp[-1].intval) + 60; }
      break;
  
    case 26:
! #line 336 "../lib/getdate.y"
      {
  	pc->day_ordinal = 1;
! 	pc->day_number = (yyvsp[0].intval);
        }
      break;
  
    case 27:
! #line 341 "../lib/getdate.y"
      {
  	pc->day_ordinal = 1;
! 	pc->day_number = (yyvsp[-1].intval);
        }
      break;
  
    case 28:
! #line 346 "../lib/getdate.y"
      {
! 	pc->day_ordinal = (yyvsp[-1].intval);
! 	pc->day_number = (yyvsp[0].intval);
        }
      break;
  
    case 29:
! #line 351 "../lib/getdate.y"
      {
! 	pc->day_ordinal = (yyvsp[-1].textintval).value;
! 	pc->day_number = (yyvsp[0].intval);
        }
      break;
  
    case 30:
! #line 359 "../lib/getdate.y"
      {
! 	pc->month = (yyvsp[-2].textintval).value;
! 	pc->day = (yyvsp[0].textintval).value;
        }
      break;
  
    case 31:
! #line 364 "../lib/getdate.y"
      {
  	/* Interpret as YYYY/MM/DD if the first value has 4 or more digits,
  	   otherwise as MM/DD/YY.
  	   The goal in recognizing YYYY/MM/DD is solely to support legacy
  	   machine-generated dates like those in an RCS log listing.  If
  	   you want portability, use the ISO 8601 format.  */
! 	if (4 <= (yyvsp[-4].textintval).digits)
  	  {
! 	    pc->year = (yyvsp[-4].textintval);
! 	    pc->month = (yyvsp[-2].textintval).value;
! 	    pc->day = (yyvsp[0].textintval).value;
  	  }
  	else
  	  {
! 	    pc->month = (yyvsp[-4].textintval).value;
! 	    pc->day = (yyvsp[-2].textintval).value;
! 	    pc->year = (yyvsp[0].textintval);
  	  }
        }
      break;
  
    case 32:
! #line 384 "../lib/getdate.y"
      {
  	/* ISO 8601 format.  YYYY-MM-DD.  */
! 	pc->year = (yyvsp[-2].textintval);
! 	pc->month = -(yyvsp[-1].textintval).value;
! 	pc->day = -(yyvsp[0].textintval).value;
        }
      break;
  
    case 33:
! #line 391 "../lib/getdate.y"
      {
  	/* e.g. 17-JUN-1992.  */
! 	pc->day = (yyvsp[-2].textintval).value;
! 	pc->month = (yyvsp[-1].intval);
! 	pc->year.value = -(yyvsp[0].textintval).value;
! 	pc->year.digits = (yyvsp[0].textintval).digits;
        }
      break;
  
    case 34:
! #line 399 "../lib/getdate.y"
      {
  	/* e.g. JUN-17-1992.  */
! 	pc->month = (yyvsp[-2].intval);
! 	pc->day = -(yyvsp[-1].textintval).value;
! 	pc->year.value = -(yyvsp[0].textintval).value;
! 	pc->year.digits = (yyvsp[0].textintval).digits;
        }
      break;
  
    case 35:
! #line 407 "../lib/getdate.y"
      {
! 	pc->month = (yyvsp[-1].intval);
! 	pc->day = (yyvsp[0].textintval).value;
        }
      break;
  
    case 36:
! #line 412 "../lib/getdate.y"
      {
! 	pc->month = (yyvsp[-3].intval);
! 	pc->day = (yyvsp[-2].textintval).value;
! 	pc->year = (yyvsp[0].textintval);
        }
      break;
  
    case 37:
! #line 418 "../lib/getdate.y"
      {
! 	pc->day = (yyvsp[-1].textintval).value;
! 	pc->month = (yyvsp[0].intval);
        }
      break;
  
    case 38:
! #line 423 "../lib/getdate.y"
      {
! 	pc->day = (yyvsp[-2].textintval).value;
! 	pc->month = (yyvsp[-1].intval);
! 	pc->year = (yyvsp[0].textintval);
        }
      break;
  
    case 39:
! #line 432 "../lib/getdate.y"
      {
  	pc->rel_ns = -pc->rel_ns;
  	pc->rel_seconds = -pc->rel_seconds;
***************
*** 1578,1750 ****
      break;
  
    case 41:
! #line 446 "getdate.y"
!     { pc->rel_year += yyvsp[-1].intval * yyvsp[0].intval; }
      break;
  
    case 42:
! #line 448 "getdate.y"
!     { pc->rel_year += yyvsp[-1].textintval.value * yyvsp[0].intval; }
      break;
  
    case 43:
! #line 450 "getdate.y"
!     { pc->rel_year += yyvsp[0].intval; }
      break;
  
    case 44:
! #line 452 "getdate.y"
!     { pc->rel_month += yyvsp[-1].intval * yyvsp[0].intval; }
      break;
  
    case 45:
! #line 454 "getdate.y"
!     { pc->rel_month += yyvsp[-1].textintval.value * yyvsp[0].intval; }
      break;
  
    case 46:
! #line 456 "getdate.y"
!     { pc->rel_month += yyvsp[0].intval; }
      break;
  
    case 47:
! #line 458 "getdate.y"
!     { pc->rel_day += yyvsp[-1].intval * yyvsp[0].intval; }
      break;
  
    case 48:
! #line 460 "getdate.y"
!     { pc->rel_day += yyvsp[-1].textintval.value * yyvsp[0].intval; }
      break;
  
    case 49:
! #line 462 "getdate.y"
!     { pc->rel_day += yyvsp[0].intval; }
      break;
  
    case 50:
! #line 464 "getdate.y"
!     { pc->rel_hour += yyvsp[-1].intval * yyvsp[0].intval; }
      break;
  
    case 51:
! #line 466 "getdate.y"
!     { pc->rel_hour += yyvsp[-1].textintval.value * yyvsp[0].intval; }
      break;
  
    case 52:
! #line 468 "getdate.y"
!     { pc->rel_hour += yyvsp[0].intval; }
      break;
  
    case 53:
! #line 470 "getdate.y"
!     { pc->rel_minutes += yyvsp[-1].intval * yyvsp[0].intval; }
      break;
  
    case 54:
! #line 472 "getdate.y"
!     { pc->rel_minutes += yyvsp[-1].textintval.value * yyvsp[0].intval; }
      break;
  
    case 55:
! #line 474 "getdate.y"
!     { pc->rel_minutes += yyvsp[0].intval; }
      break;
  
    case 56:
! #line 476 "getdate.y"
!     { pc->rel_seconds += yyvsp[-1].intval * yyvsp[0].intval; }
      break;
  
    case 57:
! #line 478 "getdate.y"
!     { pc->rel_seconds += yyvsp[-1].textintval.value * yyvsp[0].intval; }
      break;
  
    case 58:
! #line 480 "getdate.y"
!     { pc->rel_seconds += yyvsp[-1].timespec.tv_sec * yyvsp[0].intval; pc->rel_ns += yyvsp[-1].timespec.tv_nsec * yyvsp[0].intval; }
      break;
  
    case 59:
! #line 482 "getdate.y"
!     { pc->rel_seconds += yyvsp[-1].timespec.tv_sec * yyvsp[0].intval; pc->rel_ns += yyvsp[-1].timespec.tv_nsec * yyvsp[0].intval; }
      break;
  
    case 60:
! #line 484 "getdate.y"
!     { pc->rel_seconds += yyvsp[0].intval; }
      break;
  
    case 62:
! #line 490 "getdate.y"
!     { pc->rel_year += yyvsp[-1].textintval.value * yyvsp[0].intval; }
      break;
  
    case 63:
! #line 492 "getdate.y"
!     { pc->rel_month += yyvsp[-1].textintval.value * yyvsp[0].intval; }
      break;
  
    case 64:
! #line 494 "getdate.y"
!     { pc->rel_day += yyvsp[-1].textintval.value * yyvsp[0].intval; }
      break;
  
    case 65:
! #line 496 "getdate.y"
!     { pc->rel_hour += yyvsp[-1].textintval.value * yyvsp[0].intval; }
      break;
  
    case 66:
! #line 498 "getdate.y"
!     { pc->rel_minutes += yyvsp[-1].textintval.value * yyvsp[0].intval; }
      break;
  
    case 67:
! #line 500 "getdate.y"
!     { pc->rel_seconds += yyvsp[-1].textintval.value * yyvsp[0].intval; }
      break;
  
    case 71:
! #line 508 "getdate.y"
!     { yyval.timespec.tv_sec = yyvsp[0].textintval.value; yyval.timespec.tv_nsec = 0; }
      break;
  
    case 73:
! #line 514 "getdate.y"
!     { yyval.timespec.tv_sec = yyvsp[0].textintval.value; yyval.timespec.tv_nsec = 0; }
      break;
  
    case 74:
! #line 519 "getdate.y"
      {
  	if (pc->dates_seen && ! pc->year.digits
! 	    && ! pc->rels_seen && (pc->times_seen || 2 < yyvsp[0].textintval.digits))
! 	  pc->year = yyvsp[0].textintval;
  	else
  	  {
! 	    if (4 < yyvsp[0].textintval.digits)
  	      {
  		pc->dates_seen++;
! 		pc->day = yyvsp[0].textintval.value % 100;
! 		pc->month = (yyvsp[0].textintval.value / 100) % 100;
! 		pc->year.value = yyvsp[0].textintval.value / 10000;
! 		pc->year.digits = yyvsp[0].textintval.digits - 4;
  	      }
  	    else
  	      {
  		pc->times_seen++;
! 		if (yyvsp[0].textintval.digits <= 2)
  		  {
! 		    pc->hour = yyvsp[0].textintval.value;
  		    pc->minutes = 0;
  		  }
  		else
  		  {
! 		    pc->hour = yyvsp[0].textintval.value / 100;
! 		    pc->minutes = yyvsp[0].textintval.value % 100;
  		  }
  		pc->seconds.tv_sec = 0;
  		pc->seconds.tv_nsec = 0;
--- 1691,1863 ----
      break;
  
    case 41:
! #line 446 "../lib/getdate.y"
!     { pc->rel_year += (yyvsp[-1].intval) * (yyvsp[0].intval); }
      break;
  
    case 42:
! #line 448 "../lib/getdate.y"
!     { pc->rel_year += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
      break;
  
    case 43:
! #line 450 "../lib/getdate.y"
!     { pc->rel_year += (yyvsp[0].intval); }
      break;
  
    case 44:
! #line 452 "../lib/getdate.y"
!     { pc->rel_month += (yyvsp[-1].intval) * (yyvsp[0].intval); }
      break;
  
    case 45:
! #line 454 "../lib/getdate.y"
!     { pc->rel_month += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
      break;
  
    case 46:
! #line 456 "../lib/getdate.y"
!     { pc->rel_month += (yyvsp[0].intval); }
      break;
  
    case 47:
! #line 458 "../lib/getdate.y"
!     { pc->rel_day += (yyvsp[-1].intval) * (yyvsp[0].intval); }
      break;
  
    case 48:
! #line 460 "../lib/getdate.y"
!     { pc->rel_day += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
      break;
  
    case 49:
! #line 462 "../lib/getdate.y"
!     { pc->rel_day += (yyvsp[0].intval); }
      break;
  
    case 50:
! #line 464 "../lib/getdate.y"
!     { pc->rel_hour += (yyvsp[-1].intval) * (yyvsp[0].intval); }
      break;
  
    case 51:
! #line 466 "../lib/getdate.y"
!     { pc->rel_hour += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
      break;
  
    case 52:
! #line 468 "../lib/getdate.y"
!     { pc->rel_hour += (yyvsp[0].intval); }
      break;
  
    case 53:
! #line 470 "../lib/getdate.y"
!     { pc->rel_minutes += (yyvsp[-1].intval) * (yyvsp[0].intval); }
      break;
  
    case 54:
! #line 472 "../lib/getdate.y"
!     { pc->rel_minutes += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
      break;
  
    case 55:
! #line 474 "../lib/getdate.y"
!     { pc->rel_minutes += (yyvsp[0].intval); }
      break;
  
    case 56:
! #line 476 "../lib/getdate.y"
!     { pc->rel_seconds += (yyvsp[-1].intval) * (yyvsp[0].intval); }
      break;
  
    case 57:
! #line 478 "../lib/getdate.y"
!     { pc->rel_seconds += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
      break;
  
    case 58:
! #line 480 "../lib/getdate.y"
!     { pc->rel_seconds += (yyvsp[-1].timespec).tv_sec * (yyvsp[0].intval); pc->rel_ns += (yyvsp[-1].timespec).tv_nsec * (yyvsp[0].intval); }
      break;
  
    case 59:
! #line 482 "../lib/getdate.y"
!     { pc->rel_seconds += (yyvsp[-1].timespec).tv_sec * (yyvsp[0].intval); pc->rel_ns += (yyvsp[-1].timespec).tv_nsec * (yyvsp[0].intval); }
      break;
  
    case 60:
! #line 484 "../lib/getdate.y"
!     { pc->rel_seconds += (yyvsp[0].intval); }
      break;
  
    case 62:
! #line 490 "../lib/getdate.y"
!     { pc->rel_year += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
      break;
  
    case 63:
! #line 492 "../lib/getdate.y"
!     { pc->rel_month += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
      break;
  
    case 64:
! #line 494 "../lib/getdate.y"
!     { pc->rel_day += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
      break;
  
    case 65:
! #line 496 "../lib/getdate.y"
!     { pc->rel_hour += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
      break;
  
    case 66:
! #line 498 "../lib/getdate.y"
!     { pc->rel_minutes += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
      break;
  
    case 67:
! #line 500 "../lib/getdate.y"
!     { pc->rel_seconds += (yyvsp[-1].textintval).value * (yyvsp[0].intval); }
      break;
  
    case 71:
! #line 508 "../lib/getdate.y"
!     { (yyval.timespec).tv_sec = (yyvsp[0].textintval).value; (yyval.timespec).tv_nsec = 0; }
      break;
  
    case 73:
! #line 514 "../lib/getdate.y"
!     { (yyval.timespec).tv_sec = (yyvsp[0].textintval).value; (yyval.timespec).tv_nsec = 0; }
      break;
  
    case 74:
! #line 519 "../lib/getdate.y"
      {
  	if (pc->dates_seen && ! pc->year.digits
! 	    && ! pc->rels_seen && (pc->times_seen || 2 < (yyvsp[0].textintval).digits))
! 	  pc->year = (yyvsp[0].textintval);
  	else
  	  {
! 	    if (4 < (yyvsp[0].textintval).digits)
  	      {
  		pc->dates_seen++;
! 		pc->day = (yyvsp[0].textintval).value % 100;
! 		pc->month = ((yyvsp[0].textintval).value / 100) % 100;
! 		pc->year.value = (yyvsp[0].textintval).value / 10000;
! 		pc->year.digits = (yyvsp[0].textintval).digits - 4;
  	      }
  	    else
  	      {
  		pc->times_seen++;
! 		if ((yyvsp[0].textintval).digits <= 2)
  		  {
! 		    pc->hour = (yyvsp[0].textintval).value;
  		    pc->minutes = 0;
  		  }
  		else
  		  {
! 		    pc->hour = (yyvsp[0].textintval).value / 100;
! 		    pc->minutes = (yyvsp[0].textintval).value % 100;
  		  }
  		pc->seconds.tv_sec = 0;
  		pc->seconds.tv_nsec = 0;
***************
*** 1755,1784 ****
      break;
  
    case 75:
! #line 556 "getdate.y"
!     { yyval.intval = -1; }
      break;
  
    case 76:
! #line 558 "getdate.y"
!     { yyval.intval = yyvsp[0].textintval.value; }
      break;
  
    case 77:
! #line 563 "getdate.y"
!     { yyval.intval = MER24; }
      break;
  
    case 78:
! #line 565 "getdate.y"
!     { yyval.intval = yyvsp[0].intval; }
      break;
  
  
      }
  
! /* Line 1000 of yacc.c.  */
! #line 1782 "getdate.c"
  
    yyvsp -= yylen;
    yyssp -= yylen;
--- 1868,1898 ----
      break;
  
    case 75:
! #line 556 "../lib/getdate.y"
!     { (yyval.intval) = -1; }
      break;
  
    case 76:
! #line 558 "../lib/getdate.y"
!     { (yyval.intval) = (yyvsp[0].textintval).value; }
      break;
  
    case 77:
! #line 563 "../lib/getdate.y"
!     { (yyval.intval) = MER24; }
      break;
  
    case 78:
! #line 565 "../lib/getdate.y"
!     { (yyval.intval) = (yyvsp[0].intval); }
      break;
  
  
+       default: break;
      }
  
! /* Line 1126 of yacc.c.  */
! #line 1896 "y.tab.c"
  
    yyvsp -= yylen;
    yyssp -= yylen;
***************
*** 1817,1828 ****
  
        if (YYPACT_NINF < yyn && yyn < YYLAST)
  	{
- 	  YYSIZE_T yysize = 0;
  	  int yytype = YYTRANSLATE (yychar);
! 	  const char* yyprefix;
! 	  char *yymsg;
  	  int yyx;
  
  	  /* Start YYX at -YYN if negative to avoid negative indexes in
  	     YYCHECK.  */
  	  int yyxbegin = yyn < 0 ? -yyn : 0;
--- 1931,1966 ----
  
        if (YYPACT_NINF < yyn && yyn < YYLAST)
  	{
  	  int yytype = YYTRANSLATE (yychar);
! 	  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
! 	  YYSIZE_T yysize = yysize0;
! 	  YYSIZE_T yysize1;
! 	  int yysize_overflow = 0;
! 	  char *yymsg = 0;
! #	  define YYERROR_VERBOSE_ARGS_MAXIMUM 5
! 	  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
  	  int yyx;
  
+ #if 0
+ 	  /* This is so xgettext sees the translatable formats that are
+ 	     constructed on the fly.  */
+ 	  YY_("syntax error, unexpected %s");
+ 	  YY_("syntax error, unexpected %s, expecting %s");
+ 	  YY_("syntax error, unexpected %s, expecting %s or %s");
+ 	  YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+ 	  YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+ #endif
+ 	  char *yyfmt;
+ 	  char const *yyf;
+ 	  static char const yyunexpected[] = "syntax error, unexpected %s";
+ 	  static char const yyexpecting[] = ", expecting %s";
+ 	  static char const yyor[] = " or %s";
+ 	  char yyformat[sizeof yyunexpected
+ 			+ sizeof yyexpecting - 1
+ 			+ ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+ 			   * (sizeof yyor - 1))];
+ 	  char const *yyprefix = yyexpecting;
+ 
  	  /* Start YYX at -YYN if negative to avoid negative indexes in
  	     YYCHECK.  */
  	  int yyxbegin = yyn < 0 ? -yyn : 0;
***************
*** 1830,1910 ****
  	  /* Stay within bounds of both yycheck and yytname.  */
  	  int yychecklim = YYLAST - yyn;
  	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
! 	  int yycount = 0;
  
- 	  yyprefix = ", expecting ";
  	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
  	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
  	      {
! 		yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
! 		yycount += 1;
! 		if (yycount == 5)
  		  {
! 		    yysize = 0;
  		    break;
  		  }
  	      }
- 	  yysize += (sizeof ("syntax error, unexpected ")
- 		     + yystrlen (yytname[yytype]));
- 	  yymsg = (char *) YYSTACK_ALLOC (yysize);
- 	  if (yymsg != 0)
- 	    {
- 	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
- 	      yyp = yystpcpy (yyp, yytname[yytype]);
  
! 	      if (yycount < 5)
  		{
! 		  yyprefix = ", expecting ";
! 		  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
! 		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
! 		      {
! 			yyp = yystpcpy (yyp, yyprefix);
! 			yyp = yystpcpy (yyp, yytname[yyx]);
! 			yyprefix = " or ";
! 		      }
  		}
  	      yyerror (pc, yymsg);
  	      YYSTACK_FREE (yymsg);
  	    }
  	  else
! 	    yyerror (pc, "syntax error; also virtual memory exhausted");
  	}
        else
  #endif /* YYERROR_VERBOSE */
! 	yyerror (pc, "syntax error");
      }
  
  
  
    if (yyerrstatus == 3)
      {
!       /* If just tried and failed to reuse lookahead token after an
  	 error, discard it.  */
  
        if (yychar <= YYEOF)
          {
!           /* If at end of input, pop the error token,
! 	     then the rest of the stack, then return failure.  */
  	  if (yychar == YYEOF)
! 	     for (;;)
! 	       {
! 		 YYPOPSTACK;
! 		 if (yyssp == yyss)
! 		   YYABORT;
! 		 YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
! 		 yydestruct (yystos[*yyssp], yyvsp);
! 	       }
          }
        else
  	{
! 	  YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
! 	  yydestruct (yytoken, &yylval);
  	  yychar = YYEMPTY;
- 
  	}
      }
  
!   /* Else will try to reuse lookahead token after shifting the error
       token.  */
    goto yyerrlab1;
  
--- 1968,2058 ----
  	  /* Stay within bounds of both yycheck and yytname.  */
  	  int yychecklim = YYLAST - yyn;
  	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
! 	  int yycount = 1;
! 
! 	  yyarg[0] = yytname[yytype];
! 	  yyfmt = yystpcpy (yyformat, yyunexpected);
  
  	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
  	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
  	      {
! 		if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
  		  {
! 		    yycount = 1;
! 		    yysize = yysize0;
! 		    yyformat[sizeof yyunexpected - 1] = '\0';
  		    break;
  		  }
+ 		yyarg[yycount++] = yytname[yyx];
+ 		yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+ 		yysize_overflow |= yysize1 < yysize;
+ 		yysize = yysize1;
+ 		yyfmt = yystpcpy (yyfmt, yyprefix);
+ 		yyprefix = yyor;
  	      }
  
! 	  yyf = YY_(yyformat);
! 	  yysize1 = yysize + yystrlen (yyf);
! 	  yysize_overflow |= yysize1 < yysize;
! 	  yysize = yysize1;
! 
! 	  if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM)
! 	    yymsg = (char *) YYSTACK_ALLOC (yysize);
! 	  if (yymsg)
! 	    {
! 	      /* Avoid sprintf, as that infringes on the user's name space.
! 		 Don't have undefined behavior even if the translation
! 		 produced a string with the wrong number of "%s"s.  */
! 	      char *yyp = yymsg;
! 	      int yyi = 0;
! 	      while ((*yyp = *yyf))
  		{
! 		  if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
! 		    {
! 		      yyp += yytnamerr (yyp, yyarg[yyi++]);
! 		      yyf += 2;
! 		    }
! 		  else
! 		    {
! 		      yyp++;
! 		      yyf++;
! 		    }
  		}
  	      yyerror (pc, yymsg);
  	      YYSTACK_FREE (yymsg);
  	    }
  	  else
! 	    {
! 	      yyerror (pc, YY_("syntax error"));
! 	      goto yyexhaustedlab;
! 	    }
  	}
        else
  #endif /* YYERROR_VERBOSE */
! 	yyerror (pc, YY_("syntax error"));
      }
  
  
  
    if (yyerrstatus == 3)
      {
!       /* If just tried and failed to reuse look-ahead token after an
  	 error, discard it.  */
  
        if (yychar <= YYEOF)
          {
! 	  /* Return failure if at end of input.  */
  	  if (yychar == YYEOF)
! 	    YYABORT;
          }
        else
  	{
! 	  yydestruct ("Error: discarding", yytoken, &yylval);
  	  yychar = YYEMPTY;
  	}
      }
  
!   /* Else will try to reuse look-ahead token after shifting the error
       token.  */
    goto yyerrlab1;
  
***************
*** 1914,1927 ****
  `---------------------------------------------------*/
  yyerrorlab:
  
! #ifdef __GNUC__
!   /* Pacify GCC when the user code never invokes YYERROR and the label
!      yyerrorlab therefore never appears in user code.  */
    if (0)
       goto yyerrorlab;
- #endif
  
!   yyvsp -= yylen;
    yyssp -= yylen;
    yystate = *yyssp;
    goto yyerrlab1;
--- 2062,2074 ----
  `---------------------------------------------------*/
  yyerrorlab:
  
!   /* Pacify compilers like GCC when the user code never invokes
!      YYERROR and the label yyerrorlab therefore never appears in user
!      code.  */
    if (0)
       goto yyerrorlab;
  
! yyvsp -= yylen;
    yyssp -= yylen;
    yystate = *yyssp;
    goto yyerrlab1;
***************
*** 1951,1958 ****
        if (yyssp == yyss)
  	YYABORT;
  
!       YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
!       yydestruct (yystos[yystate], yyvsp);
        YYPOPSTACK;
        yystate = *yyssp;
        YY_STACK_PRINT (yyss, yyssp);
--- 2098,2105 ----
        if (yyssp == yyss)
  	YYABORT;
  
! 
!       yydestruct ("Error: popping", yystos[yystate], yyvsp);
        YYPOPSTACK;
        yystate = *yyssp;
        YY_STACK_PRINT (yyss, yyssp);
***************
*** 1961,1971 ****
    if (yyn == YYFINAL)
      YYACCEPT;
  
-   YYDPRINTF ((stderr, "Shifting error token, "));
- 
    *++yyvsp = yylval;
  
  
    yystate = yyn;
    goto yynewstate;
  
--- 2108,2119 ----
    if (yyn == YYFINAL)
      YYACCEPT;
  
    *++yyvsp = yylval;
  
  
+   /* Shift the error token. */
+   YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+ 
    yystate = yyn;
    goto yynewstate;
  
***************
*** 1985,2000 ****
    goto yyreturn;
  
  #ifndef yyoverflow
! /*----------------------------------------------.
! | yyoverflowlab -- parser overflow comes here.  |
! `----------------------------------------------*/
! yyoverflowlab:
!   yyerror (pc, "parser stack overflow");
    yyresult = 2;
    /* Fall through.  */
  #endif
  
  yyreturn:
  #ifndef yyoverflow
    if (yyss != yyssa)
      YYSTACK_FREE (yyss);
--- 2133,2157 ----
    goto yyreturn;
  
  #ifndef yyoverflow
! /*-------------------------------------------------.
! | yyexhaustedlab -- memory exhaustion comes here.  |
! `-------------------------------------------------*/
! yyexhaustedlab:
!   yyerror (pc, YY_("memory exhausted"));
    yyresult = 2;
    /* Fall through.  */
  #endif
  
  yyreturn:
+   if (yychar != YYEOF && yychar != YYEMPTY)
+      yydestruct ("Cleanup: discarding lookahead",
+ 		 yytoken, &yylval);
+   while (yyssp != yyss)
+     {
+       yydestruct ("Cleanup: popping",
+ 		  yystos[*yyssp], yyvsp);
+       YYPOPSTACK;
+     }
  #ifndef yyoverflow
    if (yyss != yyssa)
      YYSTACK_FREE (yyss);
***************
*** 2003,2009 ****
  }
  
  
! #line 568 "getdate.y"
  
  
  static table const meridian_table[] =
--- 2160,2166 ----
  }
  
  
! #line 568 "../lib/getdate.y"
  
  
  static table const meridian_table[] =
Index: lib/getopt.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/lib/getopt.c,v
retrieving revision 1.1.1.5
retrieving revision 1.1.3.2.4.2
diff -c -r1.1.1.5 -r1.1.3.2.4.2
*** lib/getopt.c	9 Oct 2005 12:14:50 -0000	1.1.1.5
--- lib/getopt.c	19 Jul 2006 17:44:58 -0000	1.1.3.2.4.2
***************
*** 77,82 ****
--- 77,83 ----
     they can distinguish the relative order of options and other arguments.  */
  
  #include "getopt.h"
+ #include "getopt_compat.h"              /* EMX -- 3/1/2006, 23:55 */
  #include "getopt_int.h"
  
  /* For communication from `getopt' to the caller.
***************
*** 1163,1169 ****
--- 1164,1174 ----
  #endif
  
  int
+ #ifdef __EMX__
+ getopt (int argc, char **argv, const char *optstring)
+ #else
  getopt (int argc, char *const *argv, const char *optstring)
+ #endif
  {
    return _getopt_internal (argc, (char **) argv, optstring, NULL, NULL, 0,
  			   POSIXLY_CORRECT);
Index: lib/getopt1.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/lib/getopt1.c,v
retrieving revision 1.1.1.4
retrieving revision 1.1.3.1.4.2
diff -c -r1.1.1.4 -r1.1.3.1.4.2
*** lib/getopt1.c	19 Sep 2005 11:12:42 -0000	1.1.1.4
--- lib/getopt1.c	19 Jul 2006 17:44:58 -0000	1.1.3.1.4.2
***************
*** 26,31 ****
--- 26,32 ----
  #else
  # include "getopt.h"
  #endif
+ #include "getopt_compat.h"              /* EMX -- 3/1/2006, 23:55 */
  #include "getopt_int.h"
  
  #include <stdio.h>
Index: lib/getopt_.h
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/lib/getopt_.h,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.2.1
diff -c -r1.1.1.2 -r1.1.1.2.2.1
*** lib/getopt_.h	9 Oct 2005 12:14:52 -0000	1.1.1.2
--- lib/getopt_.h	19 Jul 2006 17:44:58 -0000	1.1.1.2.2.1
***************
*** 202,209 ****
--- 202,214 ----
     arguments to the option '\0'.  This behavior is specific to the GNU
     `getopt'.  */
  
+ #ifdef __EMX__
+ extern int getopt (int ___argc, char **___argv, const char *__shortopts)
+        __THROW;
+ #else
  extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
         __THROW;
+ #endif
  
  #ifndef __need_getopt
  extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv,
Index: lib/glob.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/lib/glob.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -c -r1.1.1.1 -r1.1.1.1.2.1
*** lib/glob.c	9 Sep 2005 11:06:12 -0000	1.1.1.1
--- lib/glob.c	19 Jul 2006 17:44:58 -0000	1.1.1.1.2.1
***************
*** 20,26 ****
--- 20,30 ----
  # include <config.h>
  #endif
  
+ #ifdef __EMX__
+ #include "glob_.h"
+ #else
  #include <glob.h>
+ #endif
  
  #include <errno.h>
  #include <sys/types.h>
Index: lib/strftime.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/lib/strftime.c,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.3.2.3
diff -c -r1.1.1.3 -r1.1.1.3.2.3
*** lib/strftime.c	3 Sep 2005 20:06:38 -0000	1.1.1.3
--- lib/strftime.c	19 Jul 2006 17:44:58 -0000	1.1.1.3.2.3
***************
*** 1282,1288 ****
--- 1282,1296 ----
  
  	case L_('z'):
  	  if (tp->tm_isdst < 0)
+           {
+ #ifndef __EMX__           
  	    break;
+ #else
+             /* Do NOT break. Insert a "+0000" at least. */
+             add (1, *p = L_('+'));
+ 	    DO_NUMBER (4, 0);
+ #endif
+           }
  
  	  {
  	    int diff;
Index: lib/system.h
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/lib/system.h,v
retrieving revision 1.1.1.8
retrieving revision 1.1.3.2.4.6
diff -c -r1.1.1.8 -r1.1.3.2.4.6
*** lib/system.h	2 Oct 2005 05:17:38 -0000	1.1.1.8
--- lib/system.h	19 Jul 2006 17:44:58 -0000	1.1.3.2.4.6
***************
*** 56,61 ****
--- 56,62 ----
  /* Ditto for these POSIX.2 headers.  */
  #include <fnmatch.h>
  #include <getopt.h>	/* Has GNU extensions,  */
+ #include "getopt_compat.h" /* EMX needs struct option-- 3/1/2006, 23:00 */
  
  /* We assume <sys/stat.h> because GNULIB does.  */
  #include <sys/stat.h>
***************
*** 277,282 ****
--- 278,288 ----
         are path component separators.  */
  #   define FOLD_FN_CHAR(c) (WNT_filename_classes[(unsigned char) (c)])
  extern unsigned char WNT_filename_classes[];
+ # elif defined (__EMX__)
+   /* Under OS/2, filenames are case-insensitive, and both / and \
+      are path component separators.  */
+ # define FOLD_FN_CHAR(c) (OS2_filename_classes[(unsigned char) (c)])
+   extern unsigned char OS2_filename_classes[];
  # else /* !__CYGWIN32__ && !WOE32 */
    /* As far as I know, only Macintosh OS X & VMS make it here, but any
     * platform defining FILENAMES_CASE_INSENSITIVE which isn't WOE32 or
Index: maint-aux/Makefile.in
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/maint-aux/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -c -r1.1.1.1 -r1.1.1.1.2.1
*** maint-aux/Makefile.in	3 Oct 2005 03:37:28 -0000	1.1.1.1
--- maint-aux/Makefile.in	19 Jul 2006 17:45:13 -0000	1.1.1.1.2.1
***************
*** 122,128 ****
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
--- 122,129 ----
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h \
! 	$(top_builddir)/emx-new/common.h
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
***************
*** 157,162 ****
--- 158,164 ----
  GETOPT_H = @GETOPT_H@
  GLOB_H = @GLOB_H@
  GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
  HAVE_LONG_64BIT = @HAVE_LONG_64BIT@
  HAVE_LONG_LONG_64BIT = @HAVE_LONG_LONG_64BIT@
  HAVE__BOOL = @HAVE__BOOL@
***************
*** 219,226 ****
  ZLIB_LIBS = @ZLIB_LIBS@
  ZLIB_SUBDIRS = @ZLIB_SUBDIRS@
  ac_ct_CC = @ac_ct_CC@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
  ac_prefix_program = @ac_prefix_program@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--- 221,226 ----
***************
*** 237,259 ****
--- 237,266 ----
  build_vendor = @build_vendor@
  cvs_client_objects = @cvs_client_objects@
  datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
+ htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
+ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
Index: man/Makefile.in
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/man/Makefile.in,v
retrieving revision 1.1.1.11
retrieving revision 1.1.3.1.4.8
diff -c -r1.1.1.11 -r1.1.3.1.4.8
*** man/Makefile.in	3 Oct 2005 03:37:32 -0000	1.1.1.11
--- man/Makefile.in	19 Jul 2006 17:45:13 -0000	1.1.3.1.4.8
***************
*** 124,130 ****
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
--- 124,131 ----
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h \
! 	$(top_builddir)/emx-new/common.h
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
***************
*** 164,169 ****
--- 165,171 ----
  GETOPT_H = @GETOPT_H@
  GLOB_H = @GLOB_H@
  GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
  HAVE_LONG_64BIT = @HAVE_LONG_64BIT@
  HAVE_LONG_LONG_64BIT = @HAVE_LONG_LONG_64BIT@
  HAVE__BOOL = @HAVE__BOOL@
***************
*** 226,233 ****
  ZLIB_LIBS = @ZLIB_LIBS@
  ZLIB_SUBDIRS = @ZLIB_SUBDIRS@
  ac_ct_CC = @ac_ct_CC@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
  ac_prefix_program = @ac_prefix_program@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--- 228,233 ----
***************
*** 244,266 ****
--- 244,273 ----
  build_vendor = @build_vendor@
  cvs_client_objects = @cvs_client_objects@
  datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
+ htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
+ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
Index: src/ChangeLog
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/src/ChangeLog,v
retrieving revision 1.1.1.15
retrieving revision 1.1.3.2.4.18
diff -c -r1.1.1.15 -r1.1.3.2.4.18
*** src/ChangeLog	2 Oct 2005 05:17:40 -0000	1.1.1.15
--- src/ChangeLog	19 Jul 2006 18:27:59 -0000	1.1.3.2.4.18
***************
*** 1,3 ****
--- 1,37 ----
+ 2006-07-19  Andrew Belov  <andrew_belov@newmail.ru>
+ 
+ 	* server.h, socket-client.c, socket-client.h, stack.c, stack.h, status.c, subr.c, subr.h, tag.c, update.c, update.h, vers_ts.c, version.c, watch.c, watch.h, wrapper.c, zlib.c, Makefile.am, Makefile.in, add.c, admin.c, annotate.c, buffer.c, buffer.h, build_src.com, checkin.c, checkout.c, classify.c, client.c, client.h, commit.c, create_adm.c, cvs.h, cvsrc.c, diff.c, edit.c, edit.h, entries.c, error.c, exithandle.c, expand_path.c, fileattr.c, filesubr.c, find_names.c, gssapi-client.c, hardlink.c, hardlink.h, hash.c, hash.h, history.c, history.h, ignore.c, import.c, kerberos4-client.c, lock.c, log-buffer.c, log-buffer.h, log.c, login.c, logmsg.c, ls.c, main.c, mkmodules.c, modules.c, ms-buffer.c, ms-buffer.h, myndbm.c, myndbm.h, no_diff.c, parseinfo.c, parseinfo.h, patch.c, rcs.c, rcs.h, rcscmds.c, recurse.c, release.c, remove.c, repos.c, root.c, root.h, rsh-client.c, run.c, sanity.config.sh.in, sanity.sh, .cvsignore:
+ 	Finalizing 1.12.13
+ 
+ 2006-05-18  Andrew Belov  <andrew_belov@newmail.ru>
+ 
+ 	* server.c: pserver needs O_BINARY when creating files
+ 
+ 2006-01-02  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* sanity.sh:
+ 	General cleanup. Replaced individual sleep calls with a single sleep in dotest() - the performance drop is negligible anyway.
+ 
+ 	* Makefile.in: New autotools
+ 
+ 2005-11-24  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* zlib.c, scramble.c, server.c, server.h, socket-client.c, socket-client.h, stack.c, stack.h, status.c, subr.c, tag.c, update.c, update.h, vers_ts.c, version.c, watch.c, watch.h, wrapper.c, main.c, mkmodules.c, modules.c, myndbm.c, myndbm.h, no_diff.c, parseinfo.c, patch.c, rcs.c, rcs.h, rcscmds.c, recurse.c, release.c, remove.c, repos.c, root.c, root.h, rsh-client.c, rsh-client.h, run.c, sanity.config.sh.in, sanity.sh, edit.h, entries.c, error.c, error.h, exithandle.c, expand_path.c, fileattr.c, fileattr.h, filesubr.c, find_names.c, gssapi-client.c, gssapi-client.h, hardlink.c, hardlink.h, hash.c, hash.h, history.c, history.h, ignore.c, import.c, kerberos4-client.c, kerberos4-client.h, lock.c, log-buffer.c, log-buffer.h, log.c, login.c, logmsg.c, ls.c, Makefile.am, Makefile.in, add.c, admin.c, annotate.c, buffer.c, buffer.h, checkin.c, checkout.c, classify.c, client.c, client.h, commit.c, create_adm.c, cvs.h, cvsrc.c, diff.c, edit.c:
+ 	Integration build of 1.12.9 (able to compile and link)
+ 
+ 2005-10-10  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* socket-client.h, subr.c, tag.c, update.c, vers_ts.c, zlib.c, server.c, server.h, socket-client.c, repos.c, rsh-client.c, rsh-client.h, sanity.sh, filesubr.c, gssapi-client.c, gssapi-client.h, hardlink.c, hash.c, ignore.c, log-buffer.c, log-buffer.h, logmsg.c, main.c, mkmodules.c, modules.c, parseinfo.c, rcs.c, recurse.c, Makefile.am, Makefile.in, add.c, buffer.c, checkout.c, client.c, client.h, commit.c, cvs.h:
+ 	A Q'n'D resync with 1.12.1
+ 
+ 2005-10-09  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* checkout.c, entries.c, recurse.c, server.c:
+ 	Back on track with 1.12.1.
+ 
+ 	* Makefile.am, annotate.c, root.h, error.h:
+ 	Conflict Resolution
+ 
  2005-09-30  Larry Jones  <lawrence.jones@ugs.com>
  
  	* expand_path.c (expand_path): Fix memory leaks.
***************
*** 7441,7446 ****
--- 7475,7491 ----
  
  	* main.c (main): Update copyright message to 2003.
  
+ 2003-02-09  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* sanity.sh:
+ 	Fixed a bug in the original sanity.sh to substitute CVS name properly
+ 
+ 	* update.c, scramble.c, server.c, status.c, subr.c, repos.c, root.c, root.h, run.c, sanity.sh, rcs.h, rcscmds.c, no_diff.c, parseinfo.c, rcs.c, log.c, main.c, modules.c, myndbm.c, error.h, expand_path.c, filesubr.c, history.c, lock.c, cvs.h, diff.c, entries.c, error.c, client.c, commit.c, create_adm.c, add.c, admin.c, buffer.c:
+ 	Converged with CVS-current-20030209
+ 
+ 	* sanity.sh, version.c, version.c.in, watch.c, wrapper.c, zlib.c, status.c, subr.c, tag.c, update.c, vers_ts.c, server.h, stamp-h2.in, root.h, scramble.c, server.c, rcscmds.c, recurse.c, remove.c, root.c, options.h.in, parseinfo.c, patch.c, rcs.c, logmsg.c, main.c, mkmodules.c, modules.c, myndbm.c, import.c, lock.c, log.c, login.c, ignore.c, find_names.c, history.c, cvsbug.in, cvsrc.c, diff.c, edit.c, error.h, filesubr.c, client.h, commit.c, create_adm.c, cvs.h, buffer.h, build_src.com, checkout.c, classify.c, client.c, add.c, admin.c, annotate.c, buffer.c, Makefile.am, Makefile.in, .cvsignore:
+ 	Interim release 1.11.5 (QC passed)
+ 
  2003-02-08  Derek Price  <derek@ximbiot.com>
  
  	* rcs.c (RCS_checkout): Supply the full function name in the TRACE
***************
*** 7713,7718 ****
--- 7758,7795 ----
  	supports this.  If this breaks any test platforms we should test
  	the behavior of touch like we do for other tools.
  
+ 2002-11-04  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* watch.c, wrapper.c, update.c, update.h, vers_ts.c, version.c, version.c.in, stamp-h2.in, status.c, subr.c, tag.c, server.c, root.c, rtag.c, run.c, sanity.sh, remove.c, repos.c, rcs.h, rcscmds.c, recurse.c, release.c, parseinfo.c, patch.c, rcs.c, logmsg.c, main.c, mkmodules.c, modules.c, lock.c, log.c, login.c, filesubr.c, find_names.c, history.c, ignore.c, import.c, diff.c, edit.c, entries.c, error.c, error.h, expand_path.c, create_adm.c, cvs.h, cvsbug.in, cvsbug.sh, checkout.c, classify.c, client.c, commit.c, admin.c, annotate.c, build_src.com, Makefile.am, Makefile.in, add.c, .cvsignore:
+ 	Integration build (merged 1.11.1 in 1.11 postfixes). Many things broken.
+ 
+ 	* vers_ts.c, version.c.in, watch.c, wrapper.c:
+ 	Imported the Apr 2001 postfix
+ 
+ 	* version.c.in: New file.
+ 
+ 	* update.h, version.c, subr.c, tag.c, update.c, server.c, stamp-h2.in, status.c:
+ 	Imported the Apr 2001 postfix
+ 
+ 	* stamp-h2.in: New file.
+ 
+ 	* sanity.sh, run.c, repos.c, root.c, release.c, remove.c, recurse.c, rcscmds.c, rcs.h, rcs.c, parseinfo.c, patch.c, modules.c, Makefile.am, Makefile.in, mkmodules.c:
+ 	Imported the Apr 2001 postfix
+ 
+ 	* Makefile.am: New file.
+ 
+ 	* logmsg.c, main.c, log.c, login.c, ignore.c, import.c, lock.c, history.c, expand_path.c, filesubr.c, find_names.c, entries.c, error.c, error.h, cvsbug.in, diff.c, edit.c:
+ 	Imported the Apr 2001 postfix
+ 
+ 	* cvsbug.in: New file.
+ 
+ 	* commit.c, create_adm.c, cvs.h, client.c, checkout.c, classify.c, annotate.c, build_src.com:
+ 	Imported the Apr 2001 postfix
+ 
+ 	* annotate.c: New file.
+ 
+ 	* .cvsignore, add.c, admin.c: Imported the Apr 2001 postfix
+ 
  2002-11-03  Derek Price  <derek@ximbiot.com>
  
  	* sanity.sh (rcs2-7): Notate with a wild untested hypothesis.
***************
*** 8667,8672 ****
--- 8744,8753 ----
  
  	* admin.c: Corrected spelling mistakes in help.
  
+ 2001-06-20  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* edit.c: Workaround for spurious "Permission denied" messages on JFS
+ 
  2001-06-20  Derek Price  <dprice@collab.net>
  
  	* client.c (socket_buffer_shutdown): Fix untested typos.
***************
*** 9212,9217 ****
--- 9293,9302 ----
  
  	* sanity.sh: Change usage to match the new getopts format and comment.
  
+ 2001-03-19  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* server.c: Fixed handling of binaries by pserver
+ 
  2001-03-16  Derek Price  <dprice@collab.net>
  
  	* sanity.sh (modules2-nestedrename): New test.  Verifies behavior of
***************
*** 9682,9692 ****
--- 9767,9807 ----
  	* Makefile.am (remotecheck): depend on 'all'
  	* Makefile.in: regenerated
  
+ 2001-01-01  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* sanity.sh:
+ 	Yet another cheat to ignore errors when moving away from a broken repository
+ 
+ 2000-12-31  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* sanity.sh: :local: is inserted when testing multiple repositories
+ 
+ 	* sanity.sh: Cheat to skip the end of keyword2 tests
+ 
+ 	* sanity.sh: Fixed the history-* section
+ 
+ 	* sanity.sh:
+ 	Looks like the Halibut patch screwed logopt-3 up -- fixed
+ 
+ 	* sanity.sh: Removed modes, modes2 and modes3 from EMX testing course
+ 
+ 	* sanity.sh: Added sleeping before check-in at backuprecover-12
+ 
+ 	* sanity.sh: Skipped lockfiles-7a/7b for BROKEN_LS_L
+ 
  2000-12-29  Derek Price  <derek.price@openavenue.com>
  
  	* sanity.sh: remove explicit "$@" from last checkin and move the 'do'
  	to the line following the 'for'.  Apparently this is more portable.
  
+ 2000-12-29  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* sanity.sh: Removed the binary/text conversion tests for OS/2
+ 
+ 	* sanity.sh: Fixed for 1970s to be translated into 1980s
+ 
+ 	* sanity.sh: Fixed basic2-64
+ 
  2000-12-29  Derek Price  <derek.price@openavenue.com>
  
  	* sanity.sh: make "$@" explicit in 'for' statement since Solaris 5.6's
***************
*** 9723,9728 ****
--- 9838,9847 ----
  	* Makefile.am (INCLUDES): add zlib
  	* Makefile.in: Regenerated
  
+ 2000-12-26  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* sanity.sh: Added SINGLE_USER clause to bear LOGNAME as user name
+ 
  2000-12-22  Derek Price  <derek.price@openavenue.com>
  
  	* Makefile.am (DISTCLEANFILES): added a few files
***************
*** 9737,9742 ****
--- 9856,9871 ----
  	* stamp-h2.in: New stamp file created by Automake
  	* version.c.in: use configure to generate version.c
  
+ 2000-12-20  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* zlib.c, version.c, watch.c, vers_ts.c, tag.c, update.c, subr.c, server.c, run.c, sanity.sh, root.c, rtag.c, remove.c, repos.c, recurse.c, release.c, rcs.h, patch.c, rcs.c, myndbm.c, parseinfo.c, mkmodules.c, modules.c, logmsg.c, main.c, login.c, lock.c, log.c, ignore.c, import.c, hash.h, history.c, hardlink.c, hash.c, fileattr.c, filesubr.c, entries.c, error.c, cvs.h, edit.c, create_adm.c, client.h, commit.c, client.c, admin.c, checkout.c, Makefile.in, add.c:
+ 	Updated to version 1.11
+ 
+ 2000-12-19  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* zlib.c, vers_ts.c, watch.c, version.c, tag.c, update.c, subr.c, server.c, sanity.sh, rtag.c, run.c, release.c, remove.c, repos.c, root.c, recurse.c, rcs.h, rcs.c, parseinfo.c, patch.c, myndbm.c, Makefile.in, mkmodules.c, modules.c, logmsg.c, main.c, log.c, login.c, lock.c, ignore.c, import.c, hash.c, hash.h, history.c, hardlink.c, fileattr.c, filesubr.c, entries.c, error.c, edit.c, create_adm.c, cvs.h, client.h, commit.c, client.c, checkout.c, add.c, admin.c:
+ 	Imported the 1.11 release
+ 
  2000-12-16  Derek Price  <derek.price@openavenue.com>
  
  	* server.c (server_update): Keep the vers structure up to date after
***************
*** 9767,9772 ****
--- 9896,9909 ----
  
  	* history.c (history): Allow multiple -m options as documented.
  
+ 2000-12-03  Andrew Belov  <andrew_belov@mtu-net.ru>
+ 
+ 	* sanity.sh, cvsbug.sh:
+ 	Partially fixed with Halibut patch against 1.10.6
+ 
+ 	* server.c, client.h, import.c, client.c, update.c, rcs.c, filesubr.c, parseinfo.c, rcs.h, cvs.h, expand_path.c, commit.c:
+ 	Applied the Halibut patches
+ 
  2000-11-29  Derek Price  <derek.price@openavenue.com>
  
  	* root.c (parse_cvsroot): back out yesterday's redundant changes
***************
*** 10030,10035 ****
--- 10167,10174 ----
  
  	* version.c: Push version number to 1.11.0.1.
  
+ 2000-09-19  Larry Jones  <larry.jones@sdrc.com> 
+ 
  	* version.c: Version 1.11.
  
  2000-09-07  Larry Jones  <larry.jones@sdrc.com>
***************
*** 12643,12648 ****
--- 12782,12792 ----
  
  	* version.c: Bump version number to 1.10.0.1.
  
+ 1998-08-15  Andreas Huber  <ahuber@ping.at>
+ 
+ 	* sanity.sh (rcslib): Don't run rcslib-symlink-* tests if
+ 	WONT_PRESERVE_PERMISSIONS is set.
+ 
  Thu Aug 13 11:15:24 1998  Noel Cragg  <noel@swish.red-bean.com>
  
  	* version.c: Change version number to 1.10 and name to `Halibut'.
***************
*** 12650,12655 ****
--- 12794,12811 ----
  	* sanity.sh (rcslib): new tests to check behavior of symlinks in
   	the repository.
  
+ 1998-08-13  Andreas Huber  <ahuber@ping.at>
+ 
+ 	* sanity.sh (unedit-without-baserev-5): Use ${DOTSTAR} to match
+ 	a second "D" line.
+ 
+ 1998-08-12  Andreas Huber  <ahuber@ping.at>
+ 
+ 	* server.c (dirswitch):
+ 	Explicitly set dir_name to NULL so other functions
+ 	can determine wether we successfully changed the directory.
+ 	(server_write_entries) Don't write anything if dirswitch() failed.
+ 
  Wed Aug 12 15:39:38 1998  Noel Cragg  <noel@swish.red-bean.com>
  
  	* main.c (lookup_command_attribute): the `annotate' command
***************
*** 12660,12665 ****
--- 12816,12833 ----
  
  	* version.c: Change version number to 1.9.30.
  
+ 1998-08-10  Andreas Huber  <ahuber@ping.at>
+ 
+ 	* client.c, client.h (client_process_import_file): In order for any
+ 	global -k option (not just -kb) to take precedence in
+ 	client/server mode, we need to pass it to the server.
+ 	Otherwise the results of specifying a -k option on the
+ 	command line would be inconsistent between client/server
+ 	and local mode.
+ 
+ 	* import.c (import_descend): Pass any global -k options to
+ 	client_process_import_file(), not just -kb.
+ 
  Thu Aug  6 17:44:50 1998  Noel Cragg  <noel@swish.red-bean.com>
  
  	* server.c (serve_rdiff): change the name of the command (for
***************
*** 12694,12699 ****
--- 12862,12885 ----
  	* mkmodules.c: add comment about TopLevelAdmin for the initial
   	contents of CVSROOT/config.
  
+ 1998-08-01  Andreas Huber  <ahuber@ping.at>
+ 
+ 	* server.c: Moved the definition of 'kopt' above receive_file.
+ 	(receive_file) Check kopt in case Entries is not yet available
+ 	(e.g. import) to see if the file needs to be opened in binary
+ 	mode. Corrected a minor style fauxpas.
+ 
+ 1998-07-31  Andreas Huber  <ahuber@ping.at>
+ 
+ 	* sanity.sh:
+ 	Don't convert slashes to sloshes for CVS_SERVER. Instead,
+ 	require that rshd uses a unixy shell to run commands.
+ 
+ 	* sanity.sh:
+ 	Early detection of OS_COMPILER_EMU so we can add additional flags
+ 	to the rsh detection if required by the OS (OS/2 needs a -b).
+ 	CVS_SERVER needs slashes converted to sloshes on some OS's.
+ 
  1998-07-29  Jim Kingdon  <kingdon@harvey.cyclic.com>
  
  	* rcs.c (RCS_checkin): Only try to call xreadlink if HAVE_READLINK
***************
*** 12706,12711 ****
--- 12892,12907 ----
  	* rcs.c (RCS_checkin): add code to follow symbolic links in the
   	repository.
  
+ 1998-07-27  Andreas Huber  <ahuber@ping.at>
+ 
+ 	* server.c (dirswitch): Check for an absolute path before trying to
+ 	create the directory. This is necessary for platforms, where
+ 	a path may contain a drive specification. It avoids a bogus
+ 	message for an error that is caught later in server_pathname_check().
+ 
+ 	* client.c (send_a_repository): Use isabsolute() to check update_dir
+ 	for an absolute path.
+ 
  Sun Jul 26 05:14:41 1998  Noel Cragg  <noel@swish.red-bean.com>
  
  	* This set of changes reverts the code to pre-1.9.2 behavior and
***************
*** 12773,12778 ****
--- 12969,12996 ----
  	* build_src.com (rcscmds.c): Also look for include files in
  	[-.diff], just like Ian's 1998-06-18 change to Makefile.in
  
+ 1998-07-16  Andreas Huber  <ahuber@ping.at>
+ 
+ 	* sanity.sh:
+ 	Applied Murray Bishop's <mbishop@acnielsen.com.au> patches.
+ 	(unedit_without_baserev-4, unedit_without_baserev-14)
+ 	Replaced "revert changes?" by "revert changes." to make the EMX port
+ 	of GNU expr from sh-utils 1.12 happy.
+ 	(unedit_without_baserev-5) Disabled the SunOS4.1.4 test
+ 	for CVS/Entries corruption.
+ 
+ 	* update.c  (do_update), client.c (get_reponses_and_close),
+ 	commit.c (commit):
+ 	Fixed a bug with code that was supposed to avoid time-stamp
+ 	races but didn't under specific circumstances.
+ 
+ 	* cvs.h: Applied Murray Bishop's <mbishop@acnielsen.com.au> patches.
+ 
+ 1998-07-15  Andreas Huber  <ahuber@ping.at>
+ 
+ 	* update.c, sanity.sh, commit.c, cvs.h, client.c:
+ 	Applied Murray Bishop's <mbishop@acnielsen.com.au> patches.
+ 
  1998-07-14  Jim Kingdon  <kingdon@harvey.cyclic.com>
  
  	* tag.c (pretag_proc), rtag.c (pretag_proc): Don't pass RUN_REALLY
***************
*** 12784,12789 ****
--- 13002,13046 ----
  	happen.
  	* sanity.sh (taginfo): New tests taginfo-11 to taginfo-13, for this.
  
+ 1998-07-13  Andreas Huber  <ahuber@ping.at>
+ 
+ 	* server.c (receive_file):
+ 	Shut up a warning about variables that might be used
+ 	uninitialized.
+ 
+ 1998-07-13  Andreas Huber  <ahuber@ping.at>
+ 
+ 	* sanity.sh: Changed /tmp to ${TMPDIR}.
+ 	Changed argument parsing to accept drive specifications for
+ 	the CVS executable.
+ 	EDHACK_EDITOR is no longer necessary.
+ 	Added :local: to repository specifications.
+ 	(editor) Changed to sleep two seconds instead of one to avoid
+ 	time-stamp races on platforms where the time-stamp resolution
+ 	is two seconds.
+ 
+ 	* server.c (receive_file):
+ 	The server writes the files it receives from
+ 	the client to the temporary directory using the default binary
+ 	translation mode. While this works on *nix platforms, it certainly
+ 	doesn't on OS/2. 'Entries' is now searched for a -kb to determine
+ 	the proper translation mode before creating the file.
+ 	(server_updated) The server writes the files it is about to send to
+ 	the client to the temporary directory using the proper translation
+ 	mode (in RCS_checkout), but reads the file in binary mode. The file
+ 	is now read in the same mode it was written. finfo->rcs->expand is
+ 	examined to determine the proper translation mode.
+ 
+ 	* logmsg.c (logfile_write):
+ 	Changed the quoting character back to `'. Quoting
+ 	is now handled correctly by os2_popen().
+ 
+ 	* client.c (get_responses_and_close), commit.c (commit),
+ 	update.c (do_update):
+ 	Changed to sleep two seconds instead of one to avoid time-stamp
+ 	races. This is required for platforms where the time-stamp
+ 	resolution is two seconds (e.g. OS/2).
+ 
  1998-07-12  Jim Kingdon  <kingdon@harvey.cyclic.com>
  
  	* sanity.sh (ann-id): Write the test so that it tests for the
***************
*** 12821,12826 ****
--- 13078,13101 ----
  	you version 1.1 of the working file and put 1.2 in CVS/Entries.
  	* sanity.sh (unedit-without-baserev): New tests test for this.
  
+ 1998-07-07  Murray Bishop  <mbishop@acnielsen.com.au>
+ 
+ 	* sanity.sh: Make local mode mostly runnable on various platforms :
+ 	- Windows-NT with cygwin32 b19.1
+ 	- Windows-95 with MKS Toolkit
+ 	- OS/2 with EMX
+ 	(and test local mode on Linux too)
+ 	* cvs.h [FILESYSTEM_TICK]: Define as 1 (second) unless defined.
+ 
+ 1998-07-06  Murray Bishop  <mbishop@acnielsen.com.au>
+ 
+ 	* client.c(get_responses_and_close): Wait FILESYSTEM_TICK
+ 	instead of 1 second to avoid time-stamp races.
+ 	* commit.c(commit): Wait FILESYSTEM_TICK
+ 	instead of 1 second to avoid time-stamp races.
+ 	* update.c(do_update): Wait FILESYSTEM_TICK
+ 	instead of 1 second to avoid time-stamp races.
+ 
  1998-07-02  Jim Kingdon  <kingdon@harvey.cyclic.com>
  
  	* sanity.sh (unedit-without-baserev): Move the test itself to be
***************
*** 12888,12893 ****
--- 13163,13192 ----
  
  	* sanity.sh (modes2): Touch the file before chmod'ing it.
  
+ 1998-06-23  Andreas Huber  <ahuber@ping.at>
+ 
+ 	* server.c (mkdir_p): Search for the first occurrence of '/' instead
+ 	of just skipping the first character. This is required for platforms,
+ 	where absolute path names do not necessarily start with a '/'.
+ 
+ 	* server.c (serve_root): Added a :local: prefix for platforms, where a
+ 	path may contain ':'.
+ 
+ 	* server.c (receive_file): Look up the file in Entries first to see if
+ 	it has a '-kb' option attached to it. Then create the file accordingly.
+ 
+ 	* server.c (server_updated): Look at finfo->rcs->expand first, to see
+ 	if it includes a '-kb'. If it does, open the file in binary mode. We
+ 	also need to use buf_read_file_to_eof() and buf_chain_length() now.
+ 
+ 	* logmsg.c (logfile_write): Changed the quoting character from
+ 	`' to `".
+ 
+ 	* expand_path.c (expand_variable): Replaced CVSroot_original by
+ 	CVSroot_directory, since former may include the access method.
+ 	This is for platforms, where paths may contain ':' and a :local:
+ 	prefix is required.
+ 
  1998-06-21  Ian Lance Taylor  <ian@cygnus.com>
  
  	* update.c (merge_files): Revert changes of 1998-06-19.  Instead,
***************
*** 12930,12935 ****
--- 13229,13243 ----
  	directory.
  	(zlib.o): Depend upon zlib.h.
  
+ 1998-06-16  Murray Bishop  <mbishop@acnielsen.com.au>
+ 
+ 	* sanity.sh: Modify to run test for windows-NT using cygwin32
+ 	with compiler MS Visual C++ 4.2.
+ 
+ 1998-06-12  Murray Bishop  <mbishop@acnielsen.com.au>
+ 
+ 	* sanity.sh: Modify as was run for OS/2 EMX testing.
+ 
  1998-06-09  Mike Sutton@SAIC
  
  	Make it compile with Sun's bundled K&R C compiler:
***************
*** 12977,12988 ****
--- 13285,13325 ----
  
  	* sanity.sh (tag8k): Add a test for the 1998-05-02 rcs.c bug fix.
  
+ 1998-05-31  Andreas Huber  <ahuber@ping.at>
+ 
+ 	* client.c, commit.c, filesubr.c, import.c, rcs.c, update.c:
+ 	Replaced all occurrences of chmod() by CVS_CHMOD().
+ 
+ 	* client.c (start_rsh_server) [START_RSH_WITH_POPEN_RW]:
+ 	Slightly reordered the arguments to rsh to match the ordering in the
+ 	!START_RSH_WITH_POPEN_RW case.
+ 
+ 	* client.c (start_rsh_server) [!START_RSH_WITH_POPEN_RW,
+ 	RSH_NEEDS_BINARY]: Added missing '-b' to the rsh argument list.
+ 
+ 	* filesubr.c: Replaced one occurrence of rename() by CVS_RENAME().
+ 
+ 	* rcs.c, rcs.h: Added two new functions: RCS_get_cached() and
+ 	RCS_cache_close(). On some platforms, it is not possible to rename()
+ 	or chmod() open files. The new functions are used to check if a
+ 	particular file is currently kept open in the RCS cache and to close
+ 	it, if necessary.
+ 
+ 	* server.c (server) [RSHD_NOT_TRANSPARENT]: On some platforms with a
+ 	non-tranparent rshd, the standard handles need to be switched to
+ 	binary mode.
+ 
  1998-05-26  Jim Kingdon  <kingdon@harvey.cyclic.com>
  
  	* rcs.c (annotate): Call tag_check_valid like the other functions
  	which have a -r option.
  	* sanity.sh (ann): New test ann-14 tests for this.
  
+ 1998-05-25  Murray Bishop  <mbishop@acnielsen.com.au>
+ 
+ 	* commit.c (commit): Open the -F logfile in text rather than
+ 	binary mode to pass log-11 and keywordlog-7 under OS/2 EMX.
+ 
  1998-05-24  Jim Kingdon  <kingdon@harvey.cyclic.com>
  
  	* sanity.sh (importc): New tests importc-5 through importc-8 test
***************
*** 13019,13024 ****
--- 13356,13388 ----
  	* wrapper.c (wrap_add): Disable -t/-f wrappers at least until the
  	serious bug can be fixed.
  
+ 1998-05-19  Murray Bishop  <mbishop@acnielsen.com.au>
+ 
+ 	* sanity.sh: Modify to run for OS/2 EMX testing.
+ 	* commit.c (commit): Open the -F logfile in text rather than
+ 	binary mode to pass log-11 and keywordlog-7 under OS/2 EMX.
+ 	* parseinfo.c (parse_config): have fp_info closed before 
+ 	returning, even if goto error_return happened. Pass config-5.
+ 
+ 1998-05-19  Murray Bishop <mbishop@acnielsen.com.au>
+ 
+ 	Murray Bishop applies the Andreas Huber <ahuber.ping.at>
+ 	patches for cvs-1.9.27
+ 	
+ 	* client.c (change_mode) [!CHMOD_BROKEN]: Call CVS_CHMOD 
+ 	instead of chmod.
+ 	* client.c (start_rsh_server): Move -b flag after hostname.
+ 	* commit.c (fix_rcs_modes): Use CVS_CHMOD in place of chmod.
+ 	* filesubr.c (xchmod): Use CVS_CHMOD in place of chmod.
+ 	* filesubr.c (rename_file): Use CVS_RENAME in place of rename.
+ 	* import.c (add_rcs_file): Use CVS_CHMOD in place of chmod.
+ 	* rcs.c (RCS_checkout): Use CVS_CHMOD in place of chmod.
+ 	* rcs.c (RCS_get_cached): Add function.
+ 	* rcs.c (RCS_cache_close): Add function.
+ 	* rcs.h: add prototypes for RCS_get_cached and RCS_cache_close.
+ 	* server.c (server): Set stdin, stdout, stderr into binary mode.
+ 	* update.c (patch_file): Use CVS_CHMOD in place of chmod.
+ 	
  1998-05-15  Jim Kingdon  <kingdon@harvey.cyclic.com>
  
  	* checkout.c (checkout): Call server_pathname_check on the
Index: src/Makefile.in
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/src/Makefile.in,v
retrieving revision 1.1.1.11
retrieving revision 1.1.3.1.4.8
diff -c -r1.1.1.11 -r1.1.3.1.4.8
*** src/Makefile.in	3 Oct 2005 03:37:36 -0000	1.1.1.11
--- src/Makefile.in	19 Jul 2006 17:45:14 -0000	1.1.3.1.4.8
***************
*** 128,134 ****
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES = cvsbug sanity.config.sh
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
--- 128,135 ----
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h \
! 	$(top_builddir)/emx-new/common.h
  CONFIG_CLEAN_FILES = cvsbug sanity.config.sh
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
***************
*** 157,163 ****
  am__DEPENDENCIES_1 =
  binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  SCRIPTS = $(bin_SCRIPTS)
! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
  am__depfiles_maybe = depfiles
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--- 158,164 ----
  am__DEPENDENCIES_1 =
  binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
  SCRIPTS = $(bin_SCRIPTS)
! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/emx-new
  depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
  am__depfiles_maybe = depfiles
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
***************
*** 199,204 ****
--- 200,206 ----
  GETOPT_H = @GETOPT_H@
  GLOB_H = @GLOB_H@
  GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
  HAVE_LONG_64BIT = @HAVE_LONG_64BIT@
  HAVE_LONG_LONG_64BIT = @HAVE_LONG_LONG_64BIT@
  HAVE__BOOL = @HAVE__BOOL@
***************
*** 261,268 ****
  ZLIB_LIBS = @ZLIB_LIBS@
  ZLIB_SUBDIRS = @ZLIB_SUBDIRS@
  ac_ct_CC = @ac_ct_CC@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
  ac_prefix_program = @ac_prefix_program@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--- 263,268 ----
***************
*** 279,301 ****
--- 279,308 ----
  build_vendor = @build_vendor@
  cvs_client_objects = @cvs_client_objects@
  datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
+ htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
+ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
***************
*** 565,582 ****
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zlib.Po@am__quote@
  
  .c.o:
! @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
! @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@	$(COMPILE) -c $<
  
  .c.obj:
! @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
! @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  uninstall-info-am:
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
--- 572,587 ----
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zlib.Po@am__quote@
  
  .c.o:
! @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
  
  .c.obj:
! @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! 	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
  uninstall-info-am:
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
Index: src/buffer.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/src/buffer.c,v
retrieving revision 1.1.1.8
retrieving revision 1.1.3.2.4.6
diff -c -r1.1.1.8 -r1.1.3.2.4.6
*** src/buffer.c	2 Oct 2005 05:17:40 -0000	1.1.1.8
--- src/buffer.c	19 Jul 2006 17:45:14 -0000	1.1.3.2.4.6
***************
*** 1812,1824 ****
      struct fd_buffer *fb = closure;
      int nbytes;
  
      assert (need <= size);
  
      *got = 0;
  
      if (fb->blocking)
      {
! 	int status;
  	fd_set readfds;
  
  	/* Set non-block.  */
--- 1812,1828 ----
      struct fd_buffer *fb = closure;
      int nbytes;
  
+ #ifdef __EMX__
+     need = 0;                           /* HACK: the new blocking behavior fails
+                                            with ZLIB near the end of stream */
+ #endif
      assert (need <= size);
  
      *got = 0;
  
      if (fb->blocking)
      {
!         int status;
  	fd_set readfds;
  
  	/* Set non-block.  */
***************
*** 1827,1832 ****
--- 1831,1837 ----
  
  	FD_ZERO (&readfds);
  	FD_SET (fb->fd, &readfds);
+ 
  	do
  	{
  	    int numfds;
***************
*** 2019,2026 ****
  			 && sb.st_uid == devnull.st_uid
  			 && sb.st_gid == devnull.st_gid
  			 && sb.st_size == devnull.st_size
  			 && sb.st_blocks == devnull.st_blocks
! 			 && sb.st_blksize == devnull.st_blksize);
  	if (isdevnull)
  	    errno = 0;
  	else
--- 2024,2034 ----
  			 && sb.st_uid == devnull.st_uid
  			 && sb.st_gid == devnull.st_gid
  			 && sb.st_size == devnull.st_size
+ #ifndef __EMX__
  			 && sb.st_blocks == devnull.st_blocks
! 			 && sb.st_blksize == devnull.st_blksize
! #endif
!                          );
  	if (isdevnull)
  	    errno = 0;
  	else
Index: src/checkout.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/src/checkout.c,v
retrieving revision 1.1.1.11
retrieving revision 1.1.3.2.4.9
diff -c -r1.1.1.11 -r1.1.3.2.4.9
*** src/checkout.c	23 Sep 2005 08:53:08 -0000	1.1.1.11
--- src/checkout.c	19 Jul 2006 17:45:14 -0000	1.1.3.2.4.9
***************
*** 1158,1164 ****
  {
      for (;;)
      {
! 	if (*p == '/') return p;
  	if (p == start) break;
  	--p;
      }
--- 1158,1164 ----
  {
      for (;;)
      {
! 	if (ISSLASH(*p)) return p;
  	if (p == start) break;
  	--p;
      }
Index: src/client.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/src/client.c,v
retrieving revision 1.1.1.13
retrieving revision 1.1.3.2.4.10
diff -c -r1.1.1.13 -r1.1.3.2.4.10
*** src/client.c	2 Oct 2005 05:17:40 -0000	1.1.1.13
--- src/client.c	19 Jul 2006 17:45:14 -0000	1.1.3.2.4.10
***************
*** 356,362 ****
  	mode &= ~oumask;
      }
  
!     if (chmod (filename, mode) < 0)
  	return errno;
      return 0;
  #endif /* ! CHMOD_BROKEN */
--- 356,362 ----
  	mode &= ~oumask;
      }
  
!     if (CVS_CHMOD (filename, mode) < 0)
  	return errno;
      return 0;
  #endif /* ! CHMOD_BROKEN */
***************
*** 2483,2489 ****
  	     * sure it matters what toplevel_repos we get, but it does
  	     * matter that we don't hit the "internal error" code below).
  	     */
! 	    if (update_dir[0] == '/')
  		toplevel_repos = Name_Repository (update_dir, update_dir);
  	    else
  	    {
--- 2483,2489 ----
  	     * sure it matters what toplevel_repos we get, but it does
  	     * matter that we don't hit the "internal error" code below).
  	     */
! 	    if (ISABSOLUTE (update_dir))
  		toplevel_repos = Name_Repository (update_dir, update_dir);
  	    else
  	    {
Index: src/edit.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/src/edit.c,v
retrieving revision 1.1.1.9
retrieving revision 1.1.3.2.4.7
diff -c -r1.1.1.9 -r1.1.3.2.4.7
*** src/edit.c	14 Sep 2005 15:50:34 -0000	1.1.1.9
--- src/edit.c	19 Jul 2006 17:45:14 -0000	1.1.3.2.4.7
***************
*** 769,776 ****
--- 769,786 ----
      /* The file is up to date, so we better get rid of an out of
         date file in CVSADM_BASE.  */
      base = Xasprintf ("%s/%s", CVSADM_BASE, file);
+     /* In OS/2, no one agrees about the RC when deleting a nonexistent file in
+        a nonexistent directory. Old-timers (FAT, HPFS[386]) return ENOTDIR,
+        TVFS gives ENOENT, and JFS over NETWKSTA apparently returns EACCES. The
+        reason is unknown (AIXisms? - see the source code). EACCES causes noise,
+        which we shall try to avoid. */
+     #ifdef __EMX__
+      if(access(base, 0))
+       goto skip_deletion;
+     #endif
      if (unlink_file (base) < 0 && ! existence_error (errno))
  	error (0, errno, "cannot remove %s", file);
+ skip_deletion:;
      free (base);
  }
  
Index: src/filesubr.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/src/filesubr.c,v
retrieving revision 1.1.1.12
retrieving revision 1.1.3.2.4.9
diff -c -r1.1.1.12 -r1.1.3.2.4.9
*** src/filesubr.c	28 Sep 2005 05:25:54 -0000	1.1.1.12
--- src/filesubr.c	19 Jul 2006 17:45:14 -0000	1.1.3.2.4.9
***************
*** 367,373 ****
      if (noexec)
  	return;
  
!     if (chmod (fname, mode) < 0)
  	error (0, errno, "cannot change mode of file %s", fname);
  }
  
--- 367,373 ----
      if (noexec)
  	return;
  
!     if (CVS_CHMOD (fname, mode) < 0)
  	error (0, errno, "cannot change mode of file %s", fname);
  }
  
***************
*** 382,388 ****
      if (noexec)
  	return;
  
!     if (rename (from, to) < 0)
  	error (1, errno, "cannot rename file %s to %s", from, to);
  }
  
--- 382,388 ----
      if (noexec)
  	return;
  
!     if (CVS_RENAME (from, to) < 0)
  	error (1, errno, "cannot rename file %s to %s", from, to);
  }
  
Index: src/find_names.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/src/find_names.c,v
retrieving revision 1.1.1.6
retrieving revision 1.1.3.1.4.4
diff -c -r1.1.1.6 -r1.1.3.1.4.4
*** src/find_names.c	26 May 2005 07:48:12 -0000	1.1.1.6
--- src/find_names.c	19 Jul 2006 17:45:14 -0000	1.1.3.1.4.4
***************
*** 22,28 ****
--- 22,32 ----
   */
  
  #include "cvs.h"
+ #ifdef __EMX__
+ #include "../lib/glob_.h"
+ #else
  #include <glob.h>
+ #endif
  #include <assert.h>
  
  static int find_dirs (char *dir, List * list, int checkadm,
***************
*** 323,331 ****
      err = glob (pat, GLOB_PERIOD | (dir ? GLOB_ERR : 0), NULL, &glist);
      if (err && err != GLOB_NOMATCH)
      {
! 	if (err == GLOB_ABORTED)
! 	    /* Let our caller handle the problem.  */
! 	    return NULL;
  	if (err == GLOB_NOSPACE) errno = ENOMEM;
  	if (!really_quiet)
  	    error (0, errno, "glob failed");
--- 327,335 ----
      err = glob (pat, GLOB_PERIOD | (dir ? GLOB_ERR : 0), NULL, &glist);
      if (err && err != GLOB_NOMATCH)
      {
!         if (err == GLOB_ABORTED)
!             /* Let our caller handle the problem.  */
!             return NULL;
  	if (err == GLOB_NOSPACE) errno = ENOMEM;
  	if (!really_quiet)
  	    error (0, errno, "glob failed");
***************
*** 400,405 ****
--- 404,410 ----
      List *newlist;
      if (!(newlist = find_files (dir, RCSPAT)))
  	return 1;
+     
      walklist (newlist, strip_rcsext, NULL);
      mergelists (list, &newlist);
      return 0;
Index: src/import.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/src/import.c,v
retrieving revision 1.1.1.8
retrieving revision 1.1.3.2.4.6
diff -c -r1.1.1.8 -r1.1.3.2.4.6
*** src/import.c	3 Sep 2005 14:27:24 -0000	1.1.1.8
--- src/import.c	19 Jul 2006 17:45:14 -0000	1.1.3.2.4.6
***************
*** 520,527 ****
  		    err += client_process_import_file (message, dp->d_name,
                                                         vtag, targc, targv,
                                                         repository,
!                                                        keyword_opt != NULL &&
! 						       keyword_opt[0] == 'b',
  						       use_file_modtime);
  		else
  #endif
--- 520,526 ----
  		    err += client_process_import_file (message, dp->d_name,
                                                         vtag, targc, targv,
                                                         repository,
! 						       keyword_opt,
  						       use_file_modtime);
  		else
  #endif
***************
*** 1455,1461 ****
  	    (sb.st_mode & S_IRWXU) >> 6) &
  	   ~cvsumask &
  	   ~(S_IWRITE | S_IWGRP | S_IWOTH);
!     if (chmod (rcs, mode) < 0)
      {
  	ierrno = errno;
  	if (add_logfp != NULL)
--- 1454,1460 ----
  	    (sb.st_mode & S_IRWXU) >> 6) &
  	   ~cvsumask &
  	   ~(S_IWRITE | S_IWGRP | S_IWOTH);
!     if (CVS_CHMOD (rcs, mode) < 0)
      {
  	ierrno = errno;
  	if (add_logfp != NULL)
Index: src/logmsg.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/src/logmsg.c,v
retrieving revision 1.1.1.9
retrieving revision 1.1.3.1.4.7
diff -c -r1.1.1.9 -r1.1.3.1.4.7
*** src/logmsg.c	3 Sep 2005 14:27:24 -0000	1.1.1.9
--- src/logmsg.c	19 Jul 2006 17:45:14 -0000	1.1.3.1.4.7
***************
*** 7,14 ****
   * Portions Copyright (C) 1992, Brian Berliner and Jeff Polk
   * Portions Copyright (C) 1989-1992, Brian Berliner
   * 
-  * You may distribute under the terms of the GNU General Public License as
-  * specified in the README file that comes with the CVS source distribution.
   */
  
  
--- 7,12 ----
***************
*** 727,732 ****
--- 725,732 ----
      char *cmdline;
      FILE *pipefp;
      char *cp;
+     char strquote='"';          /* AAB 05/02/2003 - in OS/2, we'd better
+                                    supply "'" to the COMSPEC! */
      int c;
      int pipestatus;
      const char *srepos = Short_Repository (repository);
Index: src/main.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/src/main.c,v
retrieving revision 1.1.1.13
retrieving revision 1.1.3.2.4.9
diff -c -r1.1.1.13 -r1.1.3.2.4.9
*** src/main.c	2 Oct 2005 05:17:42 -0000	1.1.1.13
--- src/main.c	19 Jul 2006 17:45:14 -0000	1.1.3.2.4.9
***************
*** 549,555 ****
--- 549,559 ----
      /*
       * Just save the last component of the path for error messages
       */
+ #ifdef CONCEALED_PATH
+     program_path = get_my_name ();
+ #else
      program_path = xstrdup (argv[0]);
+ #endif
  #ifdef ARGV0_NOT_PROGRAM_NAME
      /* On some systems, e.g. VMS, argv[0] is not the name of the command
         which the user types to invoke the program.  */
Index: src/rcs.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/src/rcs.c,v
retrieving revision 1.1.1.13
retrieving revision 1.1.3.2.4.9
diff -c -r1.1.1.13 -r1.1.3.2.4.9
*** src/rcs.c	28 Sep 2005 05:25:54 -0000	1.1.1.13
--- src/rcs.c	19 Jul 2006 17:45:14 -0000	1.1.3.2.4.9
***************
*** 4646,4652 ****
  		       workfile);
  	}
  
! 	ret = chmod (workfile,
  		     change_rcs_mode
  		     ? rcs_mode
  		     : sb.st_mode & ~(S_IWRITE | S_IWGRP | S_IWOTH));
--- 4646,4652 ----
  		       workfile);
  	}
  
! 	ret = CVS_CHMOD (workfile,
  		     change_rcs_mode
  		     ? rcs_mode
  		     : sb.st_mode & ~(S_IWRITE | S_IWGRP | S_IWOTH));
***************
*** 4657,4663 ****
  	    return 1;
  	}
  
! 	ret = chmod (workfile,
  		     sb.st_mode & ~(S_IWRITE | S_IWGRP | S_IWOTH));
  #endif
  	if (ret < 0)
--- 4657,4663 ----
  	    return 1;
  	}
  
! 	ret = CVS_CHMOD (workfile,
  		     sb.st_mode & ~(S_IWRITE | S_IWGRP | S_IWOTH));
  #endif
  	if (ret < 0)
Index: src/root.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/src/root.c,v
retrieving revision 1.1.1.12
retrieving revision 1.1.3.2.4.7
diff -c -r1.1.1.12 -r1.1.3.2.4.7
*** src/root.c	24 Sep 2005 14:38:58 -0000	1.1.1.12
--- src/root.c	19 Jul 2006 17:45:14 -0000	1.1.3.2.4.7
***************
*** 473,482 ****
      char *cvsroot_copy, *p;		/* temporary pointers for parsing */
  #if defined(CLIENT_SUPPORT) || defined (SERVER_SUPPORT)
      char *q;				/* temporary pointer for parsing */
!     char *firstslash;			/* save where the path spec starts
  					 * while we parse
  					 * [[user][:password]@]host[:[port]]
  					 */
      int check_hostname, no_port, no_password, no_proxy;
  #endif /* defined(CLIENT_SUPPORT) || defined (SERVER_SUPPORT) */
      static List *cache = NULL;
--- 473,483 ----
      char *cvsroot_copy, *p;		/* temporary pointers for parsing */
  #if defined(CLIENT_SUPPORT) || defined (SERVER_SUPPORT)
      char *q;				/* temporary pointer for parsing */
!     char *firstpchar;			/* save where the path spec starts
  					 * while we parse
  					 * [[user][:password]@]host[:[port]]
  					 */
+     char firstchar;                     /* '/', '\\' or a drive spec+':' */
      int check_hostname, no_port, no_password, no_proxy;
  #endif /* defined(CLIENT_SUPPORT) || defined (SERVER_SUPPORT) */
      static List *cache = NULL;
***************
*** 657,663 ****
  	    error (0, 0, "[:(ext|server):][[user]@]host[:]/path");
  	    goto error_exit;
  	}
! 	firstslash = p;		/* == NULL if '/' not in string */
  	*p = '\0';
  
  	/* Check to see if there is a username[:password] in the string. */
--- 658,679 ----
  	    error (0, 0, "[:(ext|server):][[user]@]host[:]/path");
  	    goto error_exit;
  	}
! 
!         /* For OS/2-based pserver: allow BOTH port and drive in repository specification */
!         if (strlen (cvsroot_copy) > 2 && (q = strrchr (cvsroot_copy + 2, ':')) != NULL)
!         {
!             if (*(q - 2) == ':' && isalpha (*(q - 1)) && strchr("\\/", *(q + 1)) != NULL)
!             {
!                 /* Now watch the action: we break the string with two nulls - the ':' in front
!                    of the drive specification is blasted away, and the pointer will restore
!                    the NEXT character, namely the drive specification */
!                 *(q - 2) = '\0';
!                 p = q - 1;
!             }
!         }
! 
! 	firstpchar = p;		/* == NULL if '/' not in string */
!         firstchar = *p;
  	*p = '\0';
  
  	/* Check to see if there is a username[:password] in the string. */
***************
*** 728,735 ****
  	    newroot->hostname = xstrdup (cvsroot_copy);
  
  	/* restore the '/' */
! 	cvsroot_copy = firstslash;
! 	*cvsroot_copy = '/';
      }
  #endif /* defined(CLIENT_SUPPORT) || defined (SERVER_SUPPORT) */
  
--- 744,751 ----
  	    newroot->hostname = xstrdup (cvsroot_copy);
  
  	/* restore the '/' */
! 	cvsroot_copy = firstpchar;
! 	*cvsroot_copy = firstchar;
      }
  #endif /* defined(CLIENT_SUPPORT) || defined (SERVER_SUPPORT) */
  
Index: src/rsh-client.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/src/rsh-client.c,v
retrieving revision 1.1.1.4
retrieving revision 1.1.1.4.2.3
diff -c -r1.1.1.4 -r1.1.1.4.2.3
*** src/rsh-client.c	2 Oct 2005 05:17:42 -0000	1.1.1.4
--- src/rsh-client.c	19 Jul 2006 17:45:14 -0000	1.1.1.4.2.3
***************
*** 44,49 ****
--- 44,50 ----
  {
      int pipes[2];
      int child_pid;
+     int using rsh_dflt = 0;
  
      /* If you're working through firewalls, you can set the
         CVS_RSH environment variable to a script which uses rsh to
***************
*** 58,63 ****
--- 59,65 ----
      char *rsh_argv[10];
  
      if (!cvs_rsh)
+     {
  	/* People sometimes suggest or assume that this should default
  	   to "remsh" on systems like HPUX in which that is the
  	   system-supplied name for the rsh program.  However, that
***************
*** 79,94 ****
  	   if that is what they want (the manual already tells them
  	   that).  */
  	cvs_rsh = RSH_DFLT;
      if (!cvs_server)
  	cvs_server = "cvs";
  
      /* The command line starts out with rsh. */
      rsh_argv[i++] = cvs_rsh;
  
! #   ifdef RSH_NEEDS_BINARY_FLAG
!     /* "-b" for binary, under OS/2. */
!     rsh_argv[i++] = "-b";
! #   endif /* RSH_NEEDS_BINARY_FLAG */
  
      /* Then we strcat more things on the end one by one. */
      if (root->username != NULL)
--- 81,100 ----
  	   if that is what they want (the manual already tells them
  	   that).  */
  	cvs_rsh = RSH_DFLT;
+ 	using_rsh_dflt = 1;		/* Hint for "rsh -b" on OS/2 */
+     }
      if (!cvs_server)
  	cvs_server = "cvs";
  
      /* The command line starts out with rsh. */
      rsh_argv[i++] = cvs_rsh;
  
! #ifdef RSH_NEEDS_BINARY_FLAG
!     /* "-b" for binary, under OS/2. BUGBUG: still need a more elegant
!        solution. */
!     if(using_rsh_dflt)
! 	rsh_argv[i++] = "-b";
! #endif /* RSH_NEEDS_BINARY_FLAG */
  
      /* Then we strcat more things on the end one by one. */
      if (root->username != NULL)
Index: src/sanity.sh
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/src/sanity.sh,v
retrieving revision 1.1.1.15
retrieving revision 1.1.3.2.4.13
diff -c -r1.1.1.15 -r1.1.3.2.4.13
*** src/sanity.sh	22 Sep 2005 10:34:12 -0000	1.1.1.15
--- src/sanity.sh	19 Jul 2006 17:45:14 -0000	1.1.3.2.4.13
***************
*** 1,6 ****
  #! /bin/sh
  :
! #	sanity.sh -- a growing testsuite for cvs.
  #
  # The copyright notice said: "Copyright (C) 1992, 1993 Cygnus Support"
  # I'm not adding new copyright notices for new years as our recent 
--- 1,6 ----
  #! /bin/sh
  :
! #   sanity.sh -- a growing testsuite for cvs (OS/2-friendly version)
  #
  # The copyright notice said: "Copyright (C) 1992, 1993 Cygnus Support"
  # I'm not adding new copyright notices for new years as our recent 
***************
*** 106,113 ****
  LC_ALL=C
  export LC_ALL
  
! # And a few tests want a predictable umask.
! umask 0002
  
  #
  # Initialize the test counts.
--- 106,322 ----
  LC_ALL=C
  export LC_ALL
  
! # FIXME: The detection of OS_COMPILER_EMU only tests for OS.
! # Is there some way to tell what compiled cvs? If so, then things
! # like cygwin32 compiled cvs might be handled.
! 
! OS_COMPILER_EMU=""
! if test x"${OS2_SHELL}" != x; then
!   OS_COMPILER_EMU="os2_gcc_emx"
!   RSH_FLAGS="-b"
! fi
! if test x"${OS}" = x"Windows_NT"; then
!   OS_COMPILER_EMU="win32_msvc_cygwin32"
! fi
! if test "x`uname`" = "xWindows_95"; then
!   OS_COMPILER_EMU="win95_msvc_mks"
! fi
! 
! # Here are a bunch of things that let sanity.sh run better on EMX
! # and on windows-NT.
! 
! case $OS_COMPILER_EMU in
!   os2_gcc_emx)
! 	echo "Bending sanity.sh for ${OS_COMPILER_EMU}"
! 
! 	# Regexp to match the name of a temporary file (from cvs_temp_name).
! 	# redefine to allow colon
! 	tempname="[-a-zA-Z0-9/.%_:]*"
! 
! 	# when asked `type -p sh`, pd korn shell for OS/2 5.27 says 
! 	# "sh is a tracked alias for d:\gnu\bin/sh.exe"
! 	TESTSHELL=sh
! 
! 	# On OS/2 and Windows-NT, we can't make directories readonly with 
! 	# chmod -w
! 	# When the line below is uncommented, test needing that are not run
! 	CANT_PROTECT_DIRS=1
! 
! 	# On OS/2 and Windows-NT, sometimes we can't run shell scripts by 
! 	# naming them.
! 	# When the line below is uncommented, hack around such problems
! 	# Andreas Huber says when he is finished his port of 1.9.28.1
! 	# scripts will run ok.
! 	CANT_RUN_SCRIPTS=1
! 
! 	# On OS/2 with EMX, invoke edhack.exe instead of a shell script editme
! 	# You'll need edhack.exe on your path for this one
! 	# You can find a copy below in this file (look for edhack.c)
! 	#EDHACK_EDITOR=1
! 
! 	# On OS/2 and Win-NT do tests for PreservePermissions only if asked
! 	# (that way, default sanity.sh run is easy)
! 	WONT_PRESERVE_PERMISSIONS=1
! 
! 	# OS/2 (EMX) ls - GNU file utilities 3.13 shows things like drwxa--
! 	# rather than -r--r--r--. this breaks most of modes) test, so don't
! 	# do it unless asked.
! 	BROKEN_LS_L=1
! 
! 	# DEVNULL is used for expr comparison (like macro in src/cvs.h 
! 	# ($DEVNULL) and also in windows-NT/config.h (nul) for 
! 	# OS/2 emx gcc and Windows-NT MSVC++ want nul
! 	DEVNULL=nul
! 	DEVNULL_TIME="[a-zA-Z0-9: ]*"
! 
! 	# OS/2 EMX and cygwin32 have cat and echo emit lines with crlf at end
! 	# This is no good for For making RCS files, so the kludge crlf2lf.exe
! 	# can be used instead (you'll need it on your path)
! 	# You can find a copy below in this file (look for crlf2lf.c)
! 	CRLF_ENDLINES=1
! 
! 	# Under OS/2, we skip everything which is related to user IDs, access
! 	# control and everything like that (anyone wishing to add LS-specific
! 	# logic?)
! 	SINGLE_USER=1
! 
! 	# Specific fixup for basic2-64. Since we're proud to use "/" eveywhere,
! 	# we must ensure that when TMPPWD is set, it's allowed to have drive
! 	# letter, which is not repored by pwd, and reference to /cvs-sanity.
! 	TMPPWD_FIXUP=1
! 
! 	# Append this indiscriminately when searching for tools
!         EXE_SUFFIX=.exe
!         # Now the sanity script wants us to strip ".exe" from cvs_cmd_name
!         # so that all error() output begins with a shorter "cvs:". No way!
!         EXE_SUFFIX_OK=1
! 
! 	# Prefix for local repositories, needed for the multiple repositories
! 	# tests.
! 	LOCAL_ROOT_PREFIX=:local:
! 
!         # Path / path list separators
!   	SLASH="/"
! 	PATH_SEPARATOR=";"
! 
!         # Suppress the test for end anchor in expr.exe which only confuses the
!         # ported bash. There is an explicit warning in OS/2 readme to avoid
! 	# using outdated EXPR anyway.
! 	SUPPRESS_EXPR_ANCHOR_TEST=1
! 
! 	# Test for a deficiency in quote handling (peculiar to bash ports)
! 	if expr '' : '' >$DEVNULL; then
! 	    echo Quote handling is broken in this shell, some tests will be skipped
! 	    BROKEN_QUOTE=1
! 	    DQUOTE=\"
! 	fi
! 
! 	# Test if here-document syntax really produces something (ksh won't
! 	# pass the test with this particular syntax)
!         heredoc=`cat<<EOF
! SOMETHING
! EOF
! `
! 	if test x"$heredoc" != xSOMETHING; then
! 	    echo Here-document handling is inadequate in this shell
! 	    exit 1
! 	fi
! 
!   ;;
!   win32_msvc_cygwin32)
! 	echo "Bending sanity.sh for ${OS_COMPILER_EMU}"
! 	tempname="[-a-zA-Z0-9/\\.%_:]*"
! 
! 	# reserved-13b works like this
! 	TESTSHELL=sh
! 
! 	CANT_PROTECT_DIRS=1
! 	CANT_RUN_SCRIPTS=1
! 	EDHACK_EDITOR=1
! 	WONT_PRESERVE_PERMISSIONS=1
! 
! 	# FIXME: cygwyn32 is a lot less broken than emx, and may possibly
! 	# be made to work. 
!         # For instance, emx fails at modes-5, but nt fails at modes-7b
! 	# when the BROKEN_LS_L isn't defined.
! 	# On the other hand, maybe cygwin32 not passing modes) is a real bug.
! 	BROKEN_LS_L=1
! 	DEVNULL=nul
! 	CRLF_ENDLINES=1
! 
! 	# Append this indiscriminately when searching for tools
!         EXE_SUFFIX=.exe
! 
!         # Path / path list separators
! 	#
! 	# Some RCS outputs have \ rather than / on windows-NT when
! 	# compiled by MS Visual C++
!   	SLASH="[/\\]"
! 	PATH_SEPARATOR=";"
! 
! 	# death2-diff tests give ? as filetime of nul
! 	DEVNULL_TIME="?"
!   ;;
!   win95_msvc_mks)
! 	echo "Bending sanity.sh for ${OS_COMPILER_EMU}"
! 	tempname="[-a-zA-Z0-9/\\.%_:]*"
! 
! 	# MKS ksh seems to run DOS type rather than *nix type, so
! 	# shell detection just doesn't work.
! 	TESTSHELL=sh
! 
! 	CANT_PROTECT_DIRS=1
! 	CANT_RUN_SCRIPTS=1
! 	EDHACK_EDITOR=1
! 	WONT_PRESERVE_PERMISSIONS=1
! 
! 	# FIXME: cygwyn32 is a lot less broken than emx, and may possibly
! 	# be made to work. 
!         # For instance, emx fails at modes-5, but nt fails at modes-7b
! 	# when the BROKEN_LS_L isn't defined.
! 	# On the other hand, maybe cygwin32 not passing modes) is a real bug.
! 	BROKEN_LS_L=1
! 	DEVNULL=nul
! 	CRLF_ENDLINES=1
! 
! 	# Append this indiscriminately when searching for tools
!         EXE_SUFFIX=.exe
! 
!         # Path / path list separators
! 	#
! 	# Some RCS outputs have \ rather than / on windows-NT when
! 	# compiled by MS Visual C++
!   	SLASH="[/\\]"
! 	PATH_SEPARATOR=";"
! 
! 	# death2-diff tests give ? as filetime of nul
! 	DEVNULL_TIME="?"
!  	DEVNULL_TIME="[a-zA-Z0-9: ]*"
!   ;;
!   *)
! 	DEVNULL=/dev/null
! 	SLASH="/"
! 	DEVNULL_TIME="[a-zA-Z0-9: ]*"
! 	FILESYSTEM_TICK=0
! 	TESTSHELL="/bin/sh"
! 
!         # Path / path list separators
!   	SLASH="/"
! 	PATH_SEPARATOR=":"
! 
!         # On cygwin32, we may not have /bin/sh.
!         if test -r /bin/sh; then
!           TESTSHELL="/bin/sh"
!         else
!           TESTSHELL=`type -p sh 2>/dev/null`
!           if test ! -r "$TESTSHELL"; then
!             TESTSHELL="/bin/sh"
!           fi
!         fi
! 	# And a few tests want a predictable umask.
! 	umask 0002
!   ;;
! esac
  
  #
  # Initialize the test counts.
***************
*** 116,122 ****
--- 325,351 ----
  skipped=0
  warnings=0
  
+ # The default value of ${TMPDIR}/cvs-sanity for TESTDIR is dubious,
+ # because it loses if two people/scripts try to run the tests
+ # at the same time.  Some possible solutions:
+ # 1.  Use ${TMPDIR}/cvs-test$$.  One disadvantage is that the old
+ #     cvs-test* directories would pile up, because they wouldn't
+ #     necessarily get removed.
+ # 2.  Have everyone/everything running the testsuite set
+ #     TESTDIR to some appropriate directory.
+ # 3.  Have the default value of TESTDIR be some variation of
+ #     `pwd`/cvs-sanity.  The biggest problem here is that we have
+ #     been fairly careful to test that CVS prints in messages the
+ #     actual pathnames that we pass to it, rather than a different
+ #     pathname for the same directory, as may come out of `pwd`.
+ #     So this would be lost if everything was `pwd`-based.  I suppose
+ #     if we wanted to get baroque we could start making symlinks
+ #     to ensure the two are different.
+ tmp=`(cd /tmp; /bin/pwd || pwd) 2>$DEVNULL`
+ : ${TESTDIR:=${TMPDIR:-$tmp}/cvs-sanity}
  
+ # "debugger"
+ #set -x
  
  #
  # read our options
***************
*** 136,142 ****
      # convert the long opts to short opts
      if test x$option = x-;  then
  	# remove any argument
! 	if echo "$OPTARG" |grep = >/dev/null; then
  	    LONGOPT=`echo "$OPTARG" |sed 's/=.*$//'`
  	    OPTARG=`echo "$OPTARG" |sed -e 's/^.*=//'`
  	else
--- 365,371 ----
      # convert the long opts to short opts
      if test x$option = x-;  then
  	# remove any argument
! 	if echo "$OPTARG" |grep = >$DEVNULL; then
  	    LONGOPT=`echo "$OPTARG" |sed 's/=.*$//'`
  	    OPTARG=`echo "$OPTARG" |sed -e 's/^.*=//'`
  	else
***************
*** 268,274 ****
  "")
    exit_usage
    ;;
! /*)
    testcvs=$1
    ;;
  *)
--- 497,503 ----
  "")
    exit_usage
    ;;
! /*|[a-zA-Z]:/*)
    testcvs=$1
    ;;
  *)
***************
*** 283,290 ****
    echo "No such file or file not readable: $testcvs" >&2
    exit 1
  fi
! if $testcvs --version </dev/null 2>/dev/null |
!      grep '^Concurrent Versions System' >/dev/null 2>&1; then :; else
    echo "Not a CVS executable: $testcvs" >&2
    exit 1
  fi
--- 512,519 ----
    echo "No such file or file not readable: $testcvs" >&2
    exit 1
  fi
! if $testcvs --version <$DEVNULL 2>$DEVNULL |
!      grep '^Concurrent Versions System' >$DEVNULL 2>&1; then :; else
    echo "Not a CVS executable: $testcvs" >&2
    exit 1
  fi
***************
*** 366,378 ****
        echo "No such file or file not readable: $remotehost:${testcvs}" >&2
        exit 1
      fi
!     if $CVS_RSH $remotehost "${servercvs} --version </dev/null 2>/dev/null |
!          grep '^Concurrent Versions System' >/dev/null 2>&1"; then :; else
        echo "Not a CVS executable: $remotehost:${servercvs}" >&2
        exit 1
      fi
!     if $CVS_RSH $remotehost "${servercvs} --version </dev/null |
!          grep '^Concurrent.*(.*server)$' >/dev/null 2>&1"; then :; else
        echo "CVS executable \`$remotehost:${servercvs}' does not contain server support." >&2
        exit 1
      fi
--- 595,607 ----
        echo "No such file or file not readable: $remotehost:${testcvs}" >&2
        exit 1
      fi
!     if $CVS_RSH $remotehost "${servercvs} --version <$DEVNULL 2>$DEVNULL |
!          grep '^Concurrent Versions System' >$DEVNULL 2>&1"; then :; else
        echo "Not a CVS executable: $remotehost:${servercvs}" >&2
        exit 1
      fi
!     if $CVS_RSH $remotehost "${servercvs} --version <$DEVNULL |
!          grep '^Concurrent.*(.*server)$' >$DEVNULL 2>&1"; then :; else
        echo "CVS executable \`$remotehost:${servercvs}' does not contain server support." >&2
        exit 1
      fi
***************
*** 381,393 ****
        echo "No such file or file not readable: ${testcvs}" >&2
        exit 1
      fi
!     if ${servercvs} --version </dev/null 2>/dev/null |
!          grep '^Concurrent Versions System' >/dev/null 2>&1; then :; else
        echo "Not a CVS executable: ${servercvs}" >&2
        exit 1
      fi
!     if ${servercvs} --version </dev/null |
!          grep '^Concurrent.*(.*server)$' >/dev/null 2>&1; then :; else
        echo "CVS executable \`${servercvs}' does not contain server support." >&2
        exit 1
      fi
--- 610,622 ----
        echo "No such file or file not readable: ${testcvs}" >&2
        exit 1
      fi
!     if ${servercvs} --version <$DEVNULL 2>$DEVNULL |
!          grep '^Concurrent Versions System' >$DEVNULL 2>&1; then :; else
        echo "Not a CVS executable: ${servercvs}" >&2
        exit 1
      fi
!     if ${servercvs} --version <$DEVNULL |
!          grep '^Concurrent.*(.*server)$' >$DEVNULL 2>&1; then :; else
        echo "CVS executable \`${servercvs}' does not contain server support." >&2
        exit 1
      fi
***************
*** 397,412 ****
  # Fail in client/server mode if our ${testcvs} does not contain client
  # support.
  if $remote; then
!   if ${testcvs} --version </dev/null |
!        grep '^Concurrent.*(client.*)$' >/dev/null 2>&1; then :; else
      echo "CVS executable \`${testcvs}' does not contain client support." >&2
      exit 1
    fi
  fi
  
  # For the "fork" tests.
! if ${testcvs} --version </dev/null |
!      grep '^Concurrent.*(.*server)$' >/dev/null 2>&1
  then
    testcvs_server_support=:
  else
--- 626,641 ----
  # Fail in client/server mode if our ${testcvs} does not contain client
  # support.
  if $remote; then
!   if ${testcvs} --version <$DEVNULL |
!        grep '^Concurrent.*(client.*)$' >$DEVNULL 2>&1; then :; else
      echo "CVS executable \`${testcvs}' does not contain client support." >&2
      exit 1
    fi
  fi
  
  # For the "fork" tests.
! if ${testcvs} --version <$DEVNULL |
!      grep '^Concurrent.*(.*server)$' >$DEVNULL 2>&1
  then
    testcvs_server_support=:
  else
***************
*** 432,456 ****
  # "debugger"
  #set -x
  
! echo 'This test should produce no other output than this message, and a final "OK".'
  echo '(Note that the test can take an hour or more to run and periodically stops'
  echo 'for as long as one minute.  Do not assume there is a problem just because'
  echo 'nothing seems to happen for a long time.  If you cannot live without'
  echo "running status, try the command: \`tail -f check.log' from another window.)"
  
! # Regexp to match what the CVS client will call itself in output that it prints.
! # FIXME: we don't properly quote this--if the name contains . we'll
! # just spuriously match a few things; if the name contains other regexp
! # special characters we are probably in big trouble.
! CPROG=`basename ${testcvs} |sed 's/\.exe$//'`
! # And the regexp for the CVS server when we have one.  In local mode, this
! # defaults to $CPROG since $servercvs already did.
! # FIXCVS: There are a few places in error messages where CVS suggests a command
! # and outputs $SPROG as the suggested executable.  This could hopefully use
! # MT (tagged text - see doc/cvs-client.texi) to request that the client print
! # its own name.
! SPROG=`basename ${servercvs} |sed 's/\.exe$//'`
! 
  
  # Match the hostname
  hostname="[-_.a-zA-Z0-9]*"
--- 661,689 ----
  # "debugger"
  #set -x
  
! echo 'This test should produce no error messages, and a final "OK".'
  echo '(Note that the test can take an hour or more to run and periodically stops'
  echo 'for as long as one minute.  Do not assume there is a problem just because'
  echo 'nothing seems to happen for a long time.  If you cannot live without'
  echo "running status, try the command: \`tail -f check.log' from another window.)"
  
! if test x"${EXE_SUFFIX_OK}" = x; then
!   # Regexp to match what the CVS client will call itself in output that it prints.
!   # FIXME: we don't properly quote this--if the name contains . we'll
!   # just spuriously match a few things; if the name contains other regexp
!   # special characters we are probably in big trouble.
!   CPROG=`basename ${testcvs} |sed 's/\.exe$//'`
!   # And the regexp for the CVS server when we have one.  In local mode, this
!   # defaults to $CPROG since $servercvs already did.
!   # FIXCVS: There are a few places in error messages where CVS suggests a command
!   # and outputs $SPROG as the suggested executable.  This could hopefully use
!   # MT (tagged text - see doc/cvs-client.texi) to request that the client print
!   # its own name.
!   SPROG=`basename ${servercvs} |sed 's/\.exe$//'`
! else
!   CPROG=`basename ${testcvs}`
!   SPROG=`basename ${servercvs}`
! fi
  
  # Match the hostname
  hostname="[-_.a-zA-Z0-9]*"
***************
*** 463,468 ****
--- 696,727 ----
  tempfile="cvs[-a-zA-Z0-9.%_]*"
  # $tempname set after $TMPDIR, below.
  
+ # Further tests (probably inspired in version 1.11 of CVS by
+ # the Y2K hysteria) will operate with dates near the "beginning of the
+ # epoch". If the epoch in your system starts on the year after Woodstock,
+ # DECADE equals 7. If it starts on the year of the Moscow Olympics, then
+ # DECADE will be 8.
+ 
+ # The IntraNetware Client 4.11a does badly on rcs-5 when the /tmp
+ # is on Netware server. src/vers-ts.c(Version-TS) does
+ # utime (finfo->file, &t) with t.actime = t.modtime = 31564805 which
+ # causes modified time of file2 to be set to 1 jan 2099 (rather than
+ # 1 jan 19${DECADE}1). Looks to me like Netware counts file times from 1 jan
+ # 1980 0:0:0. Here is some mush to use dates in 1980 rather than 19${DECADE}1
+ # when it looks like we have OS/2, NT or Netware.
+ 
+ DECADE="7"
+ if touch -t19${DECADE}907010000 netware; then
+   if $EXPR "`ls -l netware`" : \
+      "${DOTSTAR}19${DECADE}9${DOTSTAR}" >$DEVNULL 2>&1; then
+     : base date probably before 1980
+   else
+     echo "I think you are using a DOS-style system or a Netware Fileserver"
+     DECADE="8"
+   fi
+ fi
+ rm netware
+ 
  # Regexp to match a date in RFC822 format (as amended by RFC1123).
  RFCDATE="[a-zA-Z0-9 ][a-zA-Z0-9 ]* [0-9:][0-9:]* -0000"
  RFCDATE_EPOCH="1 Jan 1970 00:00:00 -0000"
***************
*** 470,478 ****
  # Special times used in touch -t commands and the regular expresions
  # to match them. Now that the tests set TZ=UTC0, it
  # should be easier to be more exact in their regexp.
! TOUCH1971="197107040343"
! # This date regexp was 1971/07/0[3-5] [0-9][0-9]:43:[0-9][0-9]
! ISO8601DATE1971="1971-07-04 03:43:[0-9][0-9] [+-]0000"
  
  TOUCH2034="203412251801"
  # This date regexp was 2034/12/2[4-6] [0-9][0-9]:01:[0-9][0-9]
--- 729,737 ----
  # Special times used in touch -t commands and the regular expresions
  # to match them. Now that the tests set TZ=UTC0, it
  # should be easier to be more exact in their regexp.
! TOUCH1971="19${DECADE}107040343"
! # This date regexp was 19${DECADE}1/07/0[3-5] [0-9][0-9]:43:[0-9][0-9]
! ISO8601DATE1971="19${DECADE}1-07-04 03:43:[0-9][0-9] [+-]0000"
  
  TOUCH2034="203412251801"
  # This date regexp was 2034/12/2[4-6] [0-9][0-9]:01:[0-9][0-9]
***************
*** 517,524 ****
  # that are used in a %p format, add them here.
  PFMT="[0-9a-zA-Z()][0-9a-zA-Z()]*"
  
  # Which directories should Which and find_tool search for executables?
! SEARCHPATH=$PATH:/usr/local/bin:/usr/contrib/bin:/usr/contrib:/usr/gnu/bin:/local/bin:/local/gnu/bin:/gnu/bin:/sw/bin:/usr/pkg/bin
  
  # Do not assume that `type -p cmd` is portable
  # Usage: Which [-a] [-x|-f|-r] prog [$SEARCHPATH:/with/directories:/to/search]
--- 776,829 ----
  # that are used in a %p format, add them here.
  PFMT="[0-9a-zA-Z()][0-9a-zA-Z()]*"
  
+ # here is a hack that converts files with cr lf end lines to lf endlines
+ lf_endlines ()
+ {
+   if test x"${CRLF_ENDLINES}" = x; then
+     return 0
+   fi
+   crlf2lf <$1 ${TMPDIR}/lf$$
+   cp ${TMPDIR}/lf$$ $1
+   rm -f ${TMPDIR}/lf$$
+   return 0
+ }
+ # /* crlf2lf.c */
+ # #include <stdio.h>
+ # 
+ # int Usage( const char * pszPgmname )
+ # {
+ #    fprintf( stdout, "Usage: %s OUTFILE\n", pszPgmname );
+ #    fprintf( stdout,
+ #       "\n"
+ #       "Copy stdin to OUTFILE replacing crlf by lf.\n");
+ #    return 1;
+ # }
+ # 
+ # int main(int argc, const char * argv[])
+ # {
+ #    FILE *         pOutFile;
+ #    int i;
+ # 
+ #    if (argc != 2)
+ #       {
+ #       return Usage(argv[0]);
+ #       }
+ #    pOutFile = fopen( argv[1], "wb");
+ #    if (0 == pOutFile)
+ #       {
+ #       printf("Can't open %s for writing\n", argv[1]);
+ #       return Usage(argv[0]);
+ #       }
+ # 
+ #    while (EOF != (i= getc(stdin)))
+ #       putc(i, pOutFile);
+ #    return 0;
+ # 
+ #    fflush( pOutFile );
+ # }
+ 
  # Which directories should Which and find_tool search for executables?
! SEARCHPATH=$PATH${PATH_SEPARATOR}/usr/local/bin${PATH_SEPARATOR}/usr/contrib/bin${PATH_SEPARATOR}/usr/contrib${PATH_SEPARATOR}/usr/gnu/bin${PATH_SEPARATOR}/local/bin${PATH_SEPARATOR}/local/gnu/bin${PATH_SEPARATOR}/gnu/bin${PATH_SEPARATOR}/sw/bin${PATH_SEPARATOR}/usr/pkg/bin
  
  # Do not assume that `type -p cmd` is portable
  # Usage: Which [-a] [-x|-f|-r] prog [$SEARCHPATH:/with/directories:/to/search]
***************
*** 538,546 ****
      # FIXME: Someday this may need to be fixed
      # to deal better with C:\some\path\to\ssh values...
      /*) test $t $1 && echo $1 ;;
!     *) for d in `IFS=:; echo ${2-$SEARCHPATH}`
         do
!          test $t $d/$1 && { echo $d/$1; if $notevery; then break; fi; }
         done
         ;;
    esac
--- 843,851 ----
      # FIXME: Someday this may need to be fixed
      # to deal better with C:\some\path\to\ssh values...
      /*) test $t $1 && echo $1 ;;
!     *) for d in `IFS="${PATH_SEPARATOR}"; echo ${2-$SEARCHPATH}`
         do
!          test $t $d/$1$EXE_SUFFIX && { echo $d/$1$EXE_SUFFIX; if $notevery; then break; fi; }
         done
         ;;
    esac
***************
*** 605,617 ****
  if test -n "$remotehost"; then
          # We need to set $tmp on the server since $TMPDIR is compared against
  	# messages generated by the server.
! 	tmp=`$CVS_RSH $remotehost 'cd /tmp; /bin/pwd || pwd' 2>/dev/null`
  	if test $? != 0; then
  	    echo "$CVS_RSH $remotehost failed." >&2
  	    exit 1
  	fi
  else
! 	tmp=`(cd /tmp; /bin/pwd || pwd) 2>/dev/null`
  fi
  
  # Now:
--- 910,922 ----
  if test -n "$remotehost"; then
          # We need to set $tmp on the server since $TMPDIR is compared against
  	# messages generated by the server.
! 	tmp=`$CVS_RSH $remotehost 'cd /tmp; /bin/pwd || pwd' 2>$DEVNULL`
  	if test $? != 0; then
  	    echo "$CVS_RSH $remotehost failed." >&2
  	    exit 1
  	fi
  else
! 	tmp=`(cd /tmp; /bin/pwd || pwd) 2>$DEVNULL`
  fi
  
  # Now:
***************
*** 620,631 ****
  #	3) Create $TESTDIR
  #	4) Normalize TESTDIR with `cd && (/bin/pwd || pwd)`
  #	   (This will match CVS output later)
! : ${TESTDIR=$tmp/cvs-sanity}
  # clean any old remnants (we need the chmod because some tests make
  # directories read-only)
! if test -d $TESTDIR; then
!     chmod -R a+wx $TESTDIR
!     rm -rf $TESTDIR
  fi
  # These exits are important.  The first time I tried this, if the `mkdir && cd`
  # failed then the build directory would get blown away.  Some people probably
--- 925,936 ----
  #	3) Create $TESTDIR
  #	4) Normalize TESTDIR with `cd && (/bin/pwd || pwd)`
  #	   (This will match CVS output later)
! : ${TESTDIR:=$tmp/cvs-sanity}
  # clean any old remnants (we need the chmod because some tests make
  # directories read-only)
! if test -d ${TESTDIR}; then
!     chmod -R a+wx ${TESTDIR}
!     rm -rf ${TESTDIR}
  fi
  # These exits are important.  The first time I tried this, if the `mkdir && cd`
  # failed then the build directory would get blown away.  Some people probably
***************
*** 638,647 ****
      # is important at least when testing using -h $remotehost, because the same
      # value for $TESTDIR must resolve to the same directory on the client and
      # the server and we likely used Samba, and possibly symlinks, to do this.
!     TESTDIR=`(/bin/pwd || pwd) 2>/dev/null`
  fi
  
! if test -z "$TESTDIR" || echo "$TESTDIR" |grep '^[^/]'; then
      echo "Unable to resolve TESTDIR to an absolute directory." >&2
      exit 1
  fi
--- 943,952 ----
      # is important at least when testing using -h $remotehost, because the same
      # value for $TESTDIR must resolve to the same directory on the client and
      # the server and we likely used Samba, and possibly symlinks, to do this.
!     TESTDIR=`(/bin/pwd || pwd) 2>$DEVNULL`
  fi
  
! if test -z "$TESTDIR" || echo "$TESTDIR" |grep '^([^/].:)'; then
      echo "Unable to resolve TESTDIR to an absolute directory." >&2
      exit 1
  fi
***************
*** 743,749 ****
  {
    vercmd=$1
    verbad=:
!   if RES=`$vercmd --version </dev/null 2>&1`; then
      if test "X$RES" != "X--version" && test "X$RES" != "X" ; then
        echo "$RES"
        verbad=false
--- 1048,1054 ----
  {
    vercmd=$1
    verbad=:
!   if RES=`$vercmd --version <$DEVNULL 2>&1`; then
      if test "X$RES" != "X--version" && test "X$RES" != "X" ; then
        echo "$RES"
        verbad=false
***************
*** 809,815 ****
  id_tool_test ()
  {
    id=$1
!   if $id -u >/dev/null 2>&1 && $id -un >/dev/null 2>&1; then
      return 0
    else
      echo "Running these tests requires an \`id' program that understands the"
--- 1114,1120 ----
  id_tool_test ()
  {
    id=$1
!   if $id -u >$DEVNULL 2>&1 && $id -un >$DEVNULL 2>&1; then
      return 0
    else
      echo "Running these tests requires an \`id' program that understands the"
***************
*** 819,841 ****
    fi
  }
  
! ID=`find_tool id version_test id_tool_test`
! echo "Using ID=$ID" >>$LOGFILE
! 
! # You can't run CVS as root; print a nice error message here instead
! # of somewhere later, after making a mess.
! for pass in false :; do
!   case "`$ID -u 2>/dev/null`" in
!     "0")
!       echo "Test suite does not work correctly when run as root" >&2
!       exit 1
!       ;;
  
!     *)
!       break
!       ;;
!   esac
! done
  
  # Cause NextStep 3.3 users to lose in a more graceful fashion.
  expr_tooltest1 ()
--- 1124,1148 ----
    fi
  }
  
! if test x"${SINGLE_USER}" = x; then
!   ID=`find_tool id version_test id_tool_test`
!   echo "Using ID=$ID" >>$LOGFILE
! 
!   # You can't run CVS as root; print a nice error message here instead
!   # of somewhere later, after making a mess.
!   for pass in false :; do
!     case "`$ID -u 2>$DEVNULL`" in
!       "0")
!         echo "Test suite does not work correctly when run as root" >&2
!         exit 1
!         ;;
  
!       *)
!         break
!         ;;
!     esac
!   done
! fi
  
  # Cause NextStep 3.3 users to lose in a more graceful fashion.
  expr_tooltest1 ()
***************
*** 843,849 ****
  expr=$1
  if $expr 'abc
  def' : 'abc
! def' >/dev/null; then
    # good, it works
    return 0
  else
--- 1150,1156 ----
  expr=$1
  if $expr 'abc
  def' : 'abc
! def' >$DEVNULL; then
    # good, it works
    return 0
  else
***************
*** 861,867 ****
  expr=$1
  if $expr 'a
  b' : 'a
! c' >/dev/null; then
    echo 'Warning: you are using a version of expr that does not correctly'
    echo 'match multi-line patterns.  Some tests may spuriously pass or fail.'
    echo 'You may wish to make sure GNU expr is in your path.'
--- 1168,1174 ----
  expr=$1
  if $expr 'a
  b' : 'a
! c' >$DEVNULL; then
    echo 'Warning: you are using a version of expr that does not correctly'
    echo 'match multi-line patterns.  Some tests may spuriously pass or fail.'
    echo 'You may wish to make sure GNU expr is in your path.'
***************
*** 885,891 ****
  expr=$1
  # More SunOS lossage...
  test ! -f ${TESTDIR}/bar && expr_create_bar
! if $expr "`cat ${TESTDIR}/bar`" : "`cat ${TESTDIR}/bar`" >/dev/null; then
    : good, it works
  else
    echo 'Warning: you are using a version of expr that does not correctly'
--- 1192,1198 ----
  expr=$1
  # More SunOS lossage...
  test ! -f ${TESTDIR}/bar && expr_create_bar
! if $expr "`cat ${TESTDIR}/bar`" : "`cat ${TESTDIR}/bar`" >$DEVNULL; then
    : good, it works
  else
    echo 'Warning: you are using a version of expr that does not correctly'
***************
*** 893,899 ****
    echo 'You may wish to make sure GNU expr is in your path.'
    return 1
  fi
! if $expr "`cat ${TESTDIR}/bar`x" : "`cat ${TESTDIR}/bar`y" >/dev/null; then
    echo 'Warning: you are using a version of expr that does not correctly'
    echo 'match large patterns.  Some tests may spuriously pass or fail.'
    echo 'You may wish to make sure GNU expr is in your path.'
--- 1200,1206 ----
    echo 'You may wish to make sure GNU expr is in your path.'
    return 1
  fi
! if $expr "`cat ${TESTDIR}/bar`x" : "`cat ${TESTDIR}/bar`y" >$DEVNULL; then
    echo 'Warning: you are using a version of expr that does not correctly'
    echo 'match large patterns.  Some tests may spuriously pass or fail.'
    echo 'You may wish to make sure GNU expr is in your path.'
***************
*** 911,925 ****
  ENDANCHOR="$"
  expr_set_ENDANCHOR ()
  {
! expr=$1
! ENDANCHOR="$"
! if $expr 'abc
! def' : 'abc$' >/dev/null; then
!   ENDANCHOR='\'\'
!    echo "Notice: An ENDANCHOR of dollar does not work."
!    echo "Using a workaround for GNU expr versions 1.9.4 thru 1.12"
  fi
- return 0
  }
  
  # Work around another GNU expr (version 1.10-1.12) bug/incompatibility.
--- 1218,1235 ----
  ENDANCHOR="$"
  expr_set_ENDANCHOR ()
  {
! # This test is suppressed for EMX -- 5/1/2006, 23:29
! if test "x${SUPPRESS_EXPR_ANCHOR_TEST}" = "x"; then
!   expr=$1
!   ENDANCHOR="$"
!   if $expr 'abc
!   def' : 'abc$' >$DEVNULL; then
!     ENDANCHOR='\'\'
!      echo "Notice: An ENDANCHOR of dollar does not work."
!      echo "Using a workaround for GNU expr versions 1.9.4 thru 1.12"
!   fi
!   return 0
  fi
  }
  
  # Work around another GNU expr (version 1.10-1.12) bug/incompatibility.
***************
*** 936,942 ****
  expr=$1
  DOTSTAR='.*'
  if $expr 'abc
! def' : "a${DOTSTAR}f" >/dev/null; then
    : good, it works
  else
    DOTSTAR='\(.\|
--- 1246,1252 ----
  expr=$1
  DOTSTAR='.*'
  if $expr 'abc
! def' : "a${DOTSTAR}f" >$DEVNULL; then
    : good, it works
  else
    DOTSTAR='\(.\|
***************
*** 953,959 ****
  {
  expr=$1
  test ! -f ${TESTDIR}/bar && expr_create_bar
! if $expr "`cat ${TESTDIR}/bar`" : "${DOTSTAR}xyzABC${DOTSTAR}$" >/dev/null; then
    # good, it works
    return 0
  else
--- 1263,1269 ----
  {
  expr=$1
  test ! -f ${TESTDIR}/bar && expr_create_bar
! if $expr "`cat ${TESTDIR}/bar`" : "${DOTSTAR}xyzABC${DOTSTAR}$" >$DEVNULL; then
    # good, it works
    return 0
  else
***************
*** 969,976 ****
  expr_set_ENDANCHOR expr_set_DOTSTAR expr_tooltest_DOTSTAR`
  
  # Set the ENDANCHOR and DOTSTAR for the chosen expr version.
! expr_set_ENDANCHOR ${EXPR} >/dev/null
! expr_tooltest_DOTSTAR ${EXPR} >/dev/null
  
  echo "Using EXPR=$EXPR" >>$LOGFILE
  echo "Using ENDANCHOR=$ENDANCHOR" >>$LOGFILE
--- 1279,1286 ----
  expr_set_ENDANCHOR expr_set_DOTSTAR expr_tooltest_DOTSTAR`
  
  # Set the ENDANCHOR and DOTSTAR for the chosen expr version.
! expr_set_ENDANCHOR ${EXPR} >$DEVNULL
! expr_tooltest_DOTSTAR ${EXPR} >$DEVNULL
  
  echo "Using EXPR=$EXPR" >>$LOGFILE
  echo "Using ENDANCHOR=$ENDANCHOR" >>$LOGFILE
***************
*** 987,993 ****
  # next release of GNU expr after 1.12 (but we still have to cater to the old
  # ones for some time because they are in many linux distributions).
  PLUS='+'
! if $EXPR 'a +b' : "a ${PLUS}b" >/dev/null; then
    : good, it works
  else
    PLUS='\+'
--- 1297,1303 ----
  # next release of GNU expr after 1.12 (but we still have to cater to the old
  # ones for some time because they are in many linux distributions).
  PLUS='+'
! if $EXPR 'a +b' : "a ${PLUS}b" >$DEVNULL; then
    : good, it works
  else
    PLUS='\+'
***************
*** 995,1001 ****
  
  # Likewise, for ?
  QUESTION='?'
! if $EXPR 'a?b' : "a${QUESTION}b" >/dev/null; then
    : good, it works
  else
    QUESTION='\?'
--- 1305,1311 ----
  
  # Likewise, for ?
  QUESTION='?'
! if $EXPR 'a?b' : "a${QUESTION}b" >$DEVNULL; then
    : good, it works
  else
    QUESTION='\?'
***************
*** 1003,1009 ****
  
  # Now test the username to make sure it contains only valid characters
  username=`$ID -un`
! if $EXPR "${username}" : "${username}" >/dev/null; then
    : good, it works
  else
    echo "Test suite does not work correctly when run by a username" >&2
--- 1313,1319 ----
  
  # Now test the username to make sure it contains only valid characters
  username=`$ID -un`
! if $EXPR "${username}" : "${username}" >$DEVNULL; then
    : good, it works
  else
    echo "Test suite does not work correctly when run by a username" >&2
***************
*** 1034,1040 ****
  tr_tooltest1 ()
  {
  tr=$1
! if $EXPR `echo "123" | $tr '2' '\0'` : "123" >/dev/null 2>&1; then
    echo 'Warning: you are using a version of tr which does not correctly'
    echo 'handle NUL bytes.  Some tests may spuriously pass or fail.'
    echo 'You may wish to make sure GNU tr is in your path.'
--- 1344,1350 ----
  tr_tooltest1 ()
  {
  tr=$1
! if $EXPR `echo "123" | $tr '2' '\0'` : "123" >$DEVNULL 2>&1; then
    echo 'Warning: you are using a version of tr which does not correctly'
    echo 'handle NUL bytes.  Some tests may spuriously pass or fail.'
    echo 'You may wish to make sure GNU tr is in your path.'
***************
*** 1058,1064 ****
      chmod -R a+wx $TESTDIR/ls-test
      rm -rf $TESTDIR/ls-test
  fi
! if $ls $TESTDIR/ls-test >/dev/null 2>&1; then
    echo "Notice: \`$ls' is defective."
    echo 'This is a version of ls which does not correctly'
    echo 'return false for files that do not exist. Some tests may'
--- 1368,1374 ----
      chmod -R a+wx $TESTDIR/ls-test
      rm -rf $TESTDIR/ls-test
  fi
! if $ls $TESTDIR/ls-test >$DEVNULL 2>&1; then
    echo "Notice: \`$ls' is defective."
    echo 'This is a version of ls which does not correctly'
    echo 'return false for files that do not exist. Some tests may'
***************
*** 1077,1083 ****
  awk_tooltest1 ()
  {
  awk=$1
! $awk 'BEGIN {printf("one\ntwo\nthree\nfour\nfive\nsix")}' </dev/null >abc
  if $EXPR "`cat abc`" : \
  'one
  two
--- 1387,1393 ----
  awk_tooltest1 ()
  {
  awk=$1
! $awk 'BEGIN {printf("one\ntwo\nthree\nfour\nfive\nsix")}' <$DEVNULL >abc
  if $EXPR "`cat abc`" : \
  'one
  two
***************
*** 1098,1104 ****
  awk_tooltest2 ()
  {
  awk=$1
! $awk 'BEGIN { printf "%c%c%c", 2, 3, 4 }' </dev/null \
    | ${TR} '\002\003\004' '123' >abc
  if $EXPR "`cat abc`" : "123" ; then
    : good, found it
--- 1408,1414 ----
  awk_tooltest2 ()
  {
  awk=$1
! $awk 'BEGIN { printf "%c%c%c", 2, 3, 4 }' <$DEVNULL \
    | ${TR} '\002\003\004' '123' >abc
  if $EXPR "`cat abc`" : "123" ; then
    : good, found it
***************
*** 1114,1120 ****
  AWK=`find_tool gawk:nawk:awk version_test awk_tooltest1 awk_tooltest2`
  echo "Using AWK=$AWK" >>$LOGFILE
  
- 
  ###
  ### Functions used by tests.
  ###
--- 1424,1429 ----
***************
*** 1159,1176 ****
    
      if test -f "$rsync" && test -r "$rsync" \
        && $rsync -rglop --delete $TESTDIR/rsync-test/ $TESTDIR/rsync-test-copy \
!   	      >/dev/null 2>&1 \
        && $rsync -rglop --delete --include Attic --exclude '*/' \
    	      $TESTDIR/rsync-test/ $TESTDIR/rsync-test-copy2 \
!   	      >/dev/null 2>&1 \
        && test -f $TESTDIR/rsync-test/5 \
        && mv $TESTDIR/rsync-test/5 $TESTDIR/rsync-test/Attic/5 \
        && test -f $TESTDIR/rsync-test-copy/Attic/6 \
        && $rsync -rglop --delete $TESTDIR/rsync-test/ $TESTDIR/rsync-test-copy \
!   	      >/dev/null 2>&1 \
        && $rsync -rglop --delete --include Attic --exclude '*/' \
    	      $TESTDIR/rsync-test/ $TESTDIR/rsync-test-copy2 \
!   	      >/dev/null 2>&1 \
        && test ! -f $TESTDIR/rsync-test-copy/5 \
        && test ! -f $TESTDIR/rsync-test-copy2/5 \
        && test -f $TESTDIR/rsync-test-copy2/Attic/5 \
--- 1468,1485 ----
    
      if test -f "$rsync" && test -r "$rsync" \
        && $rsync -rglop --delete $TESTDIR/rsync-test/ $TESTDIR/rsync-test-copy \
!   	      >$DEVNULL 2>&1 \
        && $rsync -rglop --delete --include Attic --exclude '*/' \
    	      $TESTDIR/rsync-test/ $TESTDIR/rsync-test-copy2 \
!   	      >$DEVNULL 2>&1 \
        && test -f $TESTDIR/rsync-test/5 \
        && mv $TESTDIR/rsync-test/5 $TESTDIR/rsync-test/Attic/5 \
        && test -f $TESTDIR/rsync-test-copy/Attic/6 \
        && $rsync -rglop --delete $TESTDIR/rsync-test/ $TESTDIR/rsync-test-copy \
!   	      >$DEVNULL 2>&1 \
        && $rsync -rglop --delete --include Attic --exclude '*/' \
    	      $TESTDIR/rsync-test/ $TESTDIR/rsync-test-copy2 \
!   	      >$DEVNULL 2>&1 \
        && test ! -f $TESTDIR/rsync-test-copy/5 \
        && test ! -f $TESTDIR/rsync-test-copy2/5 \
        && test -f $TESTDIR/rsync-test-copy2/Attic/5 \
***************
*** 1310,1326 ****
  {
    # Test our temp directory for cvs-serv* directories and cvsXXXXXX temp
    # files.  We would like to not leave any behind.
!   if $remote && $LS $TMPDIR/cvs-serv* >/dev/null 2>&1; then
      # A true value means ls found files/directories with these names.
      # Give the server some time to finish, then retry.
      sleep 1
!     if $LS $TMPDIR/cvs-serv* >/dev/null 2>&1; then
        warn "$1" "Found cvs-serv* directories in $TMPDIR."
        # The above will exit if $skipfail
        rm -rf $TMPDIR/cvs-serv*
      fi
    fi
!   if $LS $TMPDIR/cvs?????? >/dev/null 2>&1; then
      # A true value means ls found files/directories with these names.
      warn "$1" "Found cvsXXXXXX temp files in $TMPDIR."
      # The above will exit if $skipfail
--- 1619,1635 ----
  {
    # Test our temp directory for cvs-serv* directories and cvsXXXXXX temp
    # files.  We would like to not leave any behind.
!   if $remote && $LS $TMPDIR/cvs-serv* >$DEVNULL 2>&1; then
      # A true value means ls found files/directories with these names.
      # Give the server some time to finish, then retry.
      sleep 1
!     if $LS $TMPDIR/cvs-serv* >$DEVNULL 2>&1; then
        warn "$1" "Found cvs-serv* directories in $TMPDIR."
        # The above will exit if $skipfail
        rm -rf $TMPDIR/cvs-serv*
      fi
    fi
!   if $LS $TMPDIR/cvs?????? >$DEVNULL 2>&1; then
      # A true value means ls found files/directories with these names.
      warn "$1" "Found cvsXXXXXX temp files in $TMPDIR."
      # The above will exit if $skipfail
***************
*** 1332,1338 ****
  # of the implementation common to the two).
  dotest_internal ()
  {
!   if $EXPR "`cat ${TESTDIR}/dotest.tmp`" : "$3${ENDANCHOR}" >/dev/null; then
      # Why, I hear you ask, do we write this to the logfile
      # even when the test passes?  The reason is that the test
      # may give us the regexp which we were supposed to match,
--- 1641,1647 ----
  # of the implementation common to the two).
  dotest_internal ()
  {
!   if $EXPR "`cat ${TESTDIR}/dotest.tmp`" : "$3${ENDANCHOR}" >$DEVNULL; then
      # Why, I hear you ask, do we write this to the logfile
      # even when the test passes?  The reason is that the test
      # may give us the regexp which we were supposed to match,
***************
*** 1352,1358 ****
      pass "$1"
      verify_tmp_empty "$1"
    elif test x"$4" != x; then
!     if $EXPR "`cat ${TESTDIR}/dotest.tmp`" : "$4${ENDANCHOR}" >/dev/null; then
        cat ${TESTDIR}/dotest.tmp >>${LOGFILE}
        pass "$1"
        verify_tmp_empty "$1"
--- 1661,1667 ----
      pass "$1"
      verify_tmp_empty "$1"
    elif test x"$4" != x; then
!     if $EXPR "`cat ${TESTDIR}/dotest.tmp`" : "$4${ENDANCHOR}" >$DEVNULL; then
        cat ${TESTDIR}/dotest.tmp >>${LOGFILE}
        pass "$1"
        verify_tmp_empty "$1"
***************
*** 1380,1386 ****
  dotest_all_in_one ()
  {
    if $EXPR "`cat ${TESTDIR}/dotest.tmp`" : \
!          "`cat ${TESTDIR}/dotest.exp`" >/dev/null; then
      return 0
    fi
    return 1
--- 1689,1695 ----
  dotest_all_in_one ()
  {
    if $EXPR "`cat ${TESTDIR}/dotest.tmp`" : \
!          "`cat ${TESTDIR}/dotest.exp`" >$DEVNULL; then
      return 0
    fi
    return 1
***************
*** 1393,1399 ****
    line=1
    while [ $line -le `wc -l <${TESTDIR}/dotest.tmp` ] ; do
      if $EXPR "`sed -n ${line}p ${TESTDIR}/dotest.tmp`" : \
!        "`sed -n ${line}p ${TESTDIR}/dotest.exp`" >/dev/null; then
        :
      elif test -z "`sed -n ${line}p ${TESTDIR}/dotest.tmp`" &&
         test -z "`sed -n ${line}p ${TESTDIR}/dotest.exp`"; then
--- 1702,1708 ----
    line=1
    while [ $line -le `wc -l <${TESTDIR}/dotest.tmp` ] ; do
      if $EXPR "`sed -n ${line}p ${TESTDIR}/dotest.tmp`" : \
!        "`sed -n ${line}p ${TESTDIR}/dotest.exp`" >$DEVNULL; then
        :
      elif test -z "`sed -n ${line}p ${TESTDIR}/dotest.tmp`" &&
         test -z "`sed -n ${line}p ${TESTDIR}/dotest.exp`"; then
***************
*** 1513,1518 ****
--- 1822,1828 ----
      fail "$1"
    fi
    dotest_internal "$@"
+   sleep ${FILESYSTEM_TICK}
  }
  
  # Like dotest except only 2 args and result must exactly match stdin
***************
*** 1528,1534 ****
      fail "$1"
    fi
    cat >$TESTDIR/dotest.exp
!   if cmp $TESTDIR/dotest.exp $TESTDIR/dotest.tmp >/dev/null 2>&1; then
      pass "$1"
      verify_tmp_empty "$1"
    else
--- 1838,1844 ----
      fail "$1"
    fi
    cat >$TESTDIR/dotest.exp
!   if cmp $TESTDIR/dotest.exp $TESTDIR/dotest.tmp >$DEVNULL 2>&1; then
      pass "$1"
      verify_tmp_empty "$1"
    else
***************
*** 1600,1605 ****
--- 1910,2027 ----
      done
  }
  
+ # This will show up in cvs history output where it prints the working
+ # directory.  It should *not* appear in any cvs output referring to the
+ # repository; cvs should use the name of the repository as specified.
+ #
+ # Note that using pwd here rather than /bin/pwd will make it even less
+ # likely that we test whether CVS is distinguishing between TMPPWD
+ # and TESTDIR.  However, there is no guarantee that will test it anyway.
+ # If we really care, we should do something along the lines of:
+ #   cd ${TMPDIR}/cvs-sanity  # In reality, overridable with environment variable?
+ #   mkdir realdir
+ #   ln -s realdir testdir
+ #   TESTDIR=${TMPDIR}/cvs-sanity/testdir
+ #   TMPPWD=${TMPDIR}/cvs-sanity/realdir
+ 
+ # allow override of TMPPWD from outside sanity.sh
+ 
+ if test x"${TMPPWD}" = x; then
+   if test x"${SLASH}" = x"/"; then
+     TMPPWD=`pwd`
+     # Fix for OS/2
+     if test x"${TMPPWD_FIXUP}" != x; then
+       TMPPWD="[A-Za-z:]*${SLASH}*${TMPPWD}"
+     fi
+   else
+     if test x"${TESTDIR}" = x"${TMPDIR}/cvs-sanity"; then
+ 
+       # but here's a hack that makes basic2-64 happier with winnt, MS Visual C++ 4.0
+       # and cygwin32 beta19 bash by accepting optional drive letter and slosh
+       # instead of slash
+       TMPPWD=[A-Za-z:]*${SLASH}tmp${SLASH}cvs-sanity
+ 
+     else
+       echo '${SLASH} != / and ${TESTDIR} != ${TMPDIR}/cvs-sanity. TMPPWD will be wrongly set'
+     fi
+   fi
+ fi
+ 
+ 
+ # In various places, CVS waits a tick of the filesystem clock to make
+ # sure that files have different timestamps. This was coded as sleep (1).
+ # For some filesystems (eg FAT, FAT32) 2 seconds are needed.
+ # In my local cvs, I've defined FILESYSTEM_TICK in windows-NT/options.h,
+ # and in src/cvs.h a default of 1 second is defined.
+ #
+ # I found some timing problems using sanity.sh Windows-95 on Pentium 90
+ # with MKS Toolkit and FAT. These are worse on Pentium-II 333.
+ # On the other hand, I didn't see these problems withPentium 133 NT and
+ # cygwin32 on a netware 4.10 server for which the script below reports
+ # 2 seconds per filesystem tick.
+ # Nor did I see these problems with OS/2 HPFS using EMX port.
+ #
+ # Perhaps part of the problem is not 
+ #
+ # I suspect that CVS doesn't sleep in enough places for this to work 
+ # properly.
+ #
+ # multibranch2 often fails, as does the second ci here :
+ #   cvs add file1
+ #   cvs ci
+ #   echo foo >file1
+ #   cvs ci
+ #
+ # Windows_95 on Pentium 90 using FAT I found that I had about 18 mostly
+ # consistent failures where sanity.sh expected a file just modified
+ # in the sandbox to be checked in and cvs didn't do that.
+ # When I ran on Pentium-II 333 (FAT32) I got about 30.
+ # Eventually, I tried putting sleep before the echo command modifying
+ # the file - problem gone.
+ # I'm told FAT doesn't keep the low order bit of time in seconds.
+ #
+ # The code below works out the number of seconds (>=0) to wait between
+ # creating files to be sure that they have different timestamps.
+ # I've put sleeps where they seem to be needed (before
+ # echo cat or cp before ci modified, 
+ # before update -r,
+ # before tag -b branch)
+ #
+ # Having different timestamps on fileX and in CVS/Entries for fileX is
+ # how cvs decides file is modified since checkout. Detection would be
+ # more robust if bytesize was also compared. 
+ # Would changing the Entries file be a bad thing?
+ #
+ # Murray Bishop, 1 July 98
+ 
+ if test "x${FILESYSTEM_TICK}" = "x"; then
+   seconds=0
+   while test "x${FILESYSTEM_TICK}" = "x"; do
+     echo tock >tick1
+     sleep ${seconds}
+     echo tock >tick2
+     sleep ${seconds}
+     echo tock >tick3
+     sleep ${seconds}
+     echo tock >tick4
+     sleep ${seconds}
+     echo tock >tick5
+     if test  tick1 -ot tick2 \
+ 	-a tick2 -ot tick3 \
+ 	-a tick3 -ot tick4 \
+ 	-a tick4 -ot tick5; then
+       FILESYSTEM_TICK=${seconds}
+     fi
+     seconds=`expr ${seconds} + 1`
+   done
+   rm tick1 tick2 tick3 tick4 tick5
+ fi
+ if test "x${FILESYSTEM_TICK}" != "x0"; then
+   : When we depart from distribution behavior - say so.
+   echo "Waiting ${FILESYSTEM_TICK} seconds between creating files gives different modified times."
+ fi
+ 
+ 
  # Avoid picking up any stray .cvsrc, etc., from the user running the tests
  mkdir home
  HOME=$TESTDIR/home; export HOME
***************
*** 1609,1614 ****
--- 2031,2037 ----
  # RCSINIT=-zLT get lots of spurious failures.
  RCSINIT=; export RCSINIT
  
+ 
  # Remaining arguments are the names of tests to run.
  #
  # The testsuite is broken up into (hopefully manageably-sized)
***************
*** 1663,1669 ****
  	tests="${tests} sshstdio"
  	# More history browsing, &c.
  	tests="${tests} history"
! 	tests="${tests} big modes modes2 modes3 stamps"
  	# PreservePermissions stuff: permissions, symlinks et al.
  	# tests="${tests} perms symlinks symlinks2 hardlinks"
  	# More tag and branch tests, keywords.
--- 2086,2098 ----
  	tests="${tests} sshstdio"
  	# More history browsing, &c.
  	tests="${tests} history"
! 	tests="${tests} big"
! 	if test x"${BROKEN_LS_L}" = x; then
! 	  tests="${tests} modes modes2 modes3"
! 	else
! 	  echo "Won't run modes modes2 modes3 tests - BROKEN_LS_L"
! 	fi
! 	test="${tests} stamps"
  	# PreservePermissions stuff: permissions, symlinks et al.
  	# tests="${tests} perms symlinks symlinks2 hardlinks"
  	# More tag and branch tests, keywords.
***************
*** 1721,1734 ****
  	DIR_2=$2
  
  	cd $DIR_1
! 	find . -print | fgrep -v /CVS | sort > $TESTDIR/dc$$d1
  
  	# go back where we were to avoid symlink hell...
  	cd $OLDPWD
  	cd $DIR_2
! 	find . -print | fgrep -v /CVS | sort > $TESTDIR/dc$$d2
  
! 	if diff $TESTDIR/dc$$d1 $TESTDIR/dc$$d2 >/dev/null 2>&1
  	then
  		:
  	else
--- 2150,2164 ----
  	DIR_2=$2
  
  	cd $DIR_1
! 	# EMX gnu find 4.1 emits CVS rather than ./CVS
! 	find . -print | fgrep -v CVS | sort > $TESTDIR/dc$$d1
  
  	# go back where we were to avoid symlink hell...
  	cd $OLDPWD
  	cd $DIR_2
! 	find . -print | fgrep -v CVS | sort > $TESTDIR/dc$$d2
  
! 	if diff $TESTDIR/dc$$d1 $TESTDIR/dc$$d2 >$DEVNULL 2>&1
  	then
  		:
  	else
***************
*** 1749,1755 ****
  }
  
  
- 
  #
  # The following 4 functions are used by the diffmerge1 test case.  They set up,
  # respectively, the four versions of the files necessary:
--- 2179,2184 ----
***************
*** 2563,2569 ****
        echo :fork$rootoptions:$1
      fi
    else
!     echo $1
    fi
  }
  
--- 2992,2998 ----
        echo :fork$rootoptions:$1
      fi
    else
!     echo ${LOCAL_ROOT_PREFIX}$1
    fi
  }
  
***************
*** 3004,3013 ****
  	  # The .* here will normally be "No such file or directory",
  	  # but if memory serves some systems (AIX?) have a different message.
  :	  dotest_fail basica-9 \
! 	    "${testcvs} -q -d ${TESTDIR}/nonexist update" \
  "${SPROG}: cannot access cvs root ${TESTDIR}/nonexist: .*"
  	  dotest_fail basica-9a \
! 	    "${testcvs} -q -d ${TESTDIR}/nonexist update" \
  "${CPROG} \[update aborted\]: ${TESTDIR}/nonexist/CVSROOT: .*"
  
  	  dotest basica-10 "${testcvs} annotate" \
--- 3433,3442 ----
  	  # The .* here will normally be "No such file or directory",
  	  # but if memory serves some systems (AIX?) have a different message.
  :	  dotest_fail basica-9 \
! 	    "${testcvs} -q -d ${LOCAL_ROOT_PREFIX}${TESTDIR}/nonexist update" \
  "${SPROG}: cannot access cvs root ${TESTDIR}/nonexist: .*"
  	  dotest_fail basica-9a \
! 	    "${testcvs} -q -d ${LOCAL_ROOT_PREFIX}${TESTDIR}/nonexist update" \
  "${CPROG} \[update aborted\]: ${TESTDIR}/nonexist/CVSROOT: .*"
  
  	  dotest basica-10 "${testcvs} annotate" \
***************
*** 4531,4537 ****
  U first-dir/dir1/dir2/file7"
  
  		# directory copies are done in an oblique way in order to avoid a bug in sun's tmp filesystem.
! 		mkdir first-dir.cpy ; (cd first-dir ; tar cf - . | (cd ../first-dir.cpy ; tar xf -))
  
  		dotest basic2-30 "directory_cmp first-dir export-dir"
  
--- 4960,4977 ----
  U first-dir/dir1/dir2/file7"
  
  		# directory copies are done in an oblique way in order to avoid a bug in sun's tmp filesystem.
! 		if test "x${OS_COMPILER_EMU}" = "xwin95_msvc_mks"; then
! 		  # MKS Toolkit on win95 sometimes chokes on the usual way
! 		  mkdir first-dir.cpy
! 		  cd first-dir
! 		  tar cf ${TESTDIR}/ball.tar .
! 		  cd ../first-dir.cpy
! 		  tar xf ${TESTDIR}/ball.tar
! 		  rm ${TESTDIR}/ball.tar
! 		  cd ..
! 		else
! 		 mkdir first-dir.cpy ; (cd first-dir ; tar cf - . | (cd ../first-dir.cpy ; tar xf -))
! 		fi
  
  		dotest basic2-30 "directory_cmp first-dir export-dir"
  
***************
*** 4576,4582 ****
  
  		rm -r export-dir first-dir
  		mkdir first-dir
! 		(cd first-dir.cpy ; tar cf - . | (cd ../first-dir ; tar xf -))
  
  		# update the top, cancelling sticky tags, retag, update other copy, compare.
  		cd first-dir
--- 5016,5032 ----
  
  		rm -r export-dir first-dir
  		mkdir first-dir
! 		if test "x${OS_COMPILER_EMU}" = "xwin95_msvc_mks"; then
! 		  # MKS Toolkit on win95 sometimes chokes on the usual way
! 		  cd first-dir.cpy
! 		  tar cf ${TESTDIR}/ball.tar .
! 		  cd ../first-dir
! 		  tar xf ${TESTDIR}/ball.tar
! 		  rm ${TESTDIR}/ball.tar
! 		  cd ..
! 		else
! 		  (cd first-dir.cpy ; tar cf - . | (cd ../first-dir ; tar xf -))
! 		fi
  
  		# update the top, cancelling sticky tags, retag, update other copy, compare.
  		cd first-dir
***************
*** 4960,4987 ****
  	    # without client support.
  
  	    # logout does not try to contact the server.
! 	    CVSROOT=":pserver;proxy=localhost;proxyport=8080:localhost/dev/null"
  	    dotest parseroot-3r "$testcvs -d'$CVSROOT' logout" \
! "Logging out of :pserver:$username@localhost:2401/dev/null
  $CPROG logout: warning: failed to open $HOME/\.cvspass for reading: No such file or directory
  $CPROG logout: Entry not found."
! 	    CVSROOT=":pserver;proxyport=8080:localhost/dev/null"
  	    dotest_fail parseroot-4r "$testcvs -d'$CVSROOT' logout" \
  "$CPROG logout: Proxy port specified in CVSROOT without proxy host\.
! $CPROG \[logout aborted\]: Bad CVSROOT: \`:pserver;proxyport=8080:localhost/dev/null'\."
! 	    CVSROOT=":pserver;optionnoarg:localhost/dev/null"
  	    dotest_fail parseroot-5r "$testcvs -d'$CVSROOT' logout" \
  "$CPROG logout: Option (\`optionnoarg') has no argument in CVSROOT\.
! $CPROG \[logout aborted\]: Bad CVSROOT: \`:pserver;optionnoarg:localhost/dev/null'\."
! 	    CVSROOT=":pserver;notanoption=anything:localhost/dev/null"
  	    dotest_fail parseroot-6r "$testcvs -d'$CVSROOT' logout" \
  "$CPROG logout: Unknown option (\`notanoption') in CVSROOT\.
! $CPROG \[logout aborted\]: Bad CVSROOT: \`:pserver;notanoption=anything:localhost/dev/null'\."
! 	    CVSROOT=":local;proxy=localhost:/dev/null"
  	    dotest_fail parseroot-7r "$testcvs -d'$CVSROOT' logout" \
  "$CPROG logout: CVSROOT proxy specification is only valid for gserver and
  $CPROG logout: pserver connection methods\.
! $CPROG \[logout aborted\]: Bad CVSROOT: \`:local;proxy=localhost:/dev/null'\."
  	    CVSROOT="::pserver@anonymous@test.org:/cvs"
  	    dotest_fail parseroot-8r "$testcvs -d'$CVSROOT' co test" \
  "$CPROG checkout: Unknown method (\`') in CVSROOT\.
--- 5410,5437 ----
  	    # without client support.
  
  	    # logout does not try to contact the server.
! 	    CVSROOT=":pserver;proxy=localhost;proxyport=8080:localhost$DEVNULL"
  	    dotest parseroot-3r "$testcvs -d'$CVSROOT' logout" \
! "Logging out of :pserver:$username@localhost:2401$DEVNULL
  $CPROG logout: warning: failed to open $HOME/\.cvspass for reading: No such file or directory
  $CPROG logout: Entry not found."
! 	    CVSROOT=":pserver;proxyport=8080:localhost$DEVNULL"
  	    dotest_fail parseroot-4r "$testcvs -d'$CVSROOT' logout" \
  "$CPROG logout: Proxy port specified in CVSROOT without proxy host\.
! $CPROG \[logout aborted\]: Bad CVSROOT: \`:pserver;proxyport=8080:localhost$DEVNULL'\."
! 	    CVSROOT=":pserver;optionnoarg:localhost$DEVNULL"
  	    dotest_fail parseroot-5r "$testcvs -d'$CVSROOT' logout" \
  "$CPROG logout: Option (\`optionnoarg') has no argument in CVSROOT\.
! $CPROG \[logout aborted\]: Bad CVSROOT: \`:pserver;optionnoarg:localhost$DEVNULL'\."
! 	    CVSROOT=":pserver;notanoption=anything:localhost$DEVNULL"
  	    dotest_fail parseroot-6r "$testcvs -d'$CVSROOT' logout" \
  "$CPROG logout: Unknown option (\`notanoption') in CVSROOT\.
! $CPROG \[logout aborted\]: Bad CVSROOT: \`:pserver;notanoption=anything:localhost$DEVNULL'\."
! 	    CVSROOT=":local;proxy=localhost:$DEVNULL"
  	    dotest_fail parseroot-7r "$testcvs -d'$CVSROOT' logout" \
  "$CPROG logout: CVSROOT proxy specification is only valid for gserver and
  $CPROG logout: pserver connection methods\.
! $CPROG \[logout aborted\]: Bad CVSROOT: \`:local;proxy=localhost:$DEVNULL'\."
  	    CVSROOT="::pserver@anonymous@test.org:/cvs"
  	    dotest_fail parseroot-8r "$testcvs -d'$CVSROOT' co test" \
  "$CPROG checkout: Unknown method (\`') in CVSROOT\.
***************
*** 5460,5467 ****
  ! \$''Name: local-v0 \$
  ! something
  Index: trdiff/new
! diff -c /dev/null trdiff/new:1\.1
! \*\*\* /dev/null	'"${DATE}"'
  --- trdiff/new	'"${DATE}"'
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 0 \*\*\*\*
--- 5910,5917 ----
  ! \$''Name: local-v0 \$
  ! something
  Index: trdiff/new
! diff -c '"$DEVNULL"' trdiff/new:1\.1
! \*\*\* '"$DEVNULL"'	'"${DATE}"'
  --- trdiff/new	'"${DATE}"'
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 0 \*\*\*\*
***************
*** 5700,5706 ****
  "Directory ${CVSROOT_DIRNAME}/first-dir added to the repository"
            cd first-dir
  
! 	  ${AWK} 'BEGIN {printf("one\ntwo\nthree\nfour\nfive\nsix")}' </dev/null >abc
  	  dotest diffnl-002 "${testcvs} add abc" \
  "${SPROG} add: scheduling file .abc. for addition
  ${SPROG} add: use .${SPROG} commit. to add this file permanently"
--- 6150,6156 ----
  "Directory ${CVSROOT_DIRNAME}/first-dir added to the repository"
            cd first-dir
  
! 	  ${AWK} 'BEGIN {printf("one\ntwo\nthree\nfour\nfive\nsix")}' <$DEVNULL >abc
  	  dotest diffnl-002 "${testcvs} add abc" \
  "${SPROG} add: scheduling file .abc. for addition
  ${SPROG} add: use .${SPROG} commit. to add this file permanently"
***************
*** 5709,5715 ****
  initial revision: 1\.1"
  
  	  # change to line near EOF
! 	  ${AWK} 'BEGIN {printf("one\ntwo\nthree\nfour\nsix")}' </dev/null >abc
  	  dotest_fail diffnl-100 "${testcvs} diff abc" \
  "Index: abc
  ===================================================================
--- 6159,6165 ----
  initial revision: 1\.1"
  
  	  # change to line near EOF
! 	  ${AWK} 'BEGIN {printf("one\ntwo\nthree\nfour\nsix")}' <$DEVNULL >abc
  	  dotest_fail diffnl-100 "${testcvs} diff abc" \
  "Index: abc
  ===================================================================
***************
*** 5738,5744 ****
  new revision: 1\.2; previous revision: 1\.1"
  
            # Change to last line
! 	  ${AWK} 'BEGIN {printf("one\ntwo\nthree\nfour\nseven")}' </dev/null >abc
            dotest_fail diffnl-200 "${testcvs} diff abc" \
  "Index: abc
  ===================================================================
--- 6188,6194 ----
  new revision: 1\.2; previous revision: 1\.1"
  
            # Change to last line
! 	  ${AWK} 'BEGIN {printf("one\ntwo\nthree\nfour\nseven")}' <$DEVNULL >abc
            dotest_fail diffnl-200 "${testcvs} diff abc" \
  "Index: abc
  ===================================================================
***************
*** 5808,5814 ****
  new revision: 1\.4; previous revision: 1\.3"
  
  	  # Removal of newline
! 	  ${AWK} 'BEGIN {printf("one\ntwo\nthree\nfour\nseven")}' </dev/null >abc
  	  dotest_fail diffnl-400 "${testcvs} diff abc" \
  "Index: abc
  ===================================================================
--- 6258,6264 ----
  new revision: 1\.4; previous revision: 1\.3"
  
  	  # Removal of newline
! 	  ${AWK} 'BEGIN {printf("one\ntwo\nthree\nfour\nseven")}' <$DEVNULL >abc
  	  dotest_fail diffnl-400 "${testcvs} diff abc" \
  "Index: abc
  ===================================================================
***************
*** 5996,6003 ****
  		dotest death-76a0 \
  "${testcvs} -q rdiff -r bp_branch1 -r branch1 first-dir" \
  "Index: first-dir/file3
! diff -c /dev/null first-dir/file3:1\.1\.2\.1
! \*\*\* /dev/null	${DATE}
  --- first-dir/file3	${DATE}
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 0 \*\*\*\*
--- 6446,6453 ----
  		dotest death-76a0 \
  "${testcvs} -q rdiff -r bp_branch1 -r branch1 first-dir" \
  "Index: first-dir/file3
! diff -c $DEVNULL first-dir/file3:1\.1\.2\.1
! \*\*\* $DEVNULL	${DATE}
  --- first-dir/file3	${DATE}
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 0 \*\*\*\*
***************
*** 6102,6108 ****
  		fi
  
  		# Make sure that we joined the correct change to file1
! 		if echo line2 from branch1 | cmp - file1 >/dev/null; then
  		    pass 87a
  		else
  		    fail 87a
--- 6552,6558 ----
  		fi
  
  		# Make sure that we joined the correct change to file1
! 		if echo line2 from branch1 | cmp - file1 >$DEVNULL; then
  		    pass 87a
  		else
  		    fail 87a
***************
*** 6253,6259 ****
  RCS file: file1
  diff -N file1
  \*\*\* file1	${RFCDATE}	[0-9.]*
! --- /dev/null	${RFCDATE_EPOCH}
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 1 \*\*\*\*
  - first revision
--- 6703,6709 ----
  RCS file: file1
  diff -N file1
  \*\*\* file1	${RFCDATE}	[0-9.]*
! --- $DEVNULL	${RFCDATE_EPOCH}
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 1 \*\*\*\*
  - first revision
***************
*** 6281,6287 ****
  RCS file: file1
  diff -N file1
  \*\*\* file1	${RFCDATE}	[0-9.]*
! --- /dev/null	${RFCDATE_EPOCH}
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 1 \*\*\*\*
  - first revision
--- 6731,6737 ----
  RCS file: file1
  diff -N file1
  \*\*\* file1	${RFCDATE}	[0-9.]*
! --- $DEVNULL	${RFCDATE_EPOCH}
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 1 \*\*\*\*
  - first revision
***************
*** 6293,6299 ****
  ===================================================================
  RCS file: file1
  diff -N file1
! \*\*\* /dev/null	${RFCDATE_EPOCH}
  --- file1	${RFCDATE}	[0-9.]*
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 0 \*\*\*\*
--- 6743,6749 ----
  ===================================================================
  RCS file: file1
  diff -N file1
! \*\*\* $DEVNULL	${RFCDATE_EPOCH}
  --- file1	${RFCDATE}	[0-9.]*
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 0 \*\*\*\*
***************
*** 6310,6316 ****
  RCS file: file1
  diff -N file1
  \*\*\* file1	[-a-zA-Z0-9: ]*	[0-9.]*
! --- /dev/null	${RFCDATE_EPOCH}
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 1 \*\*\*\*
  - first revision
--- 6760,6766 ----
  RCS file: file1
  diff -N file1
  \*\*\* file1	[-a-zA-Z0-9: ]*	[0-9.]*
! --- $DEVNULL	${RFCDATE_EPOCH}
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 1 \*\*\*\*
  - first revision
***************
*** 6345,6351 ****
  ===================================================================
  RCS file: file1
  diff -N file1
! \*\*\* /dev/null	${RFCDATE_EPOCH}
  --- file1	${RFCDATE}
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 0 \*\*\*\*
--- 6795,6801 ----
  ===================================================================
  RCS file: file1
  diff -N file1
! \*\*\* $DEVNULL	${RFCDATE_EPOCH}
  --- file1	${RFCDATE}
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 0 \*\*\*\*
***************
*** 6420,6426 ****
  ===================================================================
  RCS file: file3
  diff -N file3
! \*\*\* /dev/null	${RFCDATE_EPOCH}
  --- file3	${RFCDATE}	[0-9.]*
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 0 \*\*\*\*
--- 6870,6876 ----
  ===================================================================
  RCS file: file3
  diff -N file3
! \*\*\* $DEVNULL	${RFCDATE_EPOCH}
  --- file3	${RFCDATE}	[0-9.]*
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 0 \*\*\*\*
***************
*** 6463,6469 ****
  ===================================================================
  RCS file: file2
  diff -N file2
! \*\*\* /dev/null	${RFCDATE_EPOCH}
  --- file2	${RFCDATE}	[0-9.]*
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 0 \*\*\*\*
--- 6913,6919 ----
  ===================================================================
  RCS file: file2
  diff -N file2
! \*\*\* $DEVNULL	${RFCDATE_EPOCH}
  --- file2	${RFCDATE}	[0-9.]*
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 0 \*\*\*\*
***************
*** 6473,6479 ****
  ===================================================================
  RCS file: file3
  diff -N file3
! \*\*\* /dev/null	${RFCDATE_EPOCH}
  --- file3	${RFCDATE}	[0-9.]*
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 0 \*\*\*\*
--- 6923,6929 ----
  ===================================================================
  RCS file: file3
  diff -N file3
! \*\*\* $DEVNULL	${RFCDATE_EPOCH}
  --- file3	${RFCDATE}	[0-9.]*
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 0 \*\*\*\*
***************
*** 6484,6490 ****
  RCS file: file4
  diff -N file4
  \*\*\* file4	${RFCDATE}	[0-9.]*
! --- /dev/null	${RFCDATE_EPOCH}
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 1 \*\*\*\*
  - file4 first revision
--- 6934,6940 ----
  RCS file: file4
  diff -N file4
  \*\*\* file4	${RFCDATE}	[0-9.]*
! --- $DEVNULL	${RFCDATE_EPOCH}
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 1 \*\*\*\*
  - file4 first revision
***************
*** 6509,6515 ****
  ===================================================================
  RCS file: file1
  diff -N file1
! \*\*\* /dev/null	${RFCDATE_EPOCH}
  --- file1	${RFCDATE}	[0-9.]*
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 0 \*\*\*\*
--- 6959,6965 ----
  ===================================================================
  RCS file: file1
  diff -N file1
! \*\*\* $DEVNULL	${RFCDATE_EPOCH}
  --- file1	${RFCDATE}	[0-9.]*
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  \*\*\* 0 \*\*\*\*
***************
*** 7073,7080 ****
  	  # The fact that it says "skipping directory " rather than
  	  # "skipping directory dir1/sdir" is some kind of bug.
  	  dotest dirs-4 "echo no | ${testcvs} release -d dir1/sdir" \
! "${SPROG} update: cannot open directory ${CVSROOT_DIRNAME}/dir1/sdir: No such file or directory
! ${SPROG} update: skipping directory 
  You have \[0\] altered files in this repository\.
  Are you sure you want to release (and delete) directory .dir1/sdir': .. .release' aborted by user choice."
  
--- 7523,7530 ----
  	  # The fact that it says "skipping directory " rather than
  	  # "skipping directory dir1/sdir" is some kind of bug.
  	  dotest dirs-4 "echo no | ${testcvs} release -d dir1/sdir" \
! ".* update: cannot open directory ${CVSROOT_DIRNAME}/dir1/sdir: No such file or directory
! .* update: skipping directory 
  You have \[0\] altered files in this repository\.
  Are you sure you want to release (and delete) directory .dir1/sdir': .. .release' aborted by user choice."
  
***************
*** 8052,8058 ****
  T file2"
  	  # Avoid timestamp granularity bugs (FIXME: CVS should be
  	  # doing the sleep, right?).
- 	  sleep 1
  	  echo myedit >>file1
  	  dotest tagc-6a "${testcvs} rm -f file2" \
  "${SPROG} remove: scheduling .file2. for removal
--- 8502,8507 ----
***************
*** 8558,8564 ****
  	  dotest rcsdiff-5 "${testcvs} update -p -r first foo.c" \
  "===================================================================
  Checking out foo\.c
! RCS:  ${CVSROOT_DIRNAME}/first-dir/foo\.c,v
  VERS: 1\.1
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  I am the first foo, and my name is \$""Name: first \$\."
--- 9007,9013 ----
  	  dotest rcsdiff-5 "${testcvs} update -p -r first foo.c" \
  "===================================================================
  Checking out foo\.c
! RCS:  ${CVSROOT_DIRNAME}${SLASH}first-dir${SLASH}foo\.c,v
  VERS: 1\.1
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  I am the first foo, and my name is \$""Name: first \$\."
***************
*** 8571,8577 ****
  	  dotest rcsdiff-8 "${testcvs} update -p -r second foo.c" \
  "===================================================================
  Checking out foo\.c
! RCS:  ${CVSROOT_DIRNAME}/first-dir/foo\.c,v
  VERS: 1\.2
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  I am the second foo, and my name is \$""Name: second \$\."
--- 9020,9026 ----
  	  dotest rcsdiff-8 "${testcvs} update -p -r second foo.c" \
  "===================================================================
  Checking out foo\.c
! RCS:  ${CVSROOT_DIRNAME}${SLASH}first-dir${SLASH}foo\.c,v
  VERS: 1\.2
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  I am the second foo, and my name is \$""Name: second \$\."
***************
*** 8618,8626 ****
  }
  EOF
  
! 	  dotest rcslib-diffrgx-1 "${testcvs} -q add -m '' rgx.c" \
  "${SPROG} add: use .${SPROG} commit. to add this file permanently"
! 	  dotest rcslib-diffrgx-2 "${testcvs} -q ci -m '' rgx.c" \
  "$CVSROOT_DIRNAME/first-dir/rgx\.c,v  <--  rgx\.c
  initial revision: 1\.1"
  	  cat >rgx.c <<EOF
--- 9067,9075 ----
  }
  EOF
  
! 	  dotest rcslib-diffrgx-1 "${testcvs} -q add -m\'\' rgx.c" \
  "${SPROG} add: use .${SPROG} commit. to add this file permanently"
! 	  dotest rcslib-diffrgx-2 "${testcvs} -q ci -m\'\' rgx.c" \
  "$CVSROOT_DIRNAME/first-dir/rgx\.c,v  <--  rgx\.c
  initial revision: 1\.1"
  	  cat >rgx.c <<EOF
***************
*** 8683,8693 ****
  	  echo '3' >> file1
  	  dotest rcslib-merge-4 "${testcvs} -q add file1" \
  "${SPROG} add: use .${SPROG} commit. to add this file permanently"
! 	  dotest rcslib-merge-5 "${testcvs} -q commit -m '' file1" \
  "$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
  initial revision: 1\.1"
  	  sed -e 's/2/two/' file1 > f; mv f file1
! 	  dotest rcslib-merge-6 "${testcvs} -q commit -m '' file1" \
  "$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
  new revision: 1\.2; previous revision: 1\.1"
  	  dotest rcslib-merge-7 "${testcvs} -q tag -b -r 1.1 patch1" "T file1"
--- 9132,9142 ----
  	  echo '3' >> file1
  	  dotest rcslib-merge-4 "${testcvs} -q add file1" \
  "${SPROG} add: use .${SPROG} commit. to add this file permanently"
! 	  dotest rcslib-merge-5 "${testcvs} -q commit -m\'\' file1" \
  "$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
  initial revision: 1\.1"
  	  sed -e 's/2/two/' file1 > f; mv f file1
! 	  dotest rcslib-merge-6 "${testcvs} -q commit -m\'\' file1" \
  "$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
  new revision: 1\.2; previous revision: 1\.1"
  	  dotest rcslib-merge-7 "${testcvs} -q tag -b -r 1.1 patch1" "T file1"
***************
*** 8707,8713 ****
  2
  3'
  	  sed -e 's/3/three/' file1 > f; mv f file1
! 	  dotest rcslib-merge-11 "${testcvs} -q commit -m '' file1" \
  "$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
  new revision: 1\.1\.2\.1; previous revision: 1\.1"
  	  dotest rcslib-merge-12 "${testcvs} -q update -kv -j1.2" \
--- 9156,9162 ----
  2
  3'
  	  sed -e 's/3/three/' file1 > f; mv f file1
! 	  dotest rcslib-merge-11 "${testcvs} -q commit -m\'\' file1" \
  "$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
  new revision: 1\.1\.2\.1; previous revision: 1\.1"
  	  dotest rcslib-merge-12 "${testcvs} -q update -kv -j1.2" \
***************
*** 8728,8733 ****
--- 9177,9183 ----
  3
  [>]>>>>>> 1\.2"
  
+ 	  if test x"${WONT_PRESERVE_PERMISSIONS}" = x; then
  	  # Test behavior of symlinks in the repository.
  	  if test -n "$remotehost"; then
  	    # Create the link on the remote system.  This is because Cygwin's
***************
*** 8904,8909 ****
--- 9354,9365 ----
  			     $CVSROOT_DIRNAME/second-dir \
  			     $CVSROOT_DIRNAME/123456789012345678901234567890
  	  rm -r first-dir second-dir 2
+ 	  else
+ 	    echo "Won't run rcslib-symlink-* tests - WONT_PRESERVE_PERMISSIONS"
+ 	    cd ..
+ 	    modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
+ 	    rm -r first-dir
+ 	  fi
  	  ;;
  
  
***************
*** 9441,9447 ****
  	  dotest_fail importc-11 \
  "${testcvs} import -m imp ${TESTDIR}/other vendor release3" \
  "${CPROG} \[import aborted\]: directory ${TESTDIR}/other not relative within the repository"
! 	  dotest_fail importc-12 "test -d ${TESTDIR}/other" ""
  
  	  dokeep
  	  TZ=$save_TZ
--- 9897,9903 ----
  	  dotest_fail importc-11 \
  "${testcvs} import -m imp ${TESTDIR}/other vendor release3" \
  "${CPROG} \[import aborted\]: directory ${TESTDIR}/other not relative within the repository"
! 	  dotest_fail importc-12 "test -d ${LOCAL_ROOT_PREFIX}${TESTDIR}/other" ""
  
  	  dokeep
  	  TZ=$save_TZ
***************
*** 9808,9814 ****
  	  cd ..
  
  	  # Sleep a second so we're sure to be after the second of the import.
- 	  sleep 1
  
  	  dotest import-after-initial-6 \
  	    "$testcvs -Q update -p -D now $file" 'original'
--- 10264,10269 ----
***************
*** 11486,11492 ****
  "${SPROG} checkout: Updating first-dir
  ===================================================================
  Checking out first-dir/a
! RCS:  ${CVSROOT_DIRNAME}/first-dir/a,v
  VERS: 1\.1
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*"
  		dotest conflicts-127 "${testcvs} -Q co first-dir" ''
--- 11941,11947 ----
  "${SPROG} checkout: Updating first-dir
  ===================================================================
  Checking out first-dir/a
! RCS:  ${CVSROOT_DIRNAME}${SLASH}first-dir${SLASH}a,v
  VERS: 1\.1
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*"
  		dotest conflicts-127 "${testcvs} -Q co first-dir" ''
***************
*** 11511,11517 ****
  "${SPROG} checkout: Updating first-dir
  ===================================================================
  Checking out first-dir/a
! RCS:  ${CVSROOT_DIRNAME}/first-dir/a,v
  VERS: 1\.2
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  add a line"
--- 11966,11972 ----
  "${SPROG} checkout: Updating first-dir
  ===================================================================
  Checking out first-dir/a
! RCS:  ${CVSROOT_DIRNAME}${SLASH}first-dir${SLASH}a,v
  VERS: 1\.2
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  add a line"
***************
*** 12719,12732 ****
  	  dotest modules2-1 "${testcvs} -q co CVSROOT/modules" \
  'U CVSROOT/modules'
  	  cd CVSROOT
! 	  cat >> modules << EOF
! ampermodule &first-dir &second-dir
! combmodule third-dir file3 &first-dir
! ampdirmod -d newdir &first-dir &second-dir
! badmod -d newdir
! messymod first-dir &messymodchild
! messymodchild -d sdir/child second-dir
! EOF
  	  # Depending on whether the user also ran the modules test
  	  # we will be checking in revision 1.2 or 1.3.
  	  dotest modules2-2 "${testcvs} -q ci -m add-modules" \
--- 13174,13185 ----
  	  dotest modules2-1 "${testcvs} -q co CVSROOT/modules" \
  'U CVSROOT/modules'
  	  cd CVSROOT
! 	  echo 'ampermodule &first-dir &second-dir' > modules
! 	  echo 'combmodule third-dir file3 &first-dir' >> modules
! 	  echo 'ampdirmod -d newdir &first-dir &second-dir' >> modules
! 	  echo 'badmod -d newdir' >> modules
! 	  echo 'messymod first-dir &messymodchild' >> modules
! 	  echo 'messymodchild -d sdir/child second-dir' >> modules
  	  # Depending on whether the user also ran the modules test
  	  # we will be checking in revision 1.2 or 1.3.
  	  dotest modules2-2 "${testcvs} -q ci -m add-modules" \
***************
*** 15174,15180 ****
  	    dotest abspath-3a "$testcvs co -d $TESTDIR/1/2 mod1" \
  "$SPROG checkout: Updating $TESTDIR/1/2
  U $TESTDIR/1/2/file1"
! 	    dotest_fail abspath-3b "test -d ${TESTDIR}/1/CVS"
  	  fi
  
  	  dotest abspath-3c "cat ${TESTDIR}/1/2/CVS/Repository" mod1
--- 15627,15633 ----
  	    dotest abspath-3a "$testcvs co -d $TESTDIR/1/2 mod1" \
  "$SPROG checkout: Updating $TESTDIR/1/2
  U $TESTDIR/1/2/file1"
! 	    dotest_fail abspath-3b "test -d ${LOCAL_ROOT_PREFIX}${TESTDIR}/1/CVS"
  	  fi
  
  	  dotest abspath-3c "cat ${TESTDIR}/1/2/CVS/Repository" mod1
***************
*** 15184,15189 ****
--- 15637,15643 ----
  	  rm -rf ${TESTDIR}/1
  
  
+ 	if test x"${CANT_PROTECT_DIRS}" = x; then
  	  # Now try someplace where we don't have permission.
  	  mkdir ${TESTDIR}/barf
  	  chmod -w ${TESTDIR}/barf
***************
*** 15193,15198 ****
--- 15647,15655 ----
  	  chmod +w ${TESTDIR}/barf
  	  rmdir ${TESTDIR}/barf
  	  # Done.  Nothing to clean up.
+ 	else
+ 	  echo "didn't run abspath-4 - CANT_PROTECT_DIRS"
+ 	fi
  
  
  	  # Try checking out two modules into the same directory.
***************
*** 15275,15281 ****
  	  dotest abspath-7e "${testcvs} -q update -d"
  
  	  #
! 	  # FIXME: do other functions here (e.g. update /tmp/foo)
  	  #
  
  	  # Finished with all tests.  Cleanup.
--- 15732,15738 ----
  	  dotest abspath-7e "${testcvs} -q update -d"
  
  	  #
! 	  # FIXME: do other functions here (e.g. update ${TMPDIR}/foo)
  	  #
  
  	  # Finished with all tests.  Cleanup.
***************
*** 15392,15397 ****
--- 15849,15855 ----
  	  dotest toplevel-11 "${testcvs} -q update -d second-dir" \
  "U second-dir/file2"
  
+ 	if test x"${CANT_PROTECT_DIRS}" = x; then
  	  # Now remove the CVS directory (people may do this manually,
  	  # especially if they formed their habits with CVS
  	  # 1.9 and older, which didn't create it.  Or perhaps the working
***************
*** 15415,15420 ****
--- 15873,15881 ----
  ${SPROG} checkout: Updating top-dir"
  
  	  chmod +w ../1
+ 	else
+ 	  echo "didn't run toplevel-12 - CANT_PROTECT_DIRS"
+ 	fi
  
  	  dokeep
  	  restore_adm
***************
*** 15605,15614 ****
  C CVSROOT/verifymsg"
  
            dotest checkout_repository-3 \
! "${testcvs} co -p CVSROOT/modules >/dev/null" \
  "===================================================================
  Checking out CVSROOT/modules
! RCS:  ${CVSROOT_DIRNAME}/CVSROOT/modules,v
  VERS: 1\.[0-9]*
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*"
  
--- 16066,16075 ----
  C CVSROOT/verifymsg"
  
            dotest checkout_repository-3 \
! "${testcvs} co -p CVSROOT/modules >$DEVNULL" \
  "===================================================================
  Checking out CVSROOT/modules
! RCS:  ${CVSROOT_DIRNAME}${SLASH}CVSROOT${SLASH}modules,v
  VERS: 1\.[0-9]*
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*"
  
***************
*** 15619,15624 ****
--- 16080,16086 ----
  
  
  	mflag)
+ 	  if test x"$BROKEN_QUOTE" = x; then
  	  for message in '' ' ' '	
             ' '    	  	test' ; do
  	    # Set up
***************
*** 15671,15676 ****
--- 16133,16139 ----
  	    rm -r a-dir
  	    modify_repo rm -rf $CVSROOT_DIRNAME/a-dir
  	  done
+ 	  fi
  	  ;;
  
  
***************
*** 15686,15698 ****
  	  # can see the "CVS:" lines.
  	  cat >${TESTDIR}/editme <<EOF
  #!${TESTSHELL}
! sleep 1
! sed <\$1 -e 's/^/x/' >${TESTDIR}/edit.new
! mv ${TESTDIR}/edit.new \$1
  exit 0
  EOF
  	  chmod +x ${TESTDIR}/editme
  
  	  mkdir 1; cd 1
  	  dotest editor-1 "${testcvs} -q co -l ." ''
  	  mkdir first-dir
--- 16149,16220 ----
  	  # can see the "CVS:" lines.
  	  cat >${TESTDIR}/editme <<EOF
  #!${TESTSHELL}
! sleep 2
! sed <\$1 -e 's/^/x&/g' >${TESTDIR}/edit.new
! rm \$1
! sleep 2
! cp ${TESTDIR}/edit.new \$1
! rm ${TESTDIR}/edit.new
  exit 0
  EOF
+ 
+ # /* edhack.c */
+ # #include <stdio.h>
+ # #include <stdlib.h>
+ # 
+ # int main( int argc, const char * argv[] )
+ # {
+ #    static char editor[1024];
+ #    const char * testdir;
+ #    const char * testshell;
+ #    int argi;
+ # 
+ #    int iRc = system( NULL );
+ #    if (0 == iRc)
+ #       {
+ #       printf("Can't find a command processor to run system()\n");
+ #       return 1;
+ #       }
+ # 
+ #    testshell = getenv( "TESTSHELL" );
+ #    if (testshell)
+ #       {
+ #       strcpy( editor, testshell );
+ #       }
+ #    else
+ #       {
+ #       strcpy( editor, "sh" );
+ #       }
+ #    strcat( editor, " ");
+ # 
+ #    testdir = getenv( "TESTDIR" );
+ #    if (testdir)
+ #       {
+ #       strcat( editor, testdir );
+ #       strcat( editor, "/" );
+ #       }
+ #    strcat( editor, "editme" );
+ #    
+ #    for (argi = 1; argi < argc; ++argi)
+ #       {
+ #       strcat(editor," ");
+ #       strcat(editor, argv[argi] );
+ #       }
+ #    
+ # /*   printf("about to run:\"%s\"\n", editor); */
+ #    iRc = system( editor );
+ #    return iRc;
+ # }
+ 
  	  chmod +x ${TESTDIR}/editme
  
+ 	  if test x"${EDHACK_EDITOR}" = x; then
+ 	    EDITME_DO=${TESTDIR}/editme
+ 	  else
+ 	    EDITME_DO=edhack
+ 	    export TESTDIR
+ 	  fi
+ 
  	  mkdir 1; cd 1
  	  dotest editor-1 "${testcvs} -q co -l ." ''
  	  mkdir first-dir
***************
*** 15836,15842 ****
  	  # Test CVS's response to an unchanged log message
  	  cat >${TESTDIR}/editme <<EOF
  #!${TESTSHELL}
- sleep 1
  exit 0
  EOF
  	  chmod +x ${TESTDIR}/editme
--- 16358,16363 ----
***************
*** 15849,15856 ****
  	  # Test CVS's response to an empty log message
  	  cat >${TESTDIR}/editme <<EOF
  #!${TESTSHELL}
! sleep 1
! cat /dev/null >\$1
  exit 0
  EOF
  	  chmod +x ${TESTDIR}/editme
--- 16370,16376 ----
  	  # Test CVS's response to an empty log message
  	  cat >${TESTDIR}/editme <<EOF
  #!${TESTSHELL}
! cat $DEVNULL >\$1
  exit 0
  EOF
  	  chmod +x ${TESTDIR}/editme
***************
*** 15863,15869 ****
  	  # Test CVS's response to a log message with one blank line
  	  cat >${TESTDIR}/editme <<EOF
  #!${TESTSHELL}
- sleep 1
  echo >\$1
  exit 0
  EOF
--- 16383,16388 ----
***************
*** 15877,15883 ****
  	  # Test CVS's response to a log message with only comments
  	  cat >${TESTDIR}/editme <<EOF
  #!${TESTSHELL}
- sleep 1
  cat \$1 >${TESTDIR}/edit.new
  mv ${TESTDIR}/edit.new \$1
  exit 0
--- 16396,16401 ----
***************
*** 15897,15904 ****
  "U CVSROOT/loginfo"
  
            cd CVSROOT
! 	  cat <<\EOF >>loginfo
! DEFAULT (echo Start-Log;cat;echo End-Log) >> $CVSROOT/CVSROOT/commitlog
  EOF
  	  dotest editor-emptylog-continue-2 "$testcvs -Q ci -mloggem"
  
--- 16415,16422 ----
  "U CVSROOT/loginfo"
  
            cd CVSROOT
! 	  cat <<EOF >>loginfo
! DEFAULT $TESTSHELL -c "(echo Start-Log;cat;echo End-Log) >> $TESTDIR/cvsroot/CVSROOT/commitlog"
  EOF
  	  dotest editor-emptylog-continue-2 "$testcvs -Q ci -mloggem"
  
***************
*** 15906,15912 ****
  	  cat >${TESTDIR}/editme <<EOF
  #!${TESTSHELL}
  sleep 1
! cp /dev/null \$1
  exit 1
  EOF
  	  chmod +x ${TESTDIR}/editme
--- 16424,16430 ----
  	  cat >${TESTDIR}/editme <<EOF
  #!${TESTSHELL}
  sleep 1
! cat <$DEVNULL >\$1
  exit 1
  EOF
  	  chmod +x ${TESTDIR}/editme
***************
*** 16016,16022 ****
      # It is because this is so messy that the CVS_PID feature exists.
      pid=\$\$
      pidcmd="ps -o pid,ppid -p \$pid || ps -el || ps -al"
!     if echo \$pidcmd | sh >pid.stdout 2> pid.stderr; then
        ppid=\`cat pid.stdout |\\
        awk '/PPID/ { for (i=1; i <= NF; i++) {
                        if (\$i == "PPID") ppidx = i; 
--- 16534,16540 ----
      # It is because this is so messy that the CVS_PID feature exists.
      pid=\$\$
      pidcmd="ps -o pid,ppid -p \$pid || ps -el || ps -al"
!     if echo \$pidcmd | $TESTSHELL >pid.stdout 2> pid.stderr; then
        ppid=\`cat pid.stdout |\\
        awk '/PPID/ { for (i=1; i <= NF; i++) {
                        if (\$i == "PPID") ppidx = i; 
***************
*** 16028,16034 ****
        grep "^\$pid " |\\
        awk '{ print \$NF }'\`
      else
!       ppid=unkown
      fi
    fi
    if test "x\$ppid" = "x\${CVS_PID}"; then
--- 16546,16552 ----
        grep "^\$pid " |\\
        awk '{ print \$NF }'\`
      else
!       ppid=unknown
      fi
    fi
    if test "x\$ppid" = "x\${CVS_PID}"; then
***************
*** 16037,16050 ****
      rm -f pid.stdout pid.stderr
      exit 0
    else
!     echo The environment variable CVS_PID is not properly set.
!     echo It should have been set to \'\$ppid\' but instead was \'\$CVS_PID\'
!     echo It is possible that this test is broken for your host.
!     echo Current pid: \$pid
!     [ -n "\$pidcmd" ] && echo "Command: \$pidcmd"
!     [ -s pid.stdout ] && echo Standard Out: && cat pid.stdout
!     [ -s pid.stderr ] && echo Standard Error: && cat pid.stderr
!     exit 1
    fi
  else
    echo The environment variable CVS_PID is not set.
--- 16555,16575 ----
      rm -f pid.stdout pid.stderr
      exit 0
    else
!     if test "x\$ppid" = "xunknown" && expr "\${CVS_PID}" : "[0-9]\+" >${DEVNULL}; then
!       # Relaxed condition - this MAY happen on platforms where there is no
!       # complete equivalent of SUSv2 'ps'.
!       rm -f pid.stdout pid.stderr
!       exit 0
!     else
!       echo The environment variable CVS_PID is not properly set.
!       echo It should have been set to \'\$ppid\' but instead was \'\$CVS_PID\'
!       echo It is possible that this test is broken for your host.
!       echo Current pid: \$pid
!       [ -n "\$pidcmd" ] && echo "Command: \$pidcmd"
!       [ -s pid.stdout ] && echo Standard Out: && cat pid.stdout
!       [ -s pid.stderr ] && echo Standard Error: && cat pid.stderr
!       exit 1
!     fi
    fi
  else
    echo The environment variable CVS_PID is not set.
***************
*** 16337,16343 ****
  	  export CVS_CLIENT_LOG
  
  	  dotest debug-log-nonfatal-1 \
! "$testcvs -Q co -p CVSROOT/config >/dev/null" \
  "$CPROG checkout: opening to-server logfile $TESTDIR/unwritable/cvsclientlog.in: Permission denied
  $CPROG checkout: opening from-server logfile $TESTDIR/unwritable/cvsclientlog.out: Permission denied"
  
--- 16862,16868 ----
  	  export CVS_CLIENT_LOG
  
  	  dotest debug-log-nonfatal-1 \
! "$testcvs -Q co -p CVSROOT/config >$DEVNULL" \
  "$CPROG checkout: opening to-server logfile $TESTDIR/unwritable/cvsclientlog.in: Permission denied
  $CPROG checkout: opening from-server logfile $TESTDIR/unwritable/cvsclientlog.out: Permission denied"
  
***************
*** 16628,16637 ****
  U first-dir/w1
  U first-dir/w2
  U first-dir/w3'
! 	  dotest devcom2-8 "test -w first-dir/nw1" ''
! 	  dotest_fail devcom2-9 "test -w first-dir/w1" ''
! 	  dotest_fail devcom2-10 "test -w first-dir/w2" ''
! 	  dotest_fail devcom2-11 "test -w first-dir/w3" ''
  
  	  cd first-dir
  	  # OK, now we want to try files in various states with cvs edit.
--- 17153,17170 ----
  U first-dir/w1
  U first-dir/w2
  U first-dir/w3'
! 	  if test "x${OS_COMPILER_EMU}" = xwin32_msvc_cygwin32; then
! 	    echo 'devcom2: cygwin32 b19.1 test -w is very weird - using attrib instead'
! 	    dotest devcom2-8 "attrib first-dir\\nw1" "A      ${DOTSTAR}"
! 	    dotest devcom2-9 "attrib first-dir\\w1" "A    R ${DOTSTAR}"
! 	    dotest devcom2-10 "attrib first-dir\\w2" "A    R ${DOTSTAR}"
! 	    dotest devcom2-11 "attrib first-dir\\w3" "A    R ${DOTSTAR}"
! 	  else
! 	    dotest devcom2-8 "test -w first-dir/nw1" ''
! 	    dotest_fail devcom2-9 "test -w first-dir/w1" ''
! 	    dotest_fail devcom2-10 "test -w first-dir/w2" ''
! 	    dotest_fail devcom2-11 "test -w first-dir/w3" ''
! 	  fi
  
  	  cd first-dir
  	  # OK, now we want to try files in various states with cvs edit.
***************
*** 16770,16776 ****
  	    # before the parent gets around to sending data to it) or
  	    # "received broken pipe signal" (if it is the other way around),
  	    # since HP-UX fails to output it.
! 	    dotest_fail devcom3-9ar "$testcvs edit w1 2>/dev/null"
  	    dotest devcom3-9br "test -w w1"
  	    dotest devcom3-9cr "cat CVS/Notify" \
  "Ew1	[SMTWF][uoehra][neduit] [JFAMSOND][aepuco][nbrylgptvc] [0-9 ][0-9] [0-9:]* [0-9][0-9][0-9][0-9] -0000	[-a-zA-Z_.0-9]*	${TESTDIR}/1/first-dir	EUC"
--- 17303,17309 ----
  	    # before the parent gets around to sending data to it) or
  	    # "received broken pipe signal" (if it is the other way around),
  	    # since HP-UX fails to output it.
! 	    dotest_fail devcom3-9ar "$testcvs edit w1 2>$DEVNULL"
  	    dotest devcom3-9br "test -w w1"
  	    dotest devcom3-9cr "cat CVS/Notify" \
  "Ew1	[SMTWF][uoehra][neduit] [JFAMSOND][aepuco][nbrylgptvc] [0-9 ][0-9] [0-9:]* [0-9][0-9][0-9][0-9] -0000	[-a-zA-Z_.0-9]*	${TESTDIR}/1/first-dir	EUC"
***************
*** 16811,16826 ****
  	  fi
  	  if $notifyworks; then
  	    dotest devcom3-postwatch-examine-1r "cat $TESTDIR/1/watch-log" \
! "$CVSROOT_DIRNAME first-dir watch
! $CVSROOT_DIRNAME first-dir watch
! $CVSROOT_DIRNAME first-dir watch
! $CVSROOT_DIRNAME first-dir update
! $CVSROOT_DIRNAME first-dir server"
  	  else
  	    dotest devcom3-postwatch-examine-1 "cat $TESTDIR/1/watch-log" \
! "$CVSROOT_DIRNAME first-dir watch
! $CVSROOT_DIRNAME first-dir watch
! $CVSROOT_DIRNAME first-dir watch"
  	  fi
  
  	  dokeep
--- 17344,17359 ----
  	  fi
  	  if $notifyworks; then
  	    dotest devcom3-postwatch-examine-1r "cat $TESTDIR/1/watch-log" \
! "${DQUOTE}$CVSROOT_DIRNAME${DQUOTE} ${DQUOTE}first-dir${DQUOTE} ${DQUOTE}watch${DQUOTE}
! ${DQUOTE}$CVSROOT_DIRNAME${DQUOTE} ${DQUOTE}first-dir${DQUOTE} ${DQUOTE}watch${DQUOTE}
! ${DQUOTE}$CVSROOT_DIRNAME${DQUOTE} ${DQUOTE}first-dir${DQUOTE} ${DQUOTE}watch${DQUOTE}
! ${DQUOTE}$CVSROOT_DIRNAME${DQUOTE} ${DQUOTE}first-dir${DQUOTE} ${DQUOTE}update${DQUOTE}
! ${DQUOTE}$CVSROOT_DIRNAME${DQUOTE} ${DQUOTE}first-dir${DQUOTE} ${DQUOTE}server${DQUOTE}"
  	  else
  	    dotest devcom3-postwatch-examine-1 "cat $TESTDIR/1/watch-log" \
! "${DQUOTE}$CVSROOT_DIRNAME${DQUOTE} ${DQUOTE}first-dir${DQUOTE} ${DQUOTE}watch${DQUOTE}
! ${DQUOTE}$CVSROOT_DIRNAME${DQUOTE} ${DQUOTE}first-dir${DQUOTE} ${DQUOTE}watch${DQUOTE}
! ${DQUOTE}$CVSROOT_DIRNAME${DQUOTE} ${DQUOTE}first-dir${DQUOTE} ${DQUOTE}watch${DQUOTE}"
  	  fi
  
  	  dokeep
***************
*** 17003,17014 ****
  	  dotest watch6-0-1 "$testcvs watch add"
  	  dotest watch6-0-2 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/CVS/fileattr"
  	  dotest watch6-0-3 "$testcvs watch remove"
! 	  dotest_fail watch6-0-4 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/CVS/fileattr 2>/dev/null"
  
  	  dotest watch6-0-5 "$testcvs watch add ."
  	  dotest watch6-0-6 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/CVS/fileattr"
  	  dotest watch6-0-7 "$testcvs watch remove ."
! 	  dotest_fail watch6-0-8 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/CVS/fileattr 2>/dev/null"
  
  	  # OK, basic add/remove work. Now, make sure it works with named directories
  	  mkdir dir1
--- 17536,17547 ----
  	  dotest watch6-0-1 "$testcvs watch add"
  	  dotest watch6-0-2 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/CVS/fileattr"
  	  dotest watch6-0-3 "$testcvs watch remove"
! 	  dotest_fail watch6-0-4 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/CVS/fileattr 2>$DEVNULL"
  
  	  dotest watch6-0-5 "$testcvs watch add ."
  	  dotest watch6-0-6 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/CVS/fileattr"
  	  dotest watch6-0-7 "$testcvs watch remove ."
! 	  dotest_fail watch6-0-8 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/CVS/fileattr 2>$DEVNULL"
  
  	  # OK, basic add/remove work. Now, make sure it works with named directories
  	  mkdir dir1
***************
*** 17021,17031 ****
  	  # Current directory should not be watched, but there should be a watch on the file,
  	  # and on dir1 & dir2, but not on dir3.
  	  dotest watch6-0-9 "$testcvs -Q watch add afile dir1 dir2"
! 	  dotest_fail watch6-0-10 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/CVS/fileattr 2>/dev/null"
  	  dotest watch6-0-11 "grep -qE '^Fafile' $CVSROOT_DIRNAME/watch6-0/CVS/fileattr"
  	  dotest watch6-0-12 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/dir1/CVS/fileattr"
  	  dotest watch6-0-13 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/dir2/CVS/fileattr"
! 	  dotest_fail watch6-0-12 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/dir3/CVS/fileattr 2>/dev/null"
  
  	  dokeep
  	  cd ../../..
--- 17554,17564 ----
  	  # Current directory should not be watched, but there should be a watch on the file,
  	  # and on dir1 & dir2, but not on dir3.
  	  dotest watch6-0-9 "$testcvs -Q watch add afile dir1 dir2"
! 	  dotest_fail watch6-0-10 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/CVS/fileattr 2>$DEVNULL"
  	  dotest watch6-0-11 "grep -qE '^Fafile' $CVSROOT_DIRNAME/watch6-0/CVS/fileattr"
  	  dotest watch6-0-12 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/dir1/CVS/fileattr"
  	  dotest watch6-0-13 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/dir2/CVS/fileattr"
! 	  dotest_fail watch6-0-12 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/dir3/CVS/fileattr 2>$DEVNULL"
  
  	  dokeep
  	  cd ../../..
***************
*** 17056,17074 ****
  	  # START watch add/remove sequence
  	  dotest watch6-1 "$testcvs -Q watch add"
  	  dotest watch6-2 \
! "grep '_watchers' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null"
  
  	  dotest watch6-3 "$testcvs watch on"
  	  dotest watch6-4 \
! "grep '_watchers' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null"
  	  dotest watch6-5 \
! "grep '_watched' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null"
  
  	  dotest watch6-6 "$testcvs watch off"
  	  dotest watch6-7 \
! "grep '_watchers' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null"
  	  dotest_fail watch6-8 \
! "grep '_watched' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null"
  
  	  dotest watch6-9 "$testcvs watch remove"
  	  dotest_fail watch6-10 \
--- 17589,17607 ----
  	  # START watch add/remove sequence
  	  dotest watch6-1 "$testcvs -Q watch add"
  	  dotest watch6-2 \
! "grep '_watchers' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >$DEVNULL"
  
  	  dotest watch6-3 "$testcvs watch on"
  	  dotest watch6-4 \
! "grep '_watchers' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >$DEVNULL"
  	  dotest watch6-5 \
! "grep '_watched' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >$DEVNULL"
  
  	  dotest watch6-6 "$testcvs watch off"
  	  dotest watch6-7 \
! "grep '_watchers' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >$DEVNULL"
  	  dotest_fail watch6-8 \
! "grep '_watched' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >$DEVNULL"
  
  	  dotest watch6-9 "$testcvs watch remove"
  	  dotest_fail watch6-10 \
***************
*** 17086,17104 ****
  	  # START watch add/remove sequence
  	  dotest watch6-14 "$testcvs -Q watch add"
  	  dotest watch6-15 \
! "grep '_watchers' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null"
  
  	  dotest watch6-16 "$testcvs watch on"
  	  dotest watch6-17 \
! "grep '_watchers' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null"
  	  dotest watch6-18 \
! "grep '_watched' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null"
  
  	  dotest watch6-19 "$testcvs watch off"
  	  dotest watch6-20 \
! "grep '_watchers' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null"
  	  dotest_fail watch6-21 \
! "grep '_watched' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null"
  
  	  dotest watch6-22 "$testcvs watch remove"
  	  dotest_fail watch6-23 \
--- 17619,17637 ----
  	  # START watch add/remove sequence
  	  dotest watch6-14 "$testcvs -Q watch add"
  	  dotest watch6-15 \
! "grep '_watchers' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >$DEVNULL"
  
  	  dotest watch6-16 "$testcvs watch on"
  	  dotest watch6-17 \
! "grep '_watchers' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >$DEVNULL"
  	  dotest watch6-18 \
! "grep '_watched' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >$DEVNULL"
  
  	  dotest watch6-19 "$testcvs watch off"
  	  dotest watch6-20 \
! "grep '_watchers' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >$DEVNULL"
  	  dotest_fail watch6-21 \
! "grep '_watched' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >$DEVNULL"
  
  	  dotest watch6-22 "$testcvs watch remove"
  	  dotest_fail watch6-23 \
***************
*** 17723,17729 ****
  	  mkdir 1; cd 1
  	  dotest binfiles-1 "${testcvs} -q co first-dir" ''
  	  ${AWK} 'BEGIN { printf "%c%c%c@%c%c", 2, 10, 137, 13, 10 }' \
! 	    </dev/null | ${TR} '@' '\000' >binfile.dat
  	  cat binfile.dat binfile.dat >binfile2.dat
  	  cd first-dir
  	  cp ../binfile.dat binfile
--- 18256,18262 ----
  	  mkdir 1; cd 1
  	  dotest binfiles-1 "${testcvs} -q co first-dir" ''
  	  ${AWK} 'BEGIN { printf "%c%c%c@%c%c", 2, 10, 137, 13, 10 }' \
! 	    <$DEVNULL | ${TR} '@' '\000' >binfile.dat
  	  cat binfile.dat binfile.dat >binfile2.dat
  	  cd first-dir
  	  cp ../binfile.dat binfile
***************
*** 17874,17879 ****
--- 18407,18413 ----
  
  	  cd 2/first-dir
  	  echo 'this file is $''RCSfile$' >binfile
+ 	  lf_endlines binfile
  	  dotest binfiles-14a "${testcvs} -q ci -m modify-it" \
  "$CVSROOT_DIRNAME/first-dir/binfile,v  <--  binfile
  new revision: 1\.5; previous revision: 1\.4"
***************
*** 17989,17998 ****
  total revisions: 1
  ============================================================================="
  
! 	  # Check that the contents were right.  This isn't the hard case
! 	  # (in which RCS_delete_revs does a diff), but might as well.
! 	  dotest binfiles-o4 "${testcvs} -q update binfile" "U binfile"
! 	  dotest binfiles-o5 "cmp binfile ../../1/binfile.dat" ""
  
  	  dokeep
  	  cd ../..
--- 18523,18536 ----
  total revisions: 1
  ============================================================================="
  
! 	  if test x"${CRLF_ENDLINES}" = x; then
! 	    # Check that the contents were right.  This isn't the hard case
! 	    # (in which RCS_delete_revs does a diff), but might as well.
! 	    dotest binfiles-o4 "${testcvs} -q update binfile" "U binfile"
! 	    dotest binfiles-o5 "cmp binfile ../../1/binfile.dat" ""
! 	  else
! 	    echo "Skipping the final of binfiles - CRLF_ENDLINES"
! 	  fi
  
  	  dokeep
  	  cd ../..
***************
*** 18031,18037 ****
  	  # a few likely end-of-line patterns to make sure nothing is
  	  # being munged as if in text mode.
  	  ${AWK} 'BEGIN { printf "%c%c%c@%c%c", 2, 10, 137, 13, 10 }' \
! 	    </dev/null | ${TR} '@' '\000' >../binfile
  	  # Use binfl2 rather than binfile2 because of a problem with Cygwin
  	  # and Samba. that causes cat to report that the input and output file
  	  # are the same when outputting to binfile3.  Why?  I don't know, but
--- 18569,18575 ----
  	  # a few likely end-of-line patterns to make sure nothing is
  	  # being munged as if in text mode.
  	  ${AWK} 'BEGIN { printf "%c%c%c@%c%c", 2, 10, 137, 13, 10 }' \
! 	    <$DEVNULL | ${TR} '@' '\000' >../binfile
  	  # Use binfl2 rather than binfile2 because of a problem with Cygwin
  	  # and Samba. that causes cat to report that the input and output file
  	  # are the same when outputting to binfile3.  Why?  I don't know, but
***************
*** 18167,18173 ****
  	  mkdir 1; cd 1
  	  dotest binfiles3-1 "${testcvs} -q co first-dir" ''
  	  ${AWK} 'BEGIN { printf "%c%c%c@%c%c", 2, 10, 137, 13, 10 }' \
! 	    </dev/null | ${TR} '@' '\000' >binfile.dat
  	  cd first-dir
  	  echo hello >file1
  	  dotest binfiles3-2 "${testcvs} add file1" \
--- 18705,18711 ----
  	  mkdir 1; cd 1
  	  dotest binfiles3-1 "${testcvs} -q co first-dir" ''
  	  ${AWK} 'BEGIN { printf "%c%c%c@%c%c", 2, 10, 137, 13, 10 }' \
! 	    <$DEVNULL | ${TR} '@' '\000' >binfile.dat
  	  cd first-dir
  	  echo hello >file1
  	  dotest binfiles3-2 "${testcvs} add file1" \
***************
*** 18840,18855 ****
  	  dotest info-2 "$testcvs -Q tag info-start"
  	  sed -e's/%p/ALL/' <loginfo >tmploginfo
  	  mv tmploginfo loginfo
! 	  echo "ALL sh -c \"echo x\${=MYENV}\${=OTHER}y\${=ZEE}=\$USER=\$COMMITID=\$SESSIONID=\$CVSROOT= >>$TESTDIR/testlog; cat >/dev/null\"" >> loginfo
            # The following cases test the format string substitution
!           echo "ALL echo %{} >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
!           echo "ALL echo %x >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
!           echo "ALL echo % >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
!           echo "ALL echo %{sxVv} >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
!           echo "ALL echo %{v} >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
!           echo "ALL echo %s %s >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
!           echo "ALL echo %{V}AX >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
!           echo "first-dir echo %sux >>$TESTDIR/testlog2; cat >/dev/null" \
              >> loginfo
  	  sed -e's/^UseNewInfoFmtStrings=yes$/#&/' <config >tmpconfig
  	  mv tmpconfig config
--- 19378,19393 ----
  	  dotest info-2 "$testcvs -Q tag info-start"
  	  sed -e's/%p/ALL/' <loginfo >tmploginfo
  	  mv tmploginfo loginfo
! 	  echo "ALL $TESTSHELL -c \"echo x\${=MYENV}\${=OTHER}y\${=ZEE}=\$USER=\$COMMITID=\$SESSIONID=\$CVSROOT= >>$TESTDIR/testlog; cat >$DEVNULL\"" >> loginfo
            # The following cases test the format string substitution
!           echo "ALL $TESTSHELL -c 'echo %{} >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
!           echo "ALL $TESTSHELL -c 'echo %x >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
!           echo "ALL $TESTSHELL -c 'echo % >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
!           echo "ALL $TESTSHELL -c 'echo %{sxVv} >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
!           echo "ALL $TESTSHELL -c 'echo %{v} >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
!           echo "ALL $TESTSHELL -c 'echo %s %s >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
!           echo "ALL $TESTSHELL -c 'echo %{V}AX >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
!           echo "first-dir $TESTSHELL -c 'echo %sux >>$TESTDIR/testlog2; cat >$DEVNULL'" \
              >> loginfo
  	  sed -e's/^UseNewInfoFmtStrings=yes$/#&/' <config >tmpconfig
  	  mv tmpconfig config
***************
*** 18920,18925 ****
--- 19458,19464 ----
  leisure\.
  $SPROG commit: loginfo:[0-9]*: no such user variable \${=ZEE}"
  	  echo line1 >>file1
+ #	  dotest info-7 "${testcvs} -t -s OTHER=value -s ZEE=z ci -m mod-it" \
  	  dotest info-7 "${testcvs} -q -s OTHER=value -s ZEE=z ci -m mod-it" \
  "$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
  new revision: 1\.3; previous revision: 1\.2
***************
*** 18969,18984 ****
  	  dotest info-setup-intfmt-2 "$testcvs -q up -prinfo-start loginfo >loginfo"
  	  sed -e's/%p/ALL/' <loginfo >tmploginfo
  	  mv tmploginfo loginfo
! 	  echo "ALL sh -c \"echo x\${=MYENV}\${=OTHER}y\${=ZEE}=\$USER=\$CVSROOT= >>$TESTDIR/testlog; cat >/dev/null\"" >> loginfo
            # The following cases test the format string substitution
!           echo "ALL echo %1{} >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
!           echo "ALL echo %1x >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
!           echo "ALL echo %1 >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
!           echo "ALL echo %1{sxVv} >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
!           echo "ALL echo %1{v} >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
!           echo "ALL echo %1s %%s >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
!           echo "ALL echo %1{V}AX >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
!           echo "third-dir echo %1sux >>$TESTDIR/testlog2; cat >/dev/null" \
              >> loginfo
  
  	  dotest info-setup-intfmt-2 "${testcvs} -q -s ZEE=garbage ci -m nuke-admin-for-info-intfmt" \
--- 19508,19523 ----
  	  dotest info-setup-intfmt-2 "$testcvs -q up -prinfo-start loginfo >loginfo"
  	  sed -e's/%p/ALL/' <loginfo >tmploginfo
  	  mv tmploginfo loginfo
! 	  echo "ALL $TESTSHELL -c \"echo x\${=MYENV}\${=OTHER}y\${=ZEE}=\$USER=\$CVSROOT= >>$TESTDIR/testlog; cat >$DEVNULL\"" >> loginfo
            # The following cases test the format string substitution
!           echo "ALL $TESTSHELL -c 'echo %1{} >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
!           echo "ALL $TESTSHELL -c 'echo %1x >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
!           echo "ALL $TESTSHELL -c 'echo %1 >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
!           echo "ALL $TESTSHELL -c 'echo %1{sxVv} >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
!           echo "ALL $TESTSHELL -c 'echo %1{v} >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
!           echo "ALL $TESTSHELL -c 'echo %1s %%s >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
!           echo "ALL $TESTSHELL -c 'echo %1{V}AX >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
!           echo "third-dir $TESTSHELL -c 'echo %1sux >>$TESTDIR/testlog2; cat >$DEVNULL'" \
              >> loginfo
  
  	  dotest info-setup-intfmt-2 "${testcvs} -q -s ZEE=garbage ci -m nuke-admin-for-info-intfmt" \
***************
*** 19102,19114 ****
  	  # test the new format strings too
  	  cd CVSROOT
  	  dotest info-setup-newfmt-1 "$testcvs -q up -prinfo-start loginfo >loginfo"
! 	  echo "ALL sh -c \"echo x\${=MYENV}\${=OTHER}y\${=ZEE}=\$USER=\$CVSROOT= >>$TESTDIR/testlog; cat >/dev/null\" %{sVv}" >> loginfo
            # The following cases test the format string substitution
!           echo "ALL echo %p \"%{sTVv}\" >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
!           echo "ALL echo %{v} >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
!           echo "ALL echo %s >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
!           echo "ALL echo %{V}AX >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
!           echo "second-dir echo %sux >>$TESTDIR/testlog2; cat >/dev/null" >> loginfo
  	  dotest info-setup-newfmt-2 "$testcvs -q -s ZEE=garbage ci -m nuke-admin-for-info-newfmt" \
  "${CVSROOT_DIRNAME}/CVSROOT/loginfo,v  <--  loginfo
  new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
--- 19641,19653 ----
  	  # test the new format strings too
  	  cd CVSROOT
  	  dotest info-setup-newfmt-1 "$testcvs -q up -prinfo-start loginfo >loginfo"
! 	  echo "ALL $TESTSHELL -c \"echo x\${=MYENV}\${=OTHER}y\${=ZEE}=\$USER=\$CVSROOT= >>$TESTDIR/testlog; cat >$DEVNULL\" %{sVv}" >> loginfo
            # The following cases test the format string substitution
!           echo "ALL $TESTSHELL -c 'echo %p \"%{sTVv}\" >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
!           echo "ALL $TESTSHELL -c 'echo %{v} >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
!           echo "ALL $TESTSHELL -c 'echo %s >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
!           echo "ALL $TESTSHELL -c 'echo %{V}AX >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
!           echo "second-dir $TESTSHELL -c 'echo %sux >>$TESTDIR/testlog2; cat >$DEVNULL'" >> loginfo
  	  dotest info-setup-newfmt-2 "$testcvs -q -s ZEE=garbage ci -m nuke-admin-for-info-newfmt" \
  "${CVSROOT_DIRNAME}/CVSROOT/loginfo,v  <--  loginfo
  new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
***************
*** 19169,19186 ****
  	  # clean up the logs
  	  rm ${TESTDIR}/testlog ${TESTDIR}/testlog2
  
! 	  # Now test verifymsg
  	  cat >${TESTDIR}/vscript <<EOF
  #!${TESTSHELL}
  echo vscript "\$@"
! if sed 1q < \$1 | grep '^BugId:[ ]*[0-9][0-9]*$' > /dev/null; then
      exit 0
! elif sed 1q < \$1 | grep '^BugId:[ ]*new$' > /dev/null; then
!     echo A new bugid was found. >> \$1
      exit 0
  else
      echo "No BugId found."
-     sleep 1
      exit 1
  fi
  EOF
--- 19708,19726 ----
  	  # clean up the logs
  	  rm ${TESTDIR}/testlog ${TESTDIR}/testlog2
  
!           # Now test verifymsg. The sed tricks for chopping the enclosing quotes
! 	  # have been added specially for OS/2 bash -- 11/1/2006, 00:10
  	  cat >${TESTDIR}/vscript <<EOF
  #!${TESTSHELL}
  echo vscript "\$@"
! f=\`echo \$1 | sed 's/^\"//; s/\"\$//;'\`
! if sed 1q < \$f | grep '^BugId:[ ]*[0-9][0-9]*$' > $DEVNULL; then
      exit 0
! elif sed 1q < \$f | grep '^BugId:[ ]*new$' > $DEVNULL; then
!     echo A new bugid was found. >> \$f
      exit 0
  else
      echo "No BugId found."
      exit 1
  fi
  EOF
***************
*** 19193,19199 ****
  	repo=\`pwd\`
  fi
  echo \$repo
! if echo "\$repo" |grep yet-another/ >/dev/null 2>&1; then
  	exit 1
  else
  	exit 0
--- 19733,19739 ----
  	repo=\`pwd\`
  fi
  echo \$repo
! if echo "\$repo" |grep yet-another/ >$DEVNULL 2>&1; then
  	exit 1
  else
  	exit 0
***************
*** 19218,19224 ****
  	  cd ../first-dir
  	  echo line2 >>file1
  	  dotest_fail info-v2 "${testcvs} -q ci -m bogus" \
! "vscript $tempname file1 1\.3
  No BugId found\.
  ${SPROG} \[commit aborted\]: Message verification failed"
  
--- 19758,19764 ----
  	  cd ../first-dir
  	  echo line2 >>file1
  	  dotest_fail info-v2 "${testcvs} -q ci -m bogus" \
! "vscript ${DQUOTE}$tempname${DQUOTE} ${DQUOTE}file1${DQUOTE} ${DQUOTE}1\.3${DQUOTE}
  No BugId found\.
  ${SPROG} \[commit aborted\]: Message verification failed"
  
***************
*** 19227,19233 ****
  and many more lines after it
  EOF
  	  dotest info-v3 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \
! "vscript $tempname file1 1\.3
  $CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
  new revision: 1\.4; previous revision: 1\.3"
  	  rm ${TESTDIR}/comment.tmp
--- 19767,19773 ----
  and many more lines after it
  EOF
  	  dotest info-v3 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \
! "vscript ${DQUOTE}$tempname${DQUOTE} ${DQUOTE}file1${DQUOTE} ${DQUOTE}1\.3${DQUOTE}
  $CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
  new revision: 1\.4; previous revision: 1\.3"
  	  rm ${TESTDIR}/comment.tmp
***************
*** 19238,19256 ****
  	  touch file2
  	  dotest_fail info-v4 \
  	    "${testcvs} import -m bogus first-dir/another x y" \
! "vscript $tempname - Imported sources NONE
  No BugId found\.
  ${SPROG} \[import aborted\]: Message verification failed"
  
  	  # now verify that directory dependent verifymsgs work
  	  dotest info-v5 \
  	    "${testcvs} import -m bogus first-dir/yet-another x y" \
! "vscript2 $tempname - Imported sources NONE
  $TESTDIR/wnt/another-dir
  N first-dir/yet-another/file2
  
  No conflicts created by this import" \
! "vscript2 $tempname - Imported sources NONE
  $CVSROOT_DIRNAME/first-dir/yet-another
  N first-dir/yet-another/file2
  
--- 19778,19796 ----
  	  touch file2
  	  dotest_fail info-v4 \
  	    "${testcvs} import -m bogus first-dir/another x y" \
! "vscript ${DQUOTE}$tempname${DQUOTE} ${DQUOTE}- Imported sources${DQUOTE} ${DQUOTE}NONE${DQUOTE}
  No BugId found\.
  ${SPROG} \[import aborted\]: Message verification failed"
  
  	  # now verify that directory dependent verifymsgs work
  	  dotest info-v5 \
  	    "${testcvs} import -m bogus first-dir/yet-another x y" \
! "vscript2 ${DQUOTE}$tempname${DQUOTE} ${DQUOTE}- Imported sources${DQUOTE} ${DQUOTE}NONE${DQUOTE}
  $TESTDIR/wnt/another-dir
  N first-dir/yet-another/file2
  
  No conflicts created by this import" \
! "vscript2 ${DQUOTE}$tempname${DQUOTE} ${DQUOTE}- Imported sources${DQUOTE} ${DQUOTE}NONE${DQUOTE}
  $CVSROOT_DIRNAME/first-dir/yet-another
  N first-dir/yet-another/file2
  
***************
*** 19269,19281 ****
  	  if $remote; then
  	    dotest_fail info-v6r \
  	      "${testcvs} import -m bogus first-dir/yet-another/and-another x y" \
! "vscript2 $tempname - Imported sources NONE
  $CVSROOT_DIRNAME/first-dir/yet-another/and-another
  $SPROG \[import aborted\]: Message verification failed"
  	  else
  	    dotest info-v6 \
  	      "${testcvs} import -m bogus first-dir/yet-another/and-another x y" \
! "vscript2 $tempname - Imported sources NONE
  $TESTDIR/wnt/another-dir
  N first-dir/yet-another/and-another/file2
  
--- 19809,19821 ----
  	  if $remote; then
  	    dotest_fail info-v6r \
  	      "${testcvs} import -m bogus first-dir/yet-another/and-another x y" \
! "vscript2 ${DQUOTE}$tempname${DQUOTE} ${DQUOTE}- Imported sources${DQUOTE}g ${DQUOTE}NONE${DQUOTE}
  $CVSROOT_DIRNAME/first-dir/yet-another/and-another
  $SPROG \[import aborted\]: Message verification failed"
  	  else
  	    dotest info-v6 \
  	      "${testcvs} import -m bogus first-dir/yet-another/and-another x y" \
! "vscript2 ${DQUOTE}$tempname${DQUOTE} ${DQUOTE}- Imported sources${DQUOTE} ${DQUOTE}NONE${DQUOTE}
  $TESTDIR/wnt/another-dir
  N first-dir/yet-another/and-another/file2
  
***************
*** 19313,19319 ****
  See what happens next.
  EOF
  	  dotest info-reread-2 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \
! "vscript $tempname file1 1\.4
  $CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
  new revision: 1\.5; previous revision: 1\.4"
  	  dotest info-reread-3 "${testcvs} -q log -N -r1.5 file1" "
--- 19853,19859 ----
  See what happens next.
  EOF
  	  dotest info-reread-2 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \
! "vscript ${DQUOTE}$tempname${DQUOTE} ${DQUOTE}file1${DQUOTE} ${DQUOTE}1\.4${DQUOTE}
  $CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
  new revision: 1\.5; previous revision: 1\.4"
  	  dotest info-reread-3 "${testcvs} -q log -N -r1.5 file1" "
***************
*** 19339,19345 ****
  See what happens next with stat.
  EOF
  	  dotest info-reread-5 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \
! "vscript $tempname file1 1\.5
  $CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
  new revision: 1\.6; previous revision: 1\.5"
  	  dotest info-reread-6 "${testcvs} -q log -N -r1.6 file1" "
--- 19879,19885 ----
  See what happens next with stat.
  EOF
  	  dotest info-reread-5 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \
! "vscript ${DQUOTE}$tempname${DQUOTE} ${DQUOTE}file1${DQUOTE} ${DQUOTE}1\.5${DQUOTE}
  $CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
  new revision: 1\.6; previous revision: 1\.5"
  	  dotest info-reread-6 "${testcvs} -q log -N -r1.6 file1" "
***************
*** 19365,19371 ****
  See what happens next.
  EOF
  	  dotest info-reread-8 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \
! "vscript $tempname file1 1\.6
  $CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
  new revision: 1\.7; previous revision: 1\.6"
  	  dotest info-reread-6 "${testcvs} -q log -N -r1.7 file1" "
--- 19905,19911 ----
  See what happens next.
  EOF
  	  dotest info-reread-8 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \
! "vscript ${DQUOTE}$tempname${DQUOTE} ${DQUOTE}file1${DQUOTE} ${DQUOTE}1\.6${DQUOTE}
  $CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
  new revision: 1\.7; previous revision: 1\.6"
  	  dotest info-reread-6 "${testcvs} -q log -N -r1.7 file1" "
***************
*** 19404,19416 ****
  "You have \[0\] altered files in this repository\."
  
  	  dotest info-cleanup-1 \
! "echo yes |${testcvs} -q release -d CVSROOT >/dev/null"
  	  dotest info-cleanup-2 \
! "echo yes |${testcvs} -q release -d first-dir >/dev/null"
  	  dotest info-cleanup-3 \
! "echo yes |${testcvs} -q release -d third-dir >/dev/null"
  	  dotest info-cleanup-4 \
! "echo yes |${testcvs} -q release -d fourth-dir >/dev/null"
  
  	  dokeep
  	  cd ..
--- 19944,19956 ----
  "You have \[0\] altered files in this repository\."
  
  	  dotest info-cleanup-1 \
! "echo yes |${testcvs} -q release -d CVSROOT >$DEVNULL"
  	  dotest info-cleanup-2 \
! "echo yes |${testcvs} -q release -d first-dir >$DEVNULL"
  	  dotest info-cleanup-3 \
! "echo yes |${testcvs} -q release -d third-dir >$DEVNULL"
  	  dotest info-cleanup-4 \
! "echo yes |${testcvs} -q release -d fourth-dir >$DEVNULL"
  
  	  dokeep
  	  cd ..
***************
*** 19439,19445 ****
  	  dotest taginfo-init-2 "$testcvs -Q tag taginfo-start"
  	  cat >$TESTDIR/1/loggit <<EOF
  #!$TESTSHELL
! if test "\$1" = rejectme; then
    exit 1
  else
    echo "\$@" >>$TESTDIR/1/taglog
--- 19979,19985 ----
  	  dotest taginfo-init-2 "$testcvs -Q tag taginfo-start"
  	  cat >$TESTDIR/1/loggit <<EOF
  #!$TESTSHELL
! if test "\$1" = ${DQUOTE}rejectme${DQUOTE}; then
    exit 1
  else
    echo "\$@" >>$TESTDIR/1/taglog
***************
*** 19626,19632 ****
  
  	  cat >${TESTDIR}/1/loggit <<EOF
  #!${TESTSHELL}
! if test "\$1" = rejectme; then
    exit 1
  else
    while test "\$#" -gt 0; do
--- 20166,20172 ----
  
  	  cat >${TESTDIR}/1/loggit <<EOF
  #!${TESTSHELL}
! if test "\$1" = ${DQUOTE}rejectme${DQUOTE}; then
    exit 1
  else
    while test "\$#" -gt 0; do
***************
*** 19714,19720 ****
  	  cd CVSROOT
  	  cat >${TESTDIR}/1/loggit <<EOF
  #!${TESTSHELL}
! if test "\$1" = rejectme; then
    exit 1
  else
    echo "\$@" >>${TESTDIR}/1/taglog
--- 20254,20260 ----
  	  cd CVSROOT
  	  cat >${TESTDIR}/1/loggit <<EOF
  #!${TESTSHELL}
! if test "\$1" = ${DQUOTE}rejectme${DQUOTE}; then
    exit 1
  else
    echo "\$@" >>${TESTDIR}/1/taglog
***************
*** 22246,22257 ****
  symbols branch:1.2.6;
  locks;
  testofanewphrase @without newphrase we'd have trouble extending @@ all@ ;
! 1.5 date 71.01.01.01.00.00; author joe; state bogus; branches; next 1.4;
! 1.4 date 71.01.01.00.00.05; author joe; state bogus; branches; next 1.3;
! 1.3 date 70.12.31.15.00.05; author joe; state bogus; branches; next 1.2;
! 1.2 date 70.12.31.12.15.05; author me; state bogus; branches 1.2.6.1; next 1.1;
! 1.1 date 70.12.31.11.00.05; author joe; state bogus; branches; next; newph;
! 1.2.6.1 date 71.01.01.08.00.05; author joe; state Exp; branches; next;
  desc @@
  1.5 log @@ newphrase1; newphrase2 42; text @head revision@
  1.4 log @@ text @d1 1
--- 22786,22797 ----
  symbols branch:1.2.6;
  locks;
  testofanewphrase @without newphrase we'd have trouble extending @@ all@ ;
! 1.5 date ${DECADE}1.01.01.01.00.00; author joe; state bogus; branches; next 1.4;
! 1.4 date ${DECADE}1.01.01.00.00.05; author joe; state bogus; branches; next 1.3;
! 1.3 date ${DECADE}0.12.31.15.00.05; author joe; state bogus; branches; next 1.2;
! 1.2 date ${DECADE}0.12.31.12.15.05; author me; state bogus; branches 1.2.6.1; next 1.1;
! 1.1 date ${DECADE}0.12.31.11.00.05; author joe; state bogus; branches; next; newph;
! 1.2.6.1 date ${DECADE}1.01.01.08.00.05; author joe; state Exp; branches; next;
  desc @@
  1.5 log @@ newphrase1; newphrase2 42; text @head revision@
  1.4 log @@ text @d1 1
***************
*** 22274,22279 ****
--- 22814,22821 ----
  	  modify_repo mv $TESTDIR/file2,v $CVSROOT_DIRNAME/first-dir/file2,v
  	  # ' Match the single quote in above here doc -- for font-lock mode.
  
+ 	  lf_endlines ${CVSROOT_DIRNAME}/first-dir/file2,v
+ 
  	  # First test the default branch.
  	  dotest rcs-5 "${testcvs} -q update file2" "U file2"
  	  dotest rcs-6 "cat file2" "branch revision"
***************
*** 22309,22342 ****
  testofanewphrase	@without newphrase we'd have trouble extending @@ all@;
  
  1\.5
! date	71\.01\.01\.01\.00\.00;	author joe;	state bogus;
  branches;
  next	1\.4;
  
  1\.4
! date	71\.01\.01\.00\.00\.05;	author joe;	state bogus;
  branches;
  next	1\.3;
  
  1\.3
! date	70\.12\.31\.15\.00\.05;	author joe;	state bogus;
  branches;
  next	1\.2;
  
  1\.2
! date	70\.12\.31\.12\.15\.05;	author me;	state bogus;
  branches
  	1\.2\.6\.1;
  next	1\.1;
  
  1\.1
! date	70\.12\.31\.11\.00\.05;	author joe;	state bogus;
  branches;
  next	;
  newph	;
  
  1\.2\.6\.1
! date	71\.01\.01\.08\.00\.05;	author joe;	state Exp;
  branches;
  next	1\.2\.6\.2;
  
--- 22851,22884 ----
  testofanewphrase	@without newphrase we'd have trouble extending @@ all@;
  
  1\.5
! date	${DECADE}1\.01\.01\.01\.00\.00;	author joe;	state bogus;
  branches;
  next	1\.4;
  
  1\.4
! date	${DECADE}1\.01\.01\.00\.00\.05;	author joe;	state bogus;
  branches;
  next	1\.3;
  
  1\.3
! date	${DECADE}0\.12\.31\.15\.00\.05;	author joe;	state bogus;
  branches;
  next	1\.2;
  
  1\.2
! date	${DECADE}0\.12\.31\.12\.15\.05;	author me;	state bogus;
  branches
  	1\.2\.6\.1;
  next	1\.1;
  
  1\.1
! date	${DECADE}0\.12\.31\.11\.00\.05;	author joe;	state bogus;
  branches;
  next	;
  newph	;
  
  1\.2\.6\.1
! date	${DECADE}1\.01\.01\.08\.00\.05;	author joe;	state Exp;
  branches;
  next	1\.2\.6\.2;
  
***************
*** 22415,22435 ****
  next branch revision
  @"
  
! 	  dotest rcs-9 "${testcvs} -q update -p -D '1970-12-31 11:30 UT' file2" \
  "start revision"
  
! 	  dotest rcs-10 "${testcvs} -q update -p -D '1970-12-31 12:30 UT' file2" \
  "mid revision"
  
! 	  dotest rcs-11 "${testcvs} -q update -p -D '1971-01-01 00:30 UT' file2" \
  "new year revision"
  
  	  # Same test as rcs-10, but with am/pm.
! 	  dotest rcs-12 "${testcvs} -q update -p -D 'December 31, 1970 12:30pm UT' file2" \
  "mid revision"
  
  	  # Same test as rcs-11, but with am/pm.
! 	  dotest rcs-13 "${testcvs} -q update -p -D 'January 1, 1971 12:30am UT' file2" \
  "new year revision"
  
  	  # OK, now make sure cvs log doesn't have any trouble with the
--- 22957,22980 ----
  next branch revision
  @"
  
! 
! 	  dotest rcs-9 "${testcvs} -q update -p -D '19${DECADE}0-12-31 11:30 UT' file2" \
  "start revision"
  
! 	  dotest rcs-10 "${testcvs} -q update -p -D '19${DECADE}0-12-31 12:30 UT' file2" \
  "mid revision"
  
! 	  dotest rcs-11 "${testcvs} -q update -p -D '19${DECADE}1-01-01 00:30 UT' file2" \
  "new year revision"
  
  	  # Same test as rcs-10, but with am/pm.
! 	  # Same test as rcs-10, but with am/pm.
! 	  dotest rcs-12 "${testcvs} -q update -p -D 'December 31, 19${DECADE}0 12:30pm UT' file2" \
  "mid revision"
  
  	  # Same test as rcs-11, but with am/pm.
! 	  # Same test as rcs-11, but with am/pm.
! 	  dotest rcs-13 "${testcvs} -q update -p -D 'January 1, 19${DECADE}1 12:30am UT' file2" \
  "new year revision"
  
  	  # OK, now make sure cvs log doesn't have any trouble with the
***************
*** 22448,22471 ****
  description:
  ----------------------------
  revision 1\.5
! date: 1971-01-01 01:00:00 [+-]0000;  author: joe;  state: bogus;  lines: ${PLUS}1 -1;
  \*\*\* empty log message \*\*\*
  ----------------------------
  revision 1\.4
! date: 1971-01-01 00:00:05 [+-]0000;  author: joe;  state: bogus;  lines: ${PLUS}1 -1;
  \*\*\* empty log message \*\*\*
  ----------------------------
  revision 1\.3
! date: 1970-12-31 15:00:05 [+-]0000;  author: joe;  state: bogus;  lines: ${PLUS}1 -1;
  \*\*\* empty log message \*\*\*
  ----------------------------
  revision 1\.2
! date: 1970-12-31 12:15:05 [+-]0000;  author: me;  state: bogus;  lines: ${PLUS}1 -1;
  branches:  1\.2\.6;
  \*\*\* empty log message \*\*\*
  ----------------------------
  revision 1\.1
! date: 1970-12-31 11:00:05 [+-]0000;  author: joe;  state: bogus;
  \*\*\* empty log message \*\*\*
  ----------------------------
  revision 1\.2\.6\.2
--- 22993,23016 ----
  description:
  ----------------------------
  revision 1\.5
! date: 19${DECADE}1-01-01 01:00:00 [+-]0000;  author: joe;  state: bogus;  lines: ${PLUS}1 -1;
  \*\*\* empty log message \*\*\*
  ----------------------------
  revision 1\.4
! date: 19${DECADE}1-01-01 00:00:05 [+-]0000;  author: joe;  state: bogus;  lines: ${PLUS}1 -1;
  \*\*\* empty log message \*\*\*
  ----------------------------
  revision 1\.3
! date: 19${DECADE}0-12-31 15:00:05 [+-]0000;  author: joe;  state: bogus;  lines: ${PLUS}1 -1;
  \*\*\* empty log message \*\*\*
  ----------------------------
  revision 1\.2
! date: 19${DECADE}0-12-31 12:15:05 [+-]0000;  author: me;  state: bogus;  lines: ${PLUS}1 -1;
  branches:  1\.2\.6;
  \*\*\* empty log message \*\*\*
  ----------------------------
  revision 1\.1
! date: 19${DECADE}0-12-31 11:00:05 [+-]0000;  author: joe;  state: bogus;
  \*\*\* empty log message \*\*\*
  ----------------------------
  revision 1\.2\.6\.2
***************
*** 22473,22500 ****
  mod
  ----------------------------
  revision 1\.2\.6\.1
! date: 1971-01-01 08:00:05 [+-]0000;  author: joe;  state: Exp;  lines: ${PLUS}1 -1;
  \*\*\* empty log message \*\*\*
  ============================================================================="
  	  # Now test each date format for "cvs log -d".
! 	  # Earlier than 1971-01-01
! 	  dotest rcs-15 "${testcvs} -q log -d '<1971-01-01 00:00 GMT' file2 \
! 	    | grep revision" \
  "total revisions: 7;	selected revisions: 3
  revision 1\.3
  revision 1\.2
  revision 1\.1"
! 	  # Later than 1971-01-01
! 	  dotest rcs-16 "${testcvs} -q log -d '1971-01-01 00:00 GMT<' file2 \
! 	    | grep revision" \
  "total revisions: 7;	selected revisions: 4
  revision 1\.5
  revision 1\.4
  revision 1\.2\.6\.2
  revision 1\.2\.6\.1"
  	  # Alternate syntaxes for later and earlier; multiple -d options
! 	  dotest rcs-17 "${testcvs} -q log -d '>1971-01-01 00:00 GMT' \
! 	    -d '1970-12-31 12:15 GMT>' file2 | grep revision" \
  "total revisions: 7;	selected revisions: 5
  revision 1\.5
  revision 1\.4
--- 23018,23048 ----
  mod
  ----------------------------
  revision 1\.2\.6\.1
! date: 19${DECADE}1-01-01 08:00:05 [+-]0000;  author: joe;  state: Exp;  lines: ${PLUS}1 -1;
  \*\*\* empty log message \*\*\*
  ============================================================================="
  	  # Now test each date format for "cvs log -d".
! 	  # Earlier than 19${DECADE}1-01-01
! 	  # Earlier than 19${DECADE}1-01-01
! 	  dotest rcs-15 "${testcvs} -q log -d '<19${DECADE}1-01-01 00:00 GMT' file2 \
!             | grep revision" \
  "total revisions: 7;	selected revisions: 3
  revision 1\.3
  revision 1\.2
  revision 1\.1"
! 	  # Later than 19${DECADE}1-01-01
! 	  # Later than 19${DECADE}1-01-01
! 	  dotest rcs-16 "${testcvs} -q log -d '19${DECADE}1-01-01 00:00 GMT<' file2 \
!             | grep revision" \
  "total revisions: 7;	selected revisions: 4
  revision 1\.5
  revision 1\.4
  revision 1\.2\.6\.2
  revision 1\.2\.6\.1"
  	  # Alternate syntaxes for later and earlier; multiple -d options
! 	  # Alternate syntaxes for later and earlier; multiple -d options
! 	  dotest rcs-17 "${testcvs} -q log -d '>19${DECADE}1-01-01 00:00 GMT' \
! 	    -d '19${DECADE}0-12-31 12:15 GMT>' file2 | grep revision" \
  "total revisions: 7;	selected revisions: 5
  revision 1\.5
  revision 1\.4
***************
*** 22502,22517 ****
  revision 1\.2\.6\.2
  revision 1\.2\.6\.1"
  	  # Range, and single date
! 	  dotest rcs-18 "${testcvs} -q log -d '1970-12-31 11:30 GMT' \
! 	    -d '1971-01-01 00:00:05 GMT<1971-01-01 01:00:01 GMT' \
  	    file2 | grep revision" \
  "total revisions: 7;	selected revisions: 2
  revision 1\.5
  revision 1\.1"
  	  # Alternate range syntax; equality
  	  dotest rcs-19 "${testcvs} -q log \
! 	    -d '1971-01-01 01:00:01 GMT>=1971-01-01 00:00:05 GMT' \
! 	    file2 | grep revision" \
  "total revisions: 7;	selected revisions: 2
  revision 1\.5
  revision 1\.4"
--- 23050,23066 ----
  revision 1\.2\.6\.2
  revision 1\.2\.6\.1"
  	  # Range, and single date
! 	  # Range, and single date
! 	  dotest rcs-18 "${testcvs} -q log -d '19${DECADE}0-12-31 11:30 GMT' \
! 	    -d '19${DECADE}1-01-01 00:00:05 GMT<19${DECADE}1-01-01 01:00:01 GMT' \
  	    file2 | grep revision" \
  "total revisions: 7;	selected revisions: 2
  revision 1\.5
  revision 1\.1"
  	  # Alternate range syntax; equality
  	  dotest rcs-19 "${testcvs} -q log \
! 	    -d '19${DECADE}1-01-01 01:00:01 GMT>=19${DECADE}1-01-01 00:00:05 GMT' \
!             file2 | grep revision" \
  "total revisions: 7;	selected revisions: 2
  revision 1\.5
  revision 1\.4"
***************
*** 22569,22574 ****
--- 23118,23124 ----
  	  modify_repo mv $TESTDIR/file1,v $CVSROOT_DIRNAME/first-dir/file1,v
  	  # ' Match the 3rd single quote in the here doc -- for font-lock mode.
  
+ 	  lf_endlines ${CVSROOT_DIRNAME}/first-dir/file1,v
  	  dotest rcs2-1 "${testcvs} -q co first-dir" 'U first-dir/file1'
  	  cd first-dir
  
***************
*** 22670,22676 ****
  
  	  # OK, now put an extraneous '\0' at the end.
  	  mv $CVSROOT_DIRNAME/first-dir/file1,v $TESTDIR/file1,v
! 	  ${AWK} </dev/null 'BEGIN { printf "@%c", 10 }' | ${TR} '@' '\000' \
  	    >>$TESTDIR/file1,v
  	  modify_repo mv $TESTDIR/file1,v $CVSROOT_DIRNAME/first-dir/file1,v
  	  dotest_fail rcs3-7 "${testcvs} log -s nostate file1" \
--- 23220,23226 ----
  
  	  # OK, now put an extraneous '\0' at the end.
  	  mv $CVSROOT_DIRNAME/first-dir/file1,v $TESTDIR/file1,v
! 	  ${AWK} <$DEVNULL 'BEGIN { printf "@%c", 10 }' | ${TR} '@' '\000' \
  	    >>$TESTDIR/file1,v
  	  modify_repo mv $TESTDIR/file1,v $CVSROOT_DIRNAME/first-dir/file1,v
  	  dotest_fail rcs3-7 "${testcvs} log -s nostate file1" \
***************
*** 22890,22906 ****
  	  # isn't right, because typically the reason for LockDir is to
  	  # use a different set of permissions.
  	  #
! 	  # Bah!  Cygwin!
! 	  if test -n "$remotehost"; then
! 	    dotest lockfiles-7a "$CVS_RSH $remotehost 'ls -ld ${TESTDIR}/locks/first-dir'" \
  "drwxr-----.*first-dir"
! 	    dotest lockfiles-7b "$CVS_RSH $remotehost 'ls -ld ${TESTDIR}/locks/first-dir/sdir/ssdir'" \
  "drwxr-----.*first-dir/sdir/ssdir"
! 	  else
! 	    dotest lockfiles-7a "ls -ld ${TESTDIR}/locks/first-dir" \
  "drwxr-----.*first-dir"
! 	    dotest lockfiles-7b "ls -ld ${TESTDIR}/locks/first-dir/sdir/ssdir" \
  "drwxr-----.*first-dir/sdir/ssdir"
  	  fi
  
  	  cd ../../..
--- 23440,23458 ----
  	  # isn't right, because typically the reason for LockDir is to
  	  # use a different set of permissions.
  	  #
! 	  # Bah!  Cygwin!  (Bam-bam, OS/2 EMX -- 2/1/2006, 17:42)
! 	  if test x"${WONT_PRESERVE_PERMISSIONS}" = x; then
! 	    if test -n "$remotehost" && test x"${WONT_PRESERVE_PERMISSIONS}" = x; then
! 	      dotest lockfiles-7a "$CVS_RSH $remotehost 'ls -ld ${TESTDIR}/locks/first-dir'" \
  "drwxr-----.*first-dir"
! 	      dotest lockfiles-7b "$CVS_RSH $remotehost 'ls -ld ${TESTDIR}/locks/first-dir/sdir/ssdir'" \
  "drwxr-----.*first-dir/sdir/ssdir"
! 	    else
! 	      dotest lockfiles-7a "ls -ld ${TESTDIR}/locks/first-dir" \
  "drwxr-----.*first-dir"
! 	      dotest lockfiles-7b "ls -ld ${TESTDIR}/locks/first-dir/sdir/ssdir" \
  "drwxr-----.*first-dir/sdir/ssdir"
+ 	    fi
  	  fi
  
  	  cd ../../..
***************
*** 22942,22948 ****
  
  	  # 3. Don't read when write locks present...
  	  mkdir "$TESTDIR/locks/first-dir/#cvs.lock"
! 	  (sleep 5; rmdir "$TESTDIR/locks/first-dir/#cvs.lock")&
  	  dotest lockfiles-10 "$testcvs -q co -l first-dir" \
  "$SPROG checkout: \[[0-9:]*\] waiting for $username's lock in $CVSROOT_DIRNAME/first-dir
  $SPROG checkout: \[[0-9:]*\] obtained lock in $CVSROOT_DIRNAME/first-dir"
--- 23494,23500 ----
  
  	  # 3. Don't read when write locks present...
  	  mkdir "$TESTDIR/locks/first-dir/#cvs.lock"
! 	  ${TESTSHELL} -c "(sleep 5; rmdir \"$TESTDIR/locks/first-dir/#cvs.lock\")"&
  	  dotest lockfiles-10 "$testcvs -q co -l first-dir" \
  "$SPROG checkout: \[[0-9:]*\] waiting for $username's lock in $CVSROOT_DIRNAME/first-dir
  $SPROG checkout: \[[0-9:]*\] obtained lock in $CVSROOT_DIRNAME/first-dir"
***************
*** 22963,22969 ****
  	  # 7. Don't write when read locks are present...
  	  echo I always have trouble coming up with witty text for the test files >>first-dir/sdir/ssdir/file1
  	  touch "$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.rfl.test.lock"
! 	  (sleep 5; rm "$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.rfl.test.lock")&
  	  dotest lockfiles-13 "$testcvs -q ci -mconflict first-dir" \
  "$SPROG commit: \[[0-9:]*\] waiting for $username's lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
  $SPROG commit: \[[0-9:]*\] obtained lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
--- 23515,23521 ----
  	  # 7. Don't write when read locks are present...
  	  echo I always have trouble coming up with witty text for the test files >>first-dir/sdir/ssdir/file1
  	  touch "$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.rfl.test.lock"
! 	  ${TESTSHELL} -c "(sleep 5; rm \"$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.rfl.test.lock\")"&
  	  dotest lockfiles-13 "$testcvs -q ci -mconflict first-dir" \
  "$SPROG commit: \[[0-9:]*\] waiting for $username's lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
  $SPROG commit: \[[0-9:]*\] obtained lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
***************
*** 22984,22990 ****
  	  #    (fail to perform commit up-to-date check with promotable lock
  	  #     present).
  	  touch "$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.pfl.test.lock"
! 	  (sleep 5; rm "$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.pfl.test.lock")&
  	  dotest_fail lockfiles-15 "$testcvs -q ci -mnot-up-to-date first-dir" \
  "$SPROG commit: \[[0-9:]*\] waiting for $username's lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
  $SPROG commit: \[[0-9:]*\] obtained lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
--- 23536,23542 ----
  	  #    (fail to perform commit up-to-date check with promotable lock
  	  #     present).
  	  touch "$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.pfl.test.lock"
! 	  ${TESTSHELL} -c "(sleep 5; rm \"$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.pfl.test.lock\")"&
  	  dotest_fail lockfiles-15 "$testcvs -q ci -mnot-up-to-date first-dir" \
  "$SPROG commit: \[[0-9:]*\] waiting for $username's lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
  $SPROG commit: \[[0-9:]*\] obtained lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
***************
*** 22995,23001 ****
  	  #    (fail to perform commit up-to-date check with promotable lock
  	  #     present).
  	  mkdir "$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.lock"
! 	  (sleep 5; rmdir "$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.lock")&
  	  dotest_fail lockfiles-16 "$testcvs -q ci -mnot-up-to-date first-dir" \
  "$SPROG commit: \[[0-9:]*\] waiting for $username's lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
  $SPROG commit: \[[0-9:]*\] obtained lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
--- 23547,23553 ----
  	  #    (fail to perform commit up-to-date check with promotable lock
  	  #     present).
  	  mkdir "$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.lock"
! 	  ${TESTSHELL} -c "(sleep 5; rmdir \"$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.lock\")"&
  	  dotest_fail lockfiles-16 "$testcvs -q ci -mnot-up-to-date first-dir" \
  "$SPROG commit: \[[0-9:]*\] waiting for $username's lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
  $SPROG commit: \[[0-9:]*\] obtained lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
***************
*** 23006,23012 ****
  	  dotest lockfiles-17 "$testcvs -Q up -C first-dir/sdir/ssdir"
  	  echo the kinds of smiles that light faces for miles >>first-dir/sdir/ssdir/file1
  	  touch "$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.pfl.test.lock"
! 	  (sleep 5; rm "$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.pfl.test.lock")&
  	  dotest lockfiles-18 "$testcvs -q ci -mnot-up-to-date first-dir" \
  "$SPROG commit: \[[0-9:]*\] waiting for $username's lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
  $SPROG commit: \[[0-9:]*\] obtained lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
--- 23558,23564 ----
  	  dotest lockfiles-17 "$testcvs -Q up -C first-dir/sdir/ssdir"
  	  echo the kinds of smiles that light faces for miles >>first-dir/sdir/ssdir/file1
  	  touch "$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.pfl.test.lock"
! 	  ${TESTSHELL} -c "(sleep 5; rm \"$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.pfl.test.lock\")"&
  	  dotest lockfiles-18 "$testcvs -q ci -mnot-up-to-date first-dir" \
  "$SPROG commit: \[[0-9:]*\] waiting for $username's lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
  $SPROG commit: \[[0-9:]*\] obtained lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
***************
*** 23016,23022 ****
  	  # 9. Don't write when write locks are present...
  	  echo yet this poem would probably only give longfellow bile >>first-dir/sdir/ssdir/file1
  	  mkdir "$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.lock"
! 	  (sleep 5; rmdir "$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.lock")&
  	  dotest lockfiles-19 "$testcvs -q ci -mnot-up-to-date first-dir" \
  "$SPROG commit: \[[0-9:]*\] waiting for $username's lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
  $SPROG commit: \[[0-9:]*\] obtained lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
--- 23568,23574 ----
  	  # 9. Don't write when write locks are present...
  	  echo yet this poem would probably only give longfellow bile >>first-dir/sdir/ssdir/file1
  	  mkdir "$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.lock"
! 	  ${TESTSHELL} -c "(sleep 5; rmdir \"$TESTDIR/locks/first-dir/sdir/ssdir/#cvs.lock\")"&
  	  dotest lockfiles-19 "$testcvs -q ci -mnot-up-to-date first-dir" \
  "$SPROG commit: \[[0-9:]*\] waiting for $username's lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
  $SPROG commit: \[[0-9:]*\] obtained lock in $CVSROOT_DIRNAME/first-dir/sdir/ssdir
***************
*** 23249,23256 ****
  	  cd ../4
  	  dotest backuprecover-18 \
  		"${testcvs} -Q co -d repos-first-dir first-dir" ''
! 	  sh ../fixit
! 	  cd ../3; sh ../fixit
  
  	  # (re)commit developer 3's stuff
  	  cd first-dir
--- 23801,23808 ----
  	  cd ../4
  	  dotest backuprecover-18 \
  		"${testcvs} -Q co -d repos-first-dir first-dir" ''
! 	  ${TESTSHELL} ../fixit
! 	  cd ../3; ${TESTSHELL} ../fixit
  
  	  # (re)commit developer 3's stuff
  	  cd first-dir
***************
*** 23374,23380 ****
  new revision: 1\.2; previous revision: 1\.1"
            cat > wrapper.sh <<EOF
  #!$TESTSHELL
! exec "\$@" 2>&1 < /dev/null | cat
  EOF
            chmod +x wrapper.sh
            ./wrapper.sh \
--- 23926,23932 ----
  new revision: 1\.2; previous revision: 1\.1"
            cat > wrapper.sh <<EOF
  #!$TESTSHELL
! exec "\$@" 2>&1 < $DEVNULL | cat
  EOF
            chmod +x wrapper.sh
            ./wrapper.sh \
***************
*** 23577,23583 ****
  C 2001-06-10 11:51 ${PLUS}0000 kingdon 1\.3   README    ccvs/emx == <remote>
  M 1997-06-10 01:36 ${PLUS}0000 nk      1\.229 sanity\.sh ccvs/src == <remote>"
  
! 	  dotest history-8 "${testcvs} history -ca -D '1970-01-01 00:00 UT'" \
  "M 1997-06-10 01:36 ${PLUS}0000 nk        1\.229 sanity.sh   ccvs/src == <remote>
  M 1997-06-10 01:38 ${PLUS}0000 anonymous 1\.23  Makefile    ccvs/src == <remote>
  M 1997-06-10 21:12 ${PLUS}0000 kingdon   1\.231 sanity.sh   ccvs/src == ~/work/ccvs/src
--- 24129,24136 ----
  C 2001-06-10 11:51 ${PLUS}0000 kingdon 1\.3   README    ccvs/emx == <remote>
  M 1997-06-10 01:36 ${PLUS}0000 nk      1\.229 sanity\.sh ccvs/src == <remote>"
  
! 
! 	  dotest history-8 "${testcvs} history -ca -D '19${DECADE}0-01-01 00:00 UT'" \
  "M 1997-06-10 01:36 ${PLUS}0000 nk        1\.229 sanity.sh   ccvs/src == <remote>
  M 1997-06-10 01:38 ${PLUS}0000 anonymous 1\.23  Makefile    ccvs/src == <remote>
  M 1997-06-10 21:12 ${PLUS}0000 kingdon   1\.231 sanity.sh   ccvs/src == ~/work/ccvs/src
***************
*** 23588,23594 ****
  M 1997-06-10 01:38 ${PLUS}0000 anonymous 1\.23  Makefile    ccvs/src == <remote>
  M 1997-06-10 21:12 ${PLUS}0000 kingdon   1\.231 sanity.sh   ccvs/src == ~/work/ccvs/src"
  
! 	  dotest history-10 "${testcvs} history -lca -D '1970-01-01 00:00 UT'" \
  "M 2001-06-10 17:33 ${PLUS}0000 kingdon   1\.281 cvs.texinfo ccvs/doc == ~/work/ccvs/doc
  M 1997-06-10 01:38 ${PLUS}0000 anonymous 1\.23  Makefile    ccvs/src == <remote>
  M 1997-06-10 21:12 ${PLUS}0000 kingdon   1\.231 sanity.sh   ccvs/src == ~/work/ccvs/src"
--- 24141,24147 ----
  M 1997-06-10 01:38 ${PLUS}0000 anonymous 1\.23  Makefile    ccvs/src == <remote>
  M 1997-06-10 21:12 ${PLUS}0000 kingdon   1\.231 sanity.sh   ccvs/src == ~/work/ccvs/src"
  
! 	  dotest history-10 "${testcvs} history -lca -D '19${DECADE}0-01-01 00:00 UT'" \
  "M 2001-06-10 17:33 ${PLUS}0000 kingdon   1\.281 cvs.texinfo ccvs/doc == ~/work/ccvs/doc
  M 1997-06-10 01:38 ${PLUS}0000 anonymous 1\.23  Makefile    ccvs/src == <remote>
  M 1997-06-10 21:12 ${PLUS}0000 kingdon   1\.231 sanity.sh   ccvs/src == ~/work/ccvs/src"
***************
*** 23598,23604 ****
  O 1997-06-05 14:00 ${PLUS}0000 anonymous ccvs =src=  <remote>/\*
  O 1997-06-06 08:12 ${PLUS}0000 kingdon   ccvs =ccvs= <remote>/\*"
  
! 	  dotest history-12 "${testcvs} history -aw -D'1970-01-01 00:00 UT'" \
  "O 1997-06-04 19:48 ${PLUS}0000 anonymous ccvs =ccvs= <remote>/\*
  O 1997-06-05 14:00 ${PLUS}0000 anonymous ccvs =src=  <remote>/\*
  O 1997-06-06 08:12 ${PLUS}0000 kingdon   ccvs =ccvs= <remote>/\*"
--- 24151,24157 ----
  O 1997-06-05 14:00 ${PLUS}0000 anonymous ccvs =src=  <remote>/\*
  O 1997-06-06 08:12 ${PLUS}0000 kingdon   ccvs =ccvs= <remote>/\*"
  
! 	  dotest history-12 "${testcvs} history -aw -D'19${DECADE}0-01-01 00:00 UT'" \
  "O 1997-06-04 19:48 ${PLUS}0000 anonymous ccvs =ccvs= <remote>/\*
  O 1997-06-05 14:00 ${PLUS}0000 anonymous ccvs =src=  <remote>/\*
  O 1997-06-06 08:12 ${PLUS}0000 kingdon   ccvs =ccvs= <remote>/\*"
***************
*** 23839,23845 ****
  	  touch aa
  	  chmod a= aa
  	  # Don't try this when permissions are broken, as with Cygwin.
! 	  if ${LS} ${CVSROOT_DIRNAME}/first-dir >/dev/null 2>&1; then :; else
  	    dotest_fail modes2-6 "${testcvs} -q update -r 1.1 aa" \
  "${CPROG} \[update aborted\]: cannot open file aa for comparing: Permission denied" \
  "${CPROG} \[update aborted\]: reading aa: Permission denied"
--- 24392,24398 ----
  	  touch aa
  	  chmod a= aa
  	  # Don't try this when permissions are broken, as with Cygwin.
! 	  if ${LS} ${CVSROOT_DIRNAME}/first-dir >$DEVNULL 2>&1; then :; else
  	    dotest_fail modes2-6 "${testcvs} -q update -r 1.1 aa" \
  "${CPROG} \[update aborted\]: cannot open file aa for comparing: Permission denied" \
  "${CPROG} \[update aborted\]: reading aa: Permission denied"
***************
*** 23877,23884 ****
  $CVSROOT_DIRNAME/second-dir/ab,v  <--  second-dir/ab
  initial revision: 1\.1"
  	  # quiet down this one as it will be noisy in proxy mode
! 	  modify_repo chmod a= $CVSROOT_DIRNAME/first-dir >/dev/null 2>&1
! 	  if ${LS} ${CVSROOT_DIRNAME}/first-dir >/dev/null 2>&1; then
  	    # Avoid this test under Cygwin since permissions work differently
  	    # there.
  	    #
--- 24430,24437 ----
  $CVSROOT_DIRNAME/second-dir/ab,v  <--  second-dir/ab
  initial revision: 1\.1"
  	  # quiet down this one as it will be noisy in proxy mode
! 	  modify_repo chmod a= $CVSROOT_DIRNAME/first-dir >$DEVNULL 2>&1
! 	  if ${LS} ${CVSROOT_DIRNAME}/first-dir >$DEVNULL 2>&1; then
  	    # Avoid this test under Cygwin since permissions work differently
  	    # there.
  	    #
***************
*** 23931,23937 ****
  	  cd ..
  	  rm -r 1
  	  # quiet down this one as it will be noisy in proxy mode
! 	  modify_repo chmod u+rwx $CVSROOT_DIRNAME/first-dir 2>/dev/null
  	  modify_repo rm -rf $CVSROOT_DIRNAME/first-dir \
  			     $CVSROOT_DIRNAME/second-dir
  	  ;;
--- 24484,24490 ----
  	  cd ..
  	  rm -r 1
  	  # quiet down this one as it will be noisy in proxy mode
! 	  modify_repo chmod u+rwx $CVSROOT_DIRNAME/first-dir 2>$DEVNULL
  	  modify_repo rm -rf $CVSROOT_DIRNAME/first-dir \
  			     $CVSROOT_DIRNAME/second-dir
  	  ;;
***************
*** 23954,23960 ****
  	  sleep 60
  	  ls -l aa >${TESTDIR}/1/stamp.aa.touch
  	  ls -l kw >${TESTDIR}/1/stamp.kw.touch
- 	  # "sleep 1" would suffice if we could assume ls --full-time, but
  	  # that is as far as I know unique to GNU ls.  Is there some POSIX.2
  	  # way to get the timestamp of a file, including the seconds?
  	  sleep 60
--- 24507,24512 ----
***************
*** 23989,23995 ****
  	  # be a lot of work.
  	  dotest stamps-6aa \
  	    "cmp ${TESTDIR}/1/stamp.aa.add ${TESTDIR}/1/stamp.aa.ci" ''
! 	  if cmp ${TESTDIR}/1/stamp.kw.add ${TESTDIR}/1/stamp.kw.ci >/dev/null
  	  then
  	    fail stamps-6kw
  	  else
--- 24541,24547 ----
  	  # be a lot of work.
  	  dotest stamps-6aa \
  	    "cmp ${TESTDIR}/1/stamp.aa.add ${TESTDIR}/1/stamp.aa.ci" ''
! 	  if cmp ${TESTDIR}/1/stamp.kw.add ${TESTDIR}/1/stamp.kw.ci >$DEVNULL
  	  then
  	    fail stamps-6kw
  	  else
***************
*** 24009,24015 ****
  	  # "cvs log aa" matches stamp.aa.get, but that would be a lot of
  	  # work.
  	  dotest_fail stamps-8aa \
! "cmp $TESTDIR/1/stamp.aa.ci $TESTDIR/1/stamp.aa.get >/dev/null"
  	  dotest stamps-8kw \
  "cmp $TESTDIR/1/stamp.kw.ci $TESTDIR/1/stamp.kw.get"
  
--- 24561,24567 ----
  	  # "cvs log aa" matches stamp.aa.get, but that would be a lot of
  	  # work.
  	  dotest_fail stamps-8aa \
! "cmp $TESTDIR/1/stamp.aa.ci $TESTDIR/1/stamp.aa.get >$DEVNULL"
  	  dotest stamps-8kw \
  "cmp $TESTDIR/1/stamp.kw.ci $TESTDIR/1/stamp.kw.get"
  
***************
*** 24050,24058 ****
  	  # a new revision, then "make" will be sure to regard those files
  	  # as newer than .o files which may be sitting around.
  	  dotest_fail stamps-11aa \
! "cmp $TESTDIR/1/stamp.aa.update $TESTDIR/1/stamp.aa.ci2 >/dev/null"
  	  dotest_fail stamps-11kw \
! "cmp $TESTDIR/1/stamp.kw.update $TESTDIR/1/stamp.kw.ci2 >/dev/null"
  
  	  dokeep
  	  cd ../..
--- 24602,24610 ----
  	  # a new revision, then "make" will be sure to regard those files
  	  # as newer than .o files which may be sitting around.
  	  dotest_fail stamps-11aa \
! "cmp $TESTDIR/1/stamp.aa.update $TESTDIR/1/stamp.aa.ci2 >$DEVNULL"
  	  dotest_fail stamps-11kw \
! "cmp $TESTDIR/1/stamp.kw.update $TESTDIR/1/stamp.kw.ci2 >$DEVNULL"
  
  	  dokeep
  	  cd ../..
***************
*** 24081,24087 ****
  	  dotest perms-3 "${testcvs} add foo" \
  "${SPROG} add: scheduling file .foo. for addition
  ${SPROG} add: use .${SPROG} commit. to add this file permanently"
! 	  dotest perms-4 "${testcvs} -q ci -m ''" \
  "$CVSROOT_DIRNAME/first-dir/foo,v  <--  foo
  initial revision: 1\.1"
  
--- 24633,24639 ----
  	  dotest perms-3 "${testcvs} add foo" \
  "${SPROG} add: scheduling file .foo. for addition
  ${SPROG} add: use .${SPROG} commit. to add this file permanently"
! 	  dotest perms-4 "${testcvs} -q ci -m\'\'" \
  "$CVSROOT_DIRNAME/first-dir/foo,v  <--  foo
  initial revision: 1\.1"
  
***************
*** 24164,24170 ****
  	  dotest symlinks2-3 "${testcvs} add slink" \
  "${SPROG} add: scheduling file .slink. for addition
  ${SPROG} add: use .${SPROG} commit. to add this file permanently"
! 	  dotest symlinks2-4 "${testcvs} -q ci -m ''" \
  "$CVSROOT_DIRNAME/first-dir/slink,v  <--  slink
  initial revision: 1\.1"
  	  rm slink
--- 24716,24722 ----
  	  dotest symlinks2-3 "${testcvs} add slink" \
  "${SPROG} add: scheduling file .slink. for addition
  ${SPROG} add: use .${SPROG} commit. to add this file permanently"
! 	  dotest symlinks2-4 "${testcvs} -q ci -m\'\'" \
  "$CVSROOT_DIRNAME/first-dir/slink,v  <--  slink
  initial revision: 1\.1"
  	  rm slink
***************
*** 24228,24234 ****
  ${SPROG} add: scheduling file .b\.b\.b\.b. for addition
  ${SPROG} add: scheduling file .dd dd dd. for addition
  ${SPROG} add: use .${SPROG} commit. to add these files permanently"
! 	  dotest hardlinks-4 "${testcvs} -q ci -m ''" \
  "$CVSROOT_DIRNAME/first-dir/aaaa,v  <--  aaaa
  initial revision: 1\.1
  $CVSROOT_DIRNAME/first-dir/b\.b\.b\.b,v  <--  b\.b\.b\.b
--- 24780,24786 ----
  ${SPROG} add: scheduling file .b\.b\.b\.b. for addition
  ${SPROG} add: scheduling file .dd dd dd. for addition
  ${SPROG} add: use .${SPROG} commit. to add these files permanently"
! 	  dotest hardlinks-4 "${testcvs} -q ci -m\'\'" \
  "$CVSROOT_DIRNAME/first-dir/aaaa,v  <--  aaaa
  initial revision: 1\.1
  $CVSROOT_DIRNAME/first-dir/b\.b\.b\.b,v  <--  b\.b\.b\.b
***************
*** 25035,25041 ****
  
  	  ${AWK} 'BEGIN { printf "%c%c%c%sRevision: 1.1 $@%c%c", \
  	    2, 10, 137, "$", 13, 10 }' \
! 	    </dev/null | ${TR} '@' '\000' >../binfile.dat
  	  cp ../binfile.dat .
  	  dotest keyword2-5 "${testcvs} add -kb binfile.dat" \
  "${SPROG} add: scheduling file .binfile\.dat. for addition
--- 25587,25594 ----
  
  	  ${AWK} 'BEGIN { printf "%c%c%c%sRevision: 1.1 $@%c%c", \
  	    2, 10, 137, "$", 13, 10 }' \
! 	    <$DEVNULL | ${TR} '@' '\000' >../binfile.dat
! 	  lf_endlines ../binfile.dat
  	  cp ../binfile.dat .
  	  dotest keyword2-5 "${testcvs} add -kb binfile.dat" \
  "${SPROG} add: scheduling file .binfile\.dat. for addition
***************
*** 25113,25122 ****
  	  dotest keyword2-17 "${testcvs} -q tag -b branch2" \
  "T binfile\.dat
  T file1"
! 	  dotest keyword2-18 "${testcvs} -q update -r branch2" ''
  
  	  ${AWK} 'BEGIN { printf "%c%c%c@%c%c", 2, 10, 137, 13, 10 }' \
! 	    </dev/null | ${TR} '@' '\000' >>binfile.dat
  	  dotest keyword2-19 "$testcvs -q ci -m badbadbad" \
  "$CVSROOT_DIRNAME/first-dir/binfile\.dat,v  <--  binfile\.dat
  new revision: 1\.1\.4\.1; previous revision: 1\.1"
--- 25666,25675 ----
  	  dotest keyword2-17 "${testcvs} -q tag -b branch2" \
  "T binfile\.dat
  T file1"
! 	    dotest keyword2-18 "${testcvs} -q update -r branch2" ''
  
  	  ${AWK} 'BEGIN { printf "%c%c%c@%c%c", 2, 10, 137, 13, 10 }' \
! 	    <$DEVNULL | ${TR} '@' '\000' >>binfile.dat
  	  dotest keyword2-19 "$testcvs -q ci -m badbadbad" \
  "$CVSROOT_DIRNAME/first-dir/binfile\.dat,v  <--  binfile\.dat
  new revision: 1\.1\.4\.1; previous revision: 1\.1"
***************
*** 26508,26514 ****
  	  dotest admin-22-o18 "${testcvs} update -p -r1.4 aaa" \
  "===================================================================
  Checking out aaa
! RCS:  ${CVSROOT_DIRNAME}/first-dir/aaa,v
  VERS: 1\.4
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  first rev
--- 27061,27067 ----
  	  dotest admin-22-o18 "${testcvs} update -p -r1.4 aaa" \
  "===================================================================
  Checking out aaa
! RCS:  ${CVSROOT_DIRNAME}${SLASH}first-dir${SLASH}aaa,v
  VERS: 1\.4
  \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
  first rev
***************
*** 27102,27108 ****
  	    fail reserved-11
  	  fi
  	  cd CVSROOT
! 	  echo "DEFAULT ${TESTDIR}/lockme" >>commitinfo
  	  dotest reserved-12 "${testcvs} -q ci -m rcslock commitinfo" \
  "$CVSROOT_DIRNAME/CVSROOT/commitinfo,v  <--  commitinfo
  new revision: 1\.2; previous revision: 1\.1
--- 27655,27665 ----
  	    fail reserved-11
  	  fi
  	  cd CVSROOT
! 	  if test x"${CANT_RUN_SCRIPTS}" = x; then
! 	    echo "DEFAULT ${TESTDIR}/lockme" >>commitinfo
! 	  else
! 	    echo "DEFAULT ${TESTSHELL} ${TESTDIR}/lockme" >>commitinfo
! 	  fi
  	  dotest reserved-12 "${testcvs} -q ci -m rcslock commitinfo" \
  "$CVSROOT_DIRNAME/CVSROOT/commitinfo,v  <--  commitinfo
  new revision: 1\.2; previous revision: 1\.1
***************
*** 27243,27252 ****
  	  # people having made changes).  CVS used to have a bug in this
  	  # case.  Therefore, it is important to test this case by
  	  # using a branch:
! 	  ${testcvs} rtag     -b tag diffmerge1 >/dev/null 2>&1
! 	  ${testcvs} checkout -r tag diffmerge1 >/dev/null 2>&1
  	  mv diffmerge1 yours
! 	  ${testcvs} checkout diffmerge1 >/dev/null 2>&1
  	  mv diffmerge1 mine
  
  	  # In your working copy, you'll make changes, and
--- 27800,27809 ----
  	  # people having made changes).  CVS used to have a bug in this
  	  # case.  Therefore, it is important to test this case by
  	  # using a branch:
! 	  ${testcvs} rtag     -b tag diffmerge1 >$DEVNULL 2>&1
! 	  ${testcvs} checkout -r tag diffmerge1 >$DEVNULL 2>&1
  	  mv diffmerge1 yours
! 	  ${testcvs} checkout diffmerge1 >$DEVNULL 2>&1
  	  mv diffmerge1 mine
  
  	  # In your working copy, you'll make changes, and
***************
*** 28020,28025 ****
--- 28577,28583 ----
          CPen *pMinorPen;        // pen to use for drawing minor grid lines
  d472 12
  @" > diffmerge2/sgrid.h,v
+ 	  lf_endlines diffmerge2/sgrid.h,v
  
  	  # We have to put the RCS file in the repository by hand for
  	  # this test:
***************
*** 28193,28199 ****
  	  # not, so determine which cases we are dealing with:
  	  echo file >file
  	  echo FiLe >FiLe
! 	  if cmp file FiLe >/dev/null; then
  	    client_sensitive=false
  	  else
  	    client_sensitive=:
--- 28751,28757 ----
  	  # not, so determine which cases we are dealing with:
  	  echo file >file
  	  echo FiLe >FiLe
! 	  if cmp file FiLe >$DEVNULL; then
  	    client_sensitive=false
  	  else
  	    client_sensitive=:
***************
*** 28201,28207 ****
  	  if test -n "$remotehost"; then
  	    $CVS_RSH $remotehost 'echo file >file'
  	    $CVS_RSH $remotehost 'echo FiLe >FiLe'
! 	    if $CVS_RSH $remotehost 'cmp file FiLe >/dev/null'; then
  	      server_sensitive=false
  	    else
  	      server_sensitive=:
--- 28759,28765 ----
  	  if test -n "$remotehost"; then
  	    $CVS_RSH $remotehost 'echo file >file'
  	    $CVS_RSH $remotehost 'echo FiLe >FiLe'
! 	    if $CVS_RSH $remotehost 'cmp file FiLe >$DEVNULL'; then
  	      server_sensitive=false
  	    else
  	      server_sensitive=:
***************
*** 30395,30401 ****
  	    # a denial-of-service attack.  This assumes that PATH_MAX is less
  	    # than 65536 bytes.  If PATH_MAX is larger than 65535 bytes, this
  	    # test could hang indefinitely.
! 	    ${AWK} 'BEGIN { printf "0123456789abcdef" }' </dev/null >garbageseg
  	    echo "BEGIN AUTH REQUEST" >garbageinput
  	    i=0
  	    while test $i -lt 64; do
--- 30953,30959 ----
  	    # a denial-of-service attack.  This assumes that PATH_MAX is less
  	    # than 65536 bytes.  If PATH_MAX is larger than 65535 bytes, this
  	    # test could hang indefinitely.
! 	    ${AWK} 'BEGIN { printf "0123456789abcdef" }' <$DEVNULL >garbageseg
  	    echo "BEGIN AUTH REQUEST" >garbageinput
  	    i=0
  	    while test $i -lt 64; do
***************
*** 30463,30469 ****
  END AUTH REQUEST
  init ${TESTDIR}/2
  EOF
! 	    dotest_fail pserver-5b "test -d ${TESTDIR}/2" ''
  
  	    dotest pserver-5c "${servercvs} --allow-root=${CVSROOT_DIRNAME} pserver" \
  "${DOTSTAR} LOVE YOU
--- 31021,31027 ----
  END AUTH REQUEST
  init ${TESTDIR}/2
  EOF
! 	    dotest_fail pserver-5b "test -d ${LOCAL_ROOT_PREFIX}${TESTDIR}/2" ''
  
  	    dotest pserver-5c "${servercvs} --allow-root=${CVSROOT_DIRNAME} pserver" \
  "${DOTSTAR} LOVE YOU
***************
*** 30798,30804 ****
  	    # pserver used to try and print from the NULL pointer 
  	    # in this error message in this case
  	    dotest_fail pserver-bufinit "${servercvs} pserver" \
! "$CPROG \[pserver aborted\]: unexpected EOF encountered during authentication" </dev/null
  
  	    # Clean up.
  	    dotest pserver-cleanup-1 "${testcvs} -q up -pr1.1 config >config" ""
--- 31356,31362 ----
  	    # pserver used to try and print from the NULL pointer 
  	    # in this error message in this case
  	    dotest_fail pserver-bufinit "${servercvs} pserver" \
! "$CPROG \[pserver aborted\]: unexpected EOF encountered during authentication" <$DEVNULL
  
  	    # Clean up.
  	    dotest pserver-cleanup-1 "${testcvs} -q up -pr1.1 config >config" ""
***************
*** 30837,30849 ****
  Set MYENV=env-value
  init ${TESTDIR}/crerepos
  EOF
! 	    dotest server-3 "test -d ${TESTDIR}/crerepos/CVSROOT" ""
  
  	    # Now some tests of gzip-file-contents (used by jCVS).
  	    ${AWK} 'BEGIN { \
  printf "%c%c%c%c%c%c.6%c%c+I-.%c%c%c%c5%c;%c%c%c%c", \
  31, 139, 8, 64, 5, 7, 64, 3, 225, 2, 64, 198, 185, 5, 64, 64, 64}' \
! 	      </dev/null | ${TR} '\100' '\000' >gzipped.dat
  	    # Note that the CVS client sends "-b 1.1.1", and this
  	    # test doesn't.  But the server also defaults to that.
  	    cat <<EOF >session.dat
--- 31395,31407 ----
  Set MYENV=env-value
  init ${TESTDIR}/crerepos
  EOF
! 	    dotest server-3 "test -d ${LOCAL_ROOT_PREFIX}${TESTDIR}/crerepos/CVSROOT" ""
  
  	    # Now some tests of gzip-file-contents (used by jCVS).
  	    ${AWK} 'BEGIN { \
  printf "%c%c%c%c%c%c.6%c%c+I-.%c%c%c%c5%c;%c%c%c%c", \
  31, 139, 8, 64, 5, 7, 64, 3, 225, 2, 64, 198, 185, 5, 64, 64, 64}' \
! 	      <$DEVNULL | ${TR} '\100' '\000' >gzipped.dat
  	    # Note that the CVS client sends "-b 1.1.1", and this
  	    # test doesn't.  But the server also defaults to that.
  	    cat <<EOF >session.dat
***************
*** 30871,30877 ****
  M 
  ok" <session.dat
  	    dotest server-5 \
! "${testcvs} -q -d ${TESTDIR}/crerepos co -p dir1/file1" "test"
  
  	    # OK, here are some notify tests.
  	    dotest server-6 "${servercvs} server" \
--- 31429,31435 ----
  M 
  ok" <session.dat
  	    dotest server-5 \
! "${testcvs} -q -d ${LOCAL_ROOT_PREFIX}${TESTDIR}/crerepos co -p dir1/file1" "test"
  
  	    # OK, here are some notify tests.
  	    dotest server-6 "${servercvs} server" \
***************
*** 31162,31168 ****
  echo "4"
  echo "xyz"
  echo "ok"
! cat >/dev/null
  EOF
  	  # Cygwin.  Pthffffffffft!
  	  if test -n "$remotehost"; then
--- 31720,31726 ----
  echo "4"
  echo "xyz"
  echo "ok"
! cat >$DEVNULL
  EOF
  	  # Cygwin.  Pthffffffffft!
  	  if test -n "$remotehost"; then
***************
*** 31192,31198 ****
  echo "4"
  echo "abd"
  echo "ok"
! cat >/dev/null
  EOF
  	  cd first-dir
  	  mkdir $TESTDIR/bogus
--- 31750,31756 ----
  echo "4"
  echo "abd"
  echo "ok"
! cat >$DEVNULL
  EOF
  	  cd first-dir
  	  mkdir $TESTDIR/bogus
***************
*** 31216,31222 ****
  echo "4"
  echo "abc"
  echo "ok"
! cat >/dev/null
  EOF
  	  dotest client-4 "$testcvs update" "merge-it"
  	  dotest client-5 "cat .#file1.1.1" "xyz"
--- 31774,31780 ----
  echo "4"
  echo "abc"
  echo "ok"
! cat >$DEVNULL
  EOF
  	  dotest client-4 "$testcvs update" "merge-it"
  	  dotest client-5 "cat .#file1.1.1" "xyz"
***************
*** 31289,31295 ****
  echo "a1 1"
  echo "echo 'gotcha!'"
  echo "ok"
! cat >/dev/null
  EOF
  	  
  	  # If I don't run the following sleep between the above cat and
--- 31847,31853 ----
  echo "a1 1"
  echo "echo 'gotcha!'"
  echo "ok"
! cat >$DEVNULL
  EOF
  	  
  	  # If I don't run the following sleep between the above cat and
***************
*** 31320,31326 ****
  echo "a1 1"
  echo "echo 'gotcha!'"
  echo "ok"
! cat >/dev/null
  EOF
  	  sleep 1
  	  dotest_fail client-11 "$testcvs update" \
--- 31878,31884 ----
  echo "a1 1"
  echo "echo 'gotcha!'"
  echo "ok"
! cat >$DEVNULL
  EOF
  	  sleep 1
  	  dotest_fail client-11 "$testcvs update" \
***************
*** 31340,31346 ****
  echo "a1 1"
  echo "echo 'gotcha!'"
  echo "ok"
! cat >/dev/null
  EOF
  	  sleep 1
  	  dotest_fail client-12 "$testcvs update" \
--- 31898,31904 ----
  echo "a1 1"
  echo "echo 'gotcha!'"
  echo "ok"
! cat >$DEVNULL
  EOF
  	  sleep 1
  	  dotest_fail client-12 "$testcvs update" \
***************
*** 31360,31366 ****
  echo "#! $TESTSHELL"
  echo "echo 'gotcha!'"
  echo "ok"
! cat >/dev/null
  EOF
  	  sleep 1
  	  dotest_fail client-13 "$testcvs update" \
--- 31918,31924 ----
  echo "#! $TESTSHELL"
  echo "echo 'gotcha!'"
  echo "ok"
! cat >$DEVNULL
  EOF
  	  sleep 1
  	  dotest_fail client-13 "$testcvs update" \
***************
*** 31380,31386 ****
  echo "#! $TESTSHELL"
  echo "echo 'gotcha!'"
  echo "ok"
! cat >/dev/null
  EOF
  	  sleep 1
  	  dotest_fail client-14 "$testcvs update" \
--- 31938,31944 ----
  echo "#! $TESTSHELL"
  echo "echo 'gotcha!'"
  echo "ok"
! cat >$DEVNULL
  EOF
  	  sleep 1
  	  dotest_fail client-14 "$testcvs update" \
***************
*** 31400,31406 ****
  echo "#! $TESTSHELL"
  echo "echo 'gotcha!'"
  echo "ok"
! cat >/dev/null
  EOF
  	  sleep 1
  	  dotest_fail client-15 "$testcvs update" \
--- 31958,31964 ----
  echo "#! $TESTSHELL"
  echo "echo 'gotcha!'"
  echo "ok"
! cat >$DEVNULL
  EOF
  	  sleep 1
  	  dotest_fail client-15 "$testcvs update" \
***************
*** 31420,31426 ****
  echo "#! $TESTSHELL"
  echo "echo 'gotcha!'"
  echo "ok"
! cat >/dev/null
  EOF
  	  sleep 1
  	  dotest_fail client-16 "$testcvs update" \
--- 31978,31984 ----
  echo "#! $TESTSHELL"
  echo "echo 'gotcha!'"
  echo "ok"
! cat >$DEVNULL
  EOF
  	  sleep 1
  	  dotest_fail client-16 "$testcvs update" \
***************
*** 31444,31450 ****
  echo "./innocuous"
  echo "$HOME/innocuous"
  echo "ok"
! cat >/dev/null
  EOF
  	  sleep 1
  	  dotest_fail client-18 "$testcvs update" \
--- 32002,32008 ----
  echo "./innocuous"
  echo "$HOME/innocuous"
  echo "ok"
! cat >$DEVNULL
  EOF
  	  sleep 1
  	  dotest_fail client-18 "$testcvs update" \
***************
*** 31464,31470 ****
  echo "Redirect $CVSROOT"
  
  # Eat up data from the client to avoid broken pipe errors.
! cat >/dev/null
  EOF
  	  echo newstuff >file1
  	  sleep 1
--- 32022,32028 ----
  echo "Redirect $CVSROOT"
  
  # Eat up data from the client to avoid broken pipe errors.
! cat >$DEVNULL
  EOF
  	  echo newstuff >file1
  	  sleep 1
***************
*** 31500,31506 ****
  	  mkdir dir1/dir2
  	  echo version1 >dir1/dir2/file1
  	  cd dir1
! 	  dotest dottedroot-1 "${testcvs} import -m '' module1 AUTHOR INITIAL" \
  "${SPROG} import: Importing ${CVSROOT_DIRNAME}/module1/dir2
  N module1/dir2/file1
  
--- 32058,32064 ----
  	  mkdir dir1/dir2
  	  echo version1 >dir1/dir2/file1
  	  cd dir1
! 	  dotest dottedroot-1 "${testcvs} import -m\'\' module1 AUTHOR INITIAL" \
  "${SPROG} import: Importing ${CVSROOT_DIRNAME}/module1/dir2
  N module1/dir2/file1
  
***************
*** 31853,31859 ****
  	  dotest writeproxy-init-2 "$testcvs -Qd$PRIMARY_CVSROOT co CVSROOT"
  	  cd CVSROOT
  	  cat >>loginfo <<EOF
! ALL (cat >/dev/null; echo %R) >$TESTDIR/referrer
  ALL $RSYNC -gopr --delete $PRIMARY_CVSROOT_DIRNAME/ $SECONDARY_CVSROOT_DIRNAME
  EOF
  	  cat >>config <<EOF
--- 32411,32417 ----
  	  dotest writeproxy-init-2 "$testcvs -Qd$PRIMARY_CVSROOT co CVSROOT"
  	  cd CVSROOT
  	  cat >>loginfo <<EOF
! ALL (cat >$DEVNULL; echo %R) >$TESTDIR/referrer
  ALL $RSYNC -gopr --delete $PRIMARY_CVSROOT_DIRNAME/ $SECONDARY_CVSROOT_DIRNAME
  EOF
  	  cat >>config <<EOF
***************
*** 31955,31961 ****
  	  cd firstdir
  	  echo now you see me >file1
  	  dotest writeproxy-6 "$testcvs -Q add file1"
! 	  dotest writeproxy-6a "grep file1 CVS/Entries >/dev/null"
  	  dotest writeproxy-7 "$testcvs -Q ci -mfirst-file file1"
  
  	  # Verify that the server got the correct referrer.
--- 32513,32519 ----
  	  cd firstdir
  	  echo now you see me >file1
  	  dotest writeproxy-6 "$testcvs -Q add file1"
! 	  dotest writeproxy-6a "grep file1 CVS/Entries >$DEVNULL"
  	  dotest writeproxy-7 "$testcvs -Q ci -mfirst-file file1"
  
  	  # Verify that the server got the correct referrer.
***************
*** 32002,32008 ****
  	  sed \$d <loginfo >tmp
  	  mv tmp loginfo
  	  echo >>loginfo \
! "ALL echo >&2 'Im rsync and I encountered an error!'; cat >/dev/null; exit 1"
  	  dotest writeproxy-init-13 "$testcvs -Q ci -mbreak-rsync" \
  "Im rsync and I encountered an error!"
  	  echo "# a comment" >>loginfo
--- 32560,32566 ----
  	  sed \$d <loginfo >tmp
  	  mv tmp loginfo
  	  echo >>loginfo \
! "ALL echo >&2 'Im rsync and I encountered an error!'; cat >$DEVNULL; exit 1"
  	  dotest writeproxy-init-13 "$testcvs -Q ci -mbreak-rsync" \
  "Im rsync and I encountered an error!"
  	  echo "# a comment" >>loginfo
***************
*** 32341,32347 ****
  ALL $RSYNC -gopr --delete $PRIMARY_CVSROOT_DIRNAME/ $SECONDARY_CVSROOT_DIRNAME
  EOF
  	  cat >>loginfo <<EOF
! ALL echo Referrer=%R; cat >/dev/null
  EOF
  	  cat >>config <<EOF
  PrimaryServer=$PRIMARY_CVSROOT
--- 32899,32905 ----
  ALL $RSYNC -gopr --delete $PRIMARY_CVSROOT_DIRNAME/ $SECONDARY_CVSROOT_DIRNAME
  EOF
  	  cat >>loginfo <<EOF
! ALL echo Referrer=%R; cat >$DEVNULL
  EOF
  	  cat >>config <<EOF
  PrimaryServer=$PRIMARY_CVSROOT
***************
*** 32442,32448 ****
  ALL $RSYNC -gopr --delete $PRIMARY_CVSROOT_DIRNAME/ $SECONDARY_CVSROOT_DIRNAME
  EOF
  	  cat >>loginfo <<EOF
! ALL echo Referrer=%R; cat >/dev/null
  EOF
  	  cat >>config <<EOF
  PrimaryServer=$PRIMARY_CVSROOT
--- 33000,33006 ----
  ALL $RSYNC -gopr --delete $PRIMARY_CVSROOT_DIRNAME/ $SECONDARY_CVSROOT_DIRNAME
  EOF
  	  cat >>loginfo <<EOF
! ALL echo Referrer=%R; cat >$DEVNULL
  EOF
  	  cat >>config <<EOF
  PrimaryServer=$PRIMARY_CVSROOT
***************
*** 35542,35548 ****
  	            $CVSROOT_DIRNAME/CVSROOT/posttag \
  	            $SECONDARY_CVSROOT_DIRNAME/CVSROOT/postwatch \
  	            $CVSROOT_DIRNAME/CVSROOT/postwatch; do
! 	    if cmp $file $TESTDIR/`basename $file`-clean >/dev/null 2>&1; then
  		:;
  	    else
  		echo "\`$file' and \`$TESTDIR/`basename $file`-clean' differ." \
--- 36100,36106 ----
  	            $CVSROOT_DIRNAME/CVSROOT/posttag \
  	            $SECONDARY_CVSROOT_DIRNAME/CVSROOT/postwatch \
  	            $CVSROOT_DIRNAME/CVSROOT/postwatch; do
! 	    if cmp $file $TESTDIR/`basename $file`-clean >$DEVNULL 2>&1; then
  		:;
  	    else
  		echo "\`$file' and \`$TESTDIR/`basename $file`-clean' differ." \
***************
*** 35555,35561 ****
  	fi
      fi
  
!     if $remote && test "$servercvs_orig" != "$servercvs" >/dev/null 2>&1; then
  	fail "test slagged \$servercvs"
      fi
  
--- 36113,36119 ----
  	fi
      fi
  
!     if $remote && test "$servercvs_orig" != "$servercvs" >$DEVNULL 2>&1; then
  	fail "test slagged \$servercvs"
      fi
  
Index: src/server.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/src/server.c,v
retrieving revision 1.1.1.13
retrieving revision 1.1.3.2.4.12
diff -c -r1.1.1.13 -r1.1.3.2.4.12
*** src/server.c	28 Sep 2005 05:25:54 -0000	1.1.1.13
--- src/server.c	17 May 2006 20:13:24 -0000	1.1.3.2.4.12
***************
*** 371,377 ****
       * Skip over leading slash if present.  We won't bother to try to
       * make '/'.
       */
!     p = dir + 1;
      while (1)
      {
  	while (*p != '/' && *p != '\0')
--- 371,377 ----
       * Skip over leading slash if present.  We won't bother to try to
       * make '/'.
       */
!     p = strchr(dir, '/') + 1;
      while (1)
      {
  	while (*p != '/' && *p != '\0')
***************
*** 1590,1595 ****
--- 1590,1615 ----
  }
  
  
+ /* Kopt for the next file sent in Modified or Is-modified.  */
+ static char *kopt;
+ 
+ /* Timestamp (Checkin-time) for next file sent in Modified or
+    Is-modified.  */
+ static int checkin_time_valid;
+ static time_t checkin_time;
+ 
+ 
+ 
+ /*
+  * Used to keep track of Entry requests.
+  */
+ struct an_entry {
+     struct an_entry *next;
+     char *entry;
+ };
+ 
+ static struct an_entry *entries;
+ 
  
  /* Receive SIZE bytes, write to filename FILE.  */
  static void
***************
*** 1597,1605 ****
  {
      int fd;
      char *arg = file;
  
      /* Write the file.  */
!     fd = CVS_OPEN (arg, O_WRONLY | O_CREAT | O_TRUNC, 0600);
      if (fd < 0)
      {
  	int save_errno = errno;
--- 1617,1648 ----
  {
      int fd;
      char *arg = file;
+     int len, bin;
+     struct an_entry *ent;
+     char *p = NULL;
+ 
+     len = strlen (arg);
+     for (ent = entries; ent != NULL; ent = ent->next)
+     {
+ 	if ((p = strchr (ent->entry, '/')) == NULL)
+ 	   continue;
+ 	if (strncmp (p+1, arg, len) == 0 && p[1+len] == '/')
+ 	   break;
+     }
+     bin = 0;
+     if (ent != NULL)
+     {
+ 	p += 1+len;
+ 	if ((p = strchr(p+1, '/')) != NULL &&
+ 	    (p = strchr(p+1, '/')) != NULL &&
+ 	    strncmp(p, "/-kb/", 4) == 0)
+ 	    bin = OPEN_BINARY;
+     }
+     else if (kopt != NULL && strcmp(kopt, "-kb") == 0)
+ 	bin = OPEN_BINARY;
  
      /* Write the file.  */
!     fd = CVS_OPEN (arg, O_WRONLY | O_CREAT | O_TRUNC | bin, 0600);
      if (fd < 0)
      {
  	int save_errno = errno;
***************
*** 1708,1733 ****
  
  
  
- /* Kopt for the next file sent in Modified or Is-modified.  */
- static char *kopt;
- 
- /* Timestamp (Checkin-time) for next file sent in Modified or
-    Is-modified.  */
- static int checkin_time_valid;
- static time_t checkin_time;
- 
- 
- 
- /*
-  * Used to keep track of Entry requests.
-  */
- struct an_entry {
-     struct an_entry *next;
-     char *entry;
- };
- 
- static struct an_entry *entries;
- 
  static void
  serve_is_modified (char *arg)
  {
--- 1751,1756 ----
***************
*** 5128,5133 ****
--- 5151,5157 ----
  		   tradeoff.  */
  
  		int fd;
+ 		int bin = 0;
  
  		/* Callers must avoid passing us a buffer if
  		   file_gzip_level is set.  We could handle this case,
***************
*** 5136,5143 ****
  		if (filebuf != NULL)
  		    error (1, 0, "\
  CVS server internal error: unhandled case in server_updated");
! 
! 		fd = CVS_OPEN (finfo->file, O_RDONLY | OPEN_BINARY, 0);
  		if (fd < 0)
  		    error (1, errno, "reading %s", finfo->fullname);
  		if (read_and_gzip (fd, finfo->fullname, &file,
--- 5160,5169 ----
  		if (filebuf != NULL)
  		    error (1, 0, "\
  CVS server internal error: unhandled case in server_updated");
! 		if (finfo->rcs->expand != NULL &&
! 			strcmp(finfo->rcs->expand, "b") == 0)
! 		    bin = OPEN_BINARY;
! 		fd = CVS_OPEN (finfo->file, O_RDONLY | bin, 0);
  		if (fd < 0)
  		    error (1, errno, "reading %s", finfo->fullname);
  		if (read_and_gzip (fd, finfo->fullname, &file,
***************
*** 5153,5163 ****
  	    else if (filebuf == NULL)
  	    {
  		long status;
  
! 		f = CVS_FOPEN (finfo->file, "rb");
  		if (f == NULL)
  		    error (1, errno, "reading %s", finfo->fullname);
! 		status = buf_read_file (f, size, &list, &last);
  		if (status == -2)
  		    (*protocol->memory_error) (protocol);
  		else if (status != 0)
--- 5179,5193 ----
  	    else if (filebuf == NULL)
  	    {
  		long status;
+ 		int bin = 0;
  
! 		if (finfo->rcs->expand != NULL &&
! 			strcmp(finfo->rcs->expand, "b") == 0)
! 		    bin = 1;
! 		f = CVS_FOPEN (finfo->file, bin ? "rb" : "r");
  		if (f == NULL)
  		    error (1, errno, "reading %s", finfo->fullname);
! 		status = buf_read_file_to_eof (f, &list, &last);
  		if (status == -2)
  		    (*protocol->memory_error) (protocol);
  		else if (status != 0)
***************
*** 5165,5170 ****
--- 5195,5201 ----
  			   finfo->fullname);
  		if (fclose (f) == EOF)
  		    error (1, errno, "reading %s", finfo->fullname);
+ 		size = buf_chain_length (list);
  	    }
  	}
  
***************
*** 6308,6313 ****
--- 6339,6349 ----
  int
  server (int argc, char **argv)
  {
+ #ifdef RSHD_NOT_TRANSPARENT
+     setmode (STDIN_FILENO, O_BINARY);
+     setmode (STDOUT_FILENO, O_BINARY);
+     setmode (STDERR_FILENO, O_BINARY);
+ #endif
      char *error_prog_name;		/* Used in error messages */
  
      if (argc == -1)
***************
*** 6556,6561 ****
--- 6592,6598 ----
  	exit (EXIT_FAILURE);
      }
  
+ #ifdef CVS_BADROOT
      if (pw->pw_uid == 0)
      {
  #ifdef HAVE_SYSLOG_H
***************
*** 6569,6574 ****
--- 6606,6612 ----
          printf("error 0: root not allowed\n");
  	exit (EXIT_FAILURE);
      }
+ #endif
  
  #if HAVE_INITGROUPS
      if (initgroups (pw->pw_name, pw->pw_gid) < 0
Index: tools/Makefile.in
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/tools/Makefile.in,v
retrieving revision 1.1.1.10
retrieving revision 1.1.3.1.4.7
diff -c -r1.1.1.10 -r1.1.3.1.4.7
*** tools/Makefile.in	3 Oct 2005 03:37:38 -0000	1.1.1.10
--- tools/Makefile.in	19 Jul 2006 17:45:15 -0000	1.1.3.1.4.7
***************
*** 125,131 ****
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
--- 125,132 ----
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h \
! 	$(top_builddir)/emx-new/common.h
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
***************
*** 160,165 ****
--- 161,167 ----
  GETOPT_H = @GETOPT_H@
  GLOB_H = @GLOB_H@
  GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
  HAVE_LONG_64BIT = @HAVE_LONG_64BIT@
  HAVE_LONG_LONG_64BIT = @HAVE_LONG_LONG_64BIT@
  HAVE__BOOL = @HAVE__BOOL@
***************
*** 222,229 ****
  ZLIB_LIBS = @ZLIB_LIBS@
  ZLIB_SUBDIRS = @ZLIB_SUBDIRS@
  ac_ct_CC = @ac_ct_CC@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
  ac_prefix_program = @ac_prefix_program@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--- 224,229 ----
***************
*** 240,262 ****
--- 240,269 ----
  build_vendor = @build_vendor@
  cvs_client_objects = @cvs_client_objects@
  datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
+ htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
+ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
Index: vms/Makefile.in
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/vms/Makefile.in,v
retrieving revision 1.1.1.10
retrieving revision 1.1.3.1.4.7
diff -c -r1.1.1.10 -r1.1.3.1.4.7
*** vms/Makefile.in	3 Oct 2005 03:37:40 -0000	1.1.1.10
--- vms/Makefile.in	19 Jul 2006 17:45:15 -0000	1.1.3.1.4.7
***************
*** 128,134 ****
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
--- 128,135 ----
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h \
! 	$(top_builddir)/emx-new/common.h
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
***************
*** 163,168 ****
--- 164,170 ----
  GETOPT_H = @GETOPT_H@
  GLOB_H = @GLOB_H@
  GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
  HAVE_LONG_64BIT = @HAVE_LONG_64BIT@
  HAVE_LONG_LONG_64BIT = @HAVE_LONG_LONG_64BIT@
  HAVE__BOOL = @HAVE__BOOL@
***************
*** 225,232 ****
  ZLIB_LIBS = @ZLIB_LIBS@
  ZLIB_SUBDIRS = @ZLIB_SUBDIRS@
  ac_ct_CC = @ac_ct_CC@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
  ac_prefix_program = @ac_prefix_program@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--- 227,232 ----
***************
*** 243,265 ****
--- 243,272 ----
  build_vendor = @build_vendor@
  cvs_client_objects = @cvs_client_objects@
  datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
+ htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
+ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
Index: vms/pathnames.h
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/vms/pathnames.h,v
retrieving revision 1.1.1.2
retrieving revision 1.1.3.2
diff -c -r1.1.1.2 -r1.1.3.2
*** vms/pathnames.h	12 Jul 1999 02:05:42 -0000	1.1.1.2
--- vms/pathnames.h	10 Feb 2000 18:18:50 -0000	1.1.3.2
***************
*** 31,37 ****
   * SUCH DAMAGE.
   *
   *	from: @(#)pathnames.h	5.2 (Berkeley) 4/9/90
!  *	$Id: pathnames.h,v 1.1.1.2 1999/07/12 02:05:42 root Exp $
   */
  
  #define	_PATH_RLOGIN	"/usr/bin/rlogin"
--- 31,37 ----
   * SUCH DAMAGE.
   *
   *	from: @(#)pathnames.h	5.2 (Berkeley) 4/9/90
!  *	$Id: pathnames.h,v 1.1.3.2 2000/02/10 18:18:50 root Exp $
   */
  
  #define	_PATH_RLOGIN	"/usr/bin/rlogin"
Index: windows-NT/Makefile.in
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/windows-NT/Makefile.in,v
retrieving revision 1.1.1.10
retrieving revision 1.1.3.1.4.7
diff -c -r1.1.1.10 -r1.1.3.1.4.7
*** windows-NT/Makefile.in	3 Oct 2005 03:37:44 -0000	1.1.1.10
--- windows-NT/Makefile.in	19 Jul 2006 17:45:15 -0000	1.1.3.1.4.7
***************
*** 129,135 ****
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
--- 129,136 ----
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h \
! 	$(top_builddir)/emx-new/common.h
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
***************
*** 173,178 ****
--- 174,180 ----
  GETOPT_H = @GETOPT_H@
  GLOB_H = @GLOB_H@
  GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
  HAVE_LONG_64BIT = @HAVE_LONG_64BIT@
  HAVE_LONG_LONG_64BIT = @HAVE_LONG_LONG_64BIT@
  HAVE__BOOL = @HAVE__BOOL@
***************
*** 235,242 ****
  ZLIB_LIBS = @ZLIB_LIBS@
  ZLIB_SUBDIRS = @ZLIB_SUBDIRS@
  ac_ct_CC = @ac_ct_CC@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
  ac_prefix_program = @ac_prefix_program@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--- 237,242 ----
***************
*** 253,275 ****
--- 253,282 ----
  build_vendor = @build_vendor@
  cvs_client_objects = @cvs_client_objects@
  datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
+ htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
+ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
Index: windows-NT/rcmd.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/windows-NT/rcmd.c,v
retrieving revision 1.1.1.2
retrieving revision 1.1.3.1.4.1
diff -c -r1.1.1.2 -r1.1.3.1.4.1
*** windows-NT/rcmd.c	28 Sep 2005 05:26:00 -0000	1.1.1.2
--- windows-NT/rcmd.c	19 Jul 2006 17:45:15 -0000	1.1.3.1.4.1
***************
*** 20,26 ****
  #include <malloc.h>
  #include <errno.h>
  
! #include <sys/socket.h>
  
  #include <stdio.h>
  #include <assert.h>
--- 20,45 ----
  #include <malloc.h>
  #include <errno.h>
  
! #ifdef HAVE_WINSOCK_H
!   #include <winsock.h>
! #else
!   #include <sys/types.h>
!   #include <sys/socket.h>
!   #ifdef __EMX__
!     #include <netinet/in.h>
!     #include <netdb.h>
!     typedef int SOCKET;
!     #define closesocket close
!     #define SOCK_ERRNO errno
!     #define SOCK_STRERROR strerror
!     /* Probably would be cleaner to just use EADDRINUSE, as NT has that too.  */
!     #define WSAEADDRINUSE EADDRINUSE
!     /* Probably would be cleaner to just check for < 0.  Might want to
!        double-check that doing so would seem to work on NT.  */
!     #define SOCKET_ERROR -1
!     #define INVALID_SOCKET -1
!   #endif
! #endif
  
  #include <stdio.h>
  #include <assert.h>
Index: windows-NT/SCC/Makefile.in
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/windows-NT/SCC/Makefile.in,v
retrieving revision 1.1.1.10
retrieving revision 1.1.3.1.4.7
diff -c -r1.1.1.10 -r1.1.3.1.4.7
*** windows-NT/SCC/Makefile.in	3 Oct 2005 03:37:46 -0000	1.1.1.10
--- windows-NT/SCC/Makefile.in	19 Jul 2006 17:45:29 -0000	1.1.3.1.4.7
***************
*** 126,132 ****
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
--- 126,133 ----
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
! CONFIG_HEADER = $(top_builddir)/config.h \
! 	$(top_builddir)/emx-new/common.h
  CONFIG_CLEAN_FILES =
  SOURCES =
  DIST_SOURCES =
***************
*** 161,166 ****
--- 162,168 ----
  GETOPT_H = @GETOPT_H@
  GLOB_H = @GLOB_H@
  GMSGFMT = @GMSGFMT@
+ GREP = @GREP@
  HAVE_LONG_64BIT = @HAVE_LONG_64BIT@
  HAVE_LONG_LONG_64BIT = @HAVE_LONG_LONG_64BIT@
  HAVE__BOOL = @HAVE__BOOL@
***************
*** 223,230 ****
  ZLIB_LIBS = @ZLIB_LIBS@
  ZLIB_SUBDIRS = @ZLIB_SUBDIRS@
  ac_ct_CC = @ac_ct_CC@
- ac_ct_RANLIB = @ac_ct_RANLIB@
- ac_ct_STRIP = @ac_ct_STRIP@
  ac_prefix_program = @ac_prefix_program@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--- 225,230 ----
***************
*** 241,263 ****
--- 241,270 ----
  build_vendor = @build_vendor@
  cvs_client_objects = @cvs_client_objects@
  datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+ dvidir = @dvidir@
  exec_prefix = @exec_prefix@
  host = @host@
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
+ htmldir = @htmldir@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
  libdir = @libdir@
  libexecdir = @libexecdir@
+ localedir = @localedir@
  localstatedir = @localstatedir@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
+ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
Index: zlib/ChangeLog
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/zlib/ChangeLog,v
retrieving revision 1.1.1.7
retrieving revision 1.1.3.1.4.5
diff -c -r1.1.1.7 -r1.1.3.1.4.5
*** zlib/ChangeLog	28 Sep 2005 05:26:00 -0000	1.1.1.7
--- zlib/ChangeLog	19 Jul 2006 17:45:29 -0000	1.1.3.1.4.5
***************
*** 841,847 ****
  - use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
  - added makelcc.bat for lcc-win32 (Tom St Denis)
  - in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
! - Avoid expanded $Id: ChangeLog,v 1.1.1.7 2005/09/28 05:26:00 root Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
  - check for unistd.h in configure (for off_t)
  - remove useless check parameter in inflate_blocks_free
  - avoid useless assignment of s->check to itself in inflate_blocks_new
--- 841,847 ----
  - use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
  - added makelcc.bat for lcc-win32 (Tom St Denis)
  - in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
! - Avoid expanded Id. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
  - check for unistd.h in configure (for off_t)
  - remove useless check parameter in inflate_blocks_free
  - avoid useless assignment of s->check to itself in inflate_blocks_new
Index: zlib/adler32.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/zlib/adler32.c,v
retrieving revision 1.1.1.6
retrieving revision 1.1.3.2.4.3
diff -c -r1.1.1.6 -r1.1.3.2.4.3
*** zlib/adler32.c	25 Sep 2005 05:26:30 -0000	1.1.1.6
--- zlib/adler32.c	19 Jul 2006 17:45:29 -0000	1.1.3.2.4.3
***************
*** 3,9 ****
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
  
! /* @(#) $Id: adler32.c,v 1.1.1.6 2005/09/25 05:26:30 root Exp $ */
  
  #define ZLIB_INTERNAL
  #include "zlib.h"
--- 3,9 ----
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
  
! /* @(#) $Id: adler32.c,v 1.1.3.2.4.3 2006/07/19 17:45:29 andrew_belov Exp $ */
  
  #define ZLIB_INTERNAL
  #include "zlib.h"
Index: zlib/compress.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/zlib/compress.c,v
retrieving revision 1.1.1.6
retrieving revision 1.1.3.2.4.3
diff -c -r1.1.1.6 -r1.1.3.2.4.3
*** zlib/compress.c	25 Sep 2005 05:26:30 -0000	1.1.1.6
--- zlib/compress.c	19 Jul 2006 17:45:29 -0000	1.1.3.2.4.3
***************
*** 3,9 ****
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
  
! /* @(#) $Id: compress.c,v 1.1.1.6 2005/09/25 05:26:30 root Exp $ */
  
  #define ZLIB_INTERNAL
  #include "zlib.h"
--- 3,9 ----
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
  
! /* @(#) $Id: compress.c,v 1.1.3.2.4.3 2006/07/19 17:45:29 andrew_belov Exp $ */
  
  #define ZLIB_INTERNAL
  #include "zlib.h"
Index: zlib/crc32.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/zlib/crc32.c,v
retrieving revision 1.1.1.6
retrieving revision 1.1.3.2.4.3
diff -c -r1.1.1.6 -r1.1.3.2.4.3
*** zlib/crc32.c	25 Sep 2005 05:26:32 -0000	1.1.1.6
--- zlib/crc32.c	19 Jul 2006 17:45:29 -0000	1.1.3.2.4.3
***************
*** 9,15 ****
   * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
   */
  
! /* @(#) $Id: crc32.c,v 1.1.1.6 2005/09/25 05:26:32 root Exp $ */
  
  /*
    Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
--- 9,15 ----
   * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
   */
  
! /* @(#) $Id: crc32.c,v 1.1.3.2.4.3 2006/07/19 17:45:29 andrew_belov Exp $ */
  
  /*
    Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
Index: zlib/deflate.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/zlib/deflate.c,v
retrieving revision 1.1.1.6
retrieving revision 1.1.3.2.4.3
diff -c -r1.1.1.6 -r1.1.3.2.4.3
*** zlib/deflate.c	25 Sep 2005 05:26:32 -0000	1.1.1.6
--- zlib/deflate.c	19 Jul 2006 17:45:29 -0000	1.1.3.2.4.3
***************
*** 47,53 ****
   *
   */
  
! /* @(#) $Id: deflate.c,v 1.1.1.6 2005/09/25 05:26:32 root Exp $ */
  
  #include "deflate.h"
  
--- 47,53 ----
   *
   */
  
! /* @(#) $Id: deflate.c,v 1.1.3.2.4.3 2006/07/19 17:45:29 andrew_belov Exp $ */
  
  #include "deflate.h"
  
Index: zlib/deflate.h
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/zlib/deflate.h,v
retrieving revision 1.1.1.6
retrieving revision 1.1.3.2.4.3
diff -c -r1.1.1.6 -r1.1.3.2.4.3
*** zlib/deflate.h	25 Sep 2005 05:26:32 -0000	1.1.1.6
--- zlib/deflate.h	19 Jul 2006 17:45:29 -0000	1.1.3.2.4.3
***************
*** 8,14 ****
     subject to change. Applications should only use zlib.h.
   */
  
! /* @(#) $Id: deflate.h,v 1.1.1.6 2005/09/25 05:26:32 root Exp $ */
  
  #ifndef DEFLATE_H
  #define DEFLATE_H
--- 8,14 ----
     subject to change. Applications should only use zlib.h.
   */
  
! /* @(#) $Id: deflate.h,v 1.1.3.2.4.3 2006/07/19 17:45:29 andrew_belov Exp $ */
  
  #ifndef DEFLATE_H
  #define DEFLATE_H
Index: zlib/example.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/zlib/example.c,v
retrieving revision 1.1.1.6
retrieving revision 1.1.3.2.4.3
diff -c -r1.1.1.6 -r1.1.3.2.4.3
*** zlib/example.c	25 Sep 2005 05:26:32 -0000	1.1.1.6
--- zlib/example.c	19 Jul 2006 17:45:29 -0000	1.1.3.2.4.3
***************
*** 3,9 ****
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
  
! /* @(#) $Id: example.c,v 1.1.1.6 2005/09/25 05:26:32 root Exp $ */
  
  #include <stdio.h>
  #include "zlib.h"
--- 3,9 ----
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
  
! /* @(#) $Id: example.c,v 1.1.3.2.4.3 2006/07/19 17:45:29 andrew_belov Exp $ */
  
  #include <stdio.h>
  #include "zlib.h"
Index: zlib/gzio.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/zlib/gzio.c,v
retrieving revision 1.1.1.6
retrieving revision 1.1.3.2.4.3
diff -c -r1.1.1.6 -r1.1.3.2.4.3
*** zlib/gzio.c	25 Sep 2005 05:26:32 -0000	1.1.1.6
--- zlib/gzio.c	19 Jul 2006 17:45:29 -0000	1.1.3.2.4.3
***************
*** 5,11 ****
   * Compile this file with -DNO_GZCOMPRESS to avoid the compression code.
   */
  
! /* @(#) $Id: gzio.c,v 1.1.1.6 2005/09/25 05:26:32 root Exp $ */
  
  #include <stdio.h>
  
--- 5,11 ----
   * Compile this file with -DNO_GZCOMPRESS to avoid the compression code.
   */
  
! /* @(#) $Id: gzio.c,v 1.1.3.2.4.3 2006/07/19 17:45:29 andrew_belov Exp $ */
  
  #include <stdio.h>
  
Index: zlib/minigzip.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/zlib/minigzip.c,v
retrieving revision 1.1.1.6
retrieving revision 1.1.3.2.4.3
diff -c -r1.1.1.6 -r1.1.3.2.4.3
*** zlib/minigzip.c	25 Sep 2005 05:26:34 -0000	1.1.1.6
--- zlib/minigzip.c	19 Jul 2006 17:45:29 -0000	1.1.3.2.4.3
***************
*** 13,19 ****
   * or in pipe mode.
   */
  
! /* @(#) $Id: minigzip.c,v 1.1.1.6 2005/09/25 05:26:34 root Exp $ */
  
  #include <stdio.h>
  #include "zlib.h"
--- 13,19 ----
   * or in pipe mode.
   */
  
! /* @(#) $Id: minigzip.c,v 1.1.3.2.4.3 2006/07/19 17:45:29 andrew_belov Exp $ */
  
  #include <stdio.h>
  #include "zlib.h"
Index: zlib/trees.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/zlib/trees.c,v
retrieving revision 1.1.1.6
retrieving revision 1.1.3.2.4.3
diff -c -r1.1.1.6 -r1.1.3.2.4.3
*** zlib/trees.c	25 Sep 2005 05:26:34 -0000	1.1.1.6
--- zlib/trees.c	19 Jul 2006 17:45:29 -0000	1.1.3.2.4.3
***************
*** 29,35 ****
   *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
   */
  
! /* @(#) $Id: trees.c,v 1.1.1.6 2005/09/25 05:26:34 root Exp $ */
  
  /* #define GEN_TREES_H */
  
--- 29,35 ----
   *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
   */
  
! /* @(#) $Id: trees.c,v 1.1.3.2.4.3 2006/07/19 17:45:29 andrew_belov Exp $ */
  
  /* #define GEN_TREES_H */
  
Index: zlib/uncompr.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/zlib/uncompr.c,v
retrieving revision 1.1.1.5
retrieving revision 1.1.3.2.4.3
diff -c -r1.1.1.5 -r1.1.3.2.4.3
*** zlib/uncompr.c	9 Oct 2005 12:11:40 -0000	1.1.1.5
--- zlib/uncompr.c	19 Jul 2006 17:45:30 -0000	1.1.3.2.4.3
***************
*** 3,9 ****
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
  
! /* @(#) $Id: uncompr.c,v 1.1.1.5 2005/10/09 12:11:40 root Exp $ */
  
  #define ZLIB_INTERNAL
  #include "zlib.h"
--- 3,9 ----
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
  
! /* @(#) $Id: uncompr.c,v 1.1.3.2.4.3 2006/07/19 17:45:30 andrew_belov Exp $ */
  
  #define ZLIB_INTERNAL
  #include "zlib.h"
Index: zlib/zconf.h
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/zlib/zconf.h,v
retrieving revision 1.1.1.6
retrieving revision 1.1.3.2.4.3
diff -c -r1.1.1.6 -r1.1.3.2.4.3
*** zlib/zconf.h	25 Sep 2005 05:26:36 -0000	1.1.1.6
--- zlib/zconf.h	19 Jul 2006 17:45:30 -0000	1.1.3.2.4.3
***************
*** 3,9 ****
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
  
! /* @(#) $Id: zconf.h,v 1.1.1.6 2005/09/25 05:26:36 root Exp $ */
  
  #ifndef ZCONF_H
  #define ZCONF_H
--- 3,9 ----
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
  
! /* @(#) $Id: zconf.h,v 1.1.3.2.4.3 2006/07/19 17:45:30 andrew_belov Exp $ */
  
  #ifndef ZCONF_H
  #define ZCONF_H
Index: zlib/zutil.c
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/zlib/zutil.c,v
retrieving revision 1.1.1.6
retrieving revision 1.1.3.2.4.3
diff -c -r1.1.1.6 -r1.1.3.2.4.3
*** zlib/zutil.c	25 Sep 2005 05:26:38 -0000	1.1.1.6
--- zlib/zutil.c	19 Jul 2006 17:45:30 -0000	1.1.3.2.4.3
***************
*** 3,9 ****
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
  
! /* @(#) $Id: zutil.c,v 1.1.1.6 2005/09/25 05:26:38 root Exp $ */
  
  #include "zutil.h"
  
--- 3,9 ----
   * For conditions of distribution and use, see copyright notice in zlib.h
   */
  
! /* @(#) $Id: zutil.c,v 1.1.3.2.4.3 2006/07/19 17:45:30 andrew_belov Exp $ */
  
  #include "zutil.h"
  
Index: zlib/zutil.h
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/zlib/zutil.h,v
retrieving revision 1.1.1.6
retrieving revision 1.1.3.2.4.3
diff -c -r1.1.1.6 -r1.1.3.2.4.3
*** zlib/zutil.h	25 Sep 2005 05:26:38 -0000	1.1.1.6
--- zlib/zutil.h	19 Jul 2006 17:45:30 -0000	1.1.3.2.4.3
***************
*** 8,14 ****
     subject to change. Applications should only use zlib.h.
   */
  
! /* @(#) $Id: zutil.h,v 1.1.1.6 2005/09/25 05:26:38 root Exp $ */
  
  #ifndef ZUTIL_H
  #define ZUTIL_H
--- 8,14 ----
     subject to change. Applications should only use zlib.h.
   */
  
! /* @(#) $Id: zutil.h,v 1.1.3.2.4.3 2006/07/19 17:45:30 andrew_belov Exp $ */
  
  #ifndef ZUTIL_H
  #define ZUTIL_H
Index: zlib/contrib/iostream2/zstream.h
===================================================================
RCS file: /var/lib/cvs/gnu/cvs/zlib/contrib/iostream2/zstream.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.2.1
diff -c -r1.1.1.1 -r1.1.2.1
*** zlib/contrib/iostream2/zstream.h	4 Nov 2002 16:47:25 -0000	1.1.1.1
--- zlib/contrib/iostream2/zstream.h	4 Nov 2002 17:28:44 -0000	1.1.2.1
***************
*** 21,27 ****
  
  /*
   * zstream.h - C++ interface to the 'zlib' general purpose compression library
!  * $Id: zstream.h,v 1.1.1.1 2002/11/04 16:47:25 root Exp $
   */
  
  #include <strstream.h>
--- 21,27 ----
  
  /*
   * zstream.h - C++ interface to the 'zlib' general purpose compression library
!  * $Id: zstream.h,v 1.1.2.1 2002/11/04 17:28:44 root Exp $
   */
  
  #include <strstream.h>
